Revert "[SLP]Fix the cost of the adjusted extracts in per-register an…

…alysis."

This reverts commit 7841520 to fix
buildbots issues reported in
https://lab.llvm.org/buildbot/#/builders/4/builds/315 and https://lab.llvm.org/buildbot/#/builders/35/builds/481

llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp

@@ -8304,57 +8304,35 @@ class BoUpSLP::ShuffleCostEstimator : public BaseShuffleAnalysis {
         });
     // FIXME: this must be moved to TTI for better estimation.
     unsigned EltsPerVector = getPartNumElems(VL.size(), NumParts);
-    auto CheckPerRegistersShuffle = [&](MutableArrayRef<int> Mask,
-                                        SmallVectorImpl<unsigned> &Indices)
-        -> std::optional<TTI::ShuffleKind> {
+    auto CheckPerRegistersShuffle =
+        [&](MutableArrayRef<int> Mask,
+            SmallVector<int> Indices) -> std::optional<TTI::ShuffleKind> {
       if (NumElts <= EltsPerVector)
         return std::nullopt;
-      int OffsetReg0 =
-          alignDown(std::accumulate(Mask.begin(), Mask.end(), INT_MAX,
-                                    [](int S, int I) {
-                                      if (I == PoisonMaskElem)
-                                        return S;
-                                      return std::min(S, I);
-                                    }),
-                    EltsPerVector);
-      int OffsetReg1 = OffsetReg0;
       DenseSet<int> RegIndices;
       // Check that if trying to permute same single/2 input vectors.
       TTI::ShuffleKind ShuffleKind = TTI::SK_PermuteSingleSrc;
       int FirstRegId = -1;
-      Indices.assign(1, OffsetReg0);
-      for (auto [Pos, I] : enumerate(Mask)) {
+      Indices.assign(1, -1);
+      for (int &I : Mask) {
         if (I == PoisonMaskElem)
           continue;
-        int Idx = I - OffsetReg0;
-        int RegId =
-            (Idx / NumElts) * NumParts + (Idx % NumElts) / EltsPerVector;
+        int RegId = (I / NumElts) * NumParts + (I % NumElts) / EltsPerVector;
         if (FirstRegId < 0)
           FirstRegId = RegId;
         RegIndices.insert(RegId);
         if (RegIndices.size() > 2)
           return std::nullopt;
         if (RegIndices.size() == 2) {
           ShuffleKind = TTI::SK_PermuteTwoSrc;
-          if (Indices.size() == 1) {
-            OffsetReg1 = alignDown(
-                std::accumulate(
-                    std::next(Mask.begin(), Pos), Mask.end(), INT_MAX,
-                    [&](int S, int I) {
-                      if (I == PoisonMaskElem)
-                        return S;
-                      int RegId = ((I - OffsetReg0) / NumElts) * NumParts +
-                                  ((I - OffsetReg0) % NumElts) / EltsPerVector;
-                      if (RegId == FirstRegId)
-                        return S;
-                      return std::min(S, I);
-                    }),
-                EltsPerVector);
-            Indices.push_back(OffsetReg1);
-          }
-          Idx = I - OffsetReg1;
+          if (Indices.size() == 1)
+            Indices.push_back(-1);
         }
-        I = (Idx % NumElts) % EltsPerVector +
+        if (RegId == FirstRegId)
+          Indices.front() = I % NumElts;
+        else
+          Indices.back() = I % NumElts;
+        I = (I % NumElts) % EltsPerVector +
             (RegId == FirstRegId ? 0 : EltsPerVector);
       }
       return ShuffleKind;
@@ -8371,7 +8349,7 @@ class BoUpSLP::ShuffleCostEstimator : public BaseShuffleAnalysis {
           Part * EltsPerVector, getNumElems(Mask.size(), EltsPerVector, Part));
       SmallVector<int> SubMask(EltsPerVector, PoisonMaskElem);
       copy(MaskSlice, SubMask.begin());
-      SmallVector<unsigned, 2> Indices;
+      SmallVector<int> Indices;
       std::optional<TTI::ShuffleKind> RegShuffleKind =
           CheckPerRegistersShuffle(SubMask, Indices);
       if (!RegShuffleKind) {
@@ -8389,21 +8367,12 @@ class BoUpSLP::ShuffleCostEstimator : public BaseShuffleAnalysis {
                                  FixedVectorType::get(ScalarTy, EltsPerVector),
                                  SubMask);
       }
-      for (unsigned Idx : Indices) {
+      for (int Idx : Indices) {
         Cost += ::getShuffleCost(TTI, TTI::SK_ExtractSubvector,
                                  FixedVectorType::get(ScalarTy, NumElts),
                                  std::nullopt, CostKind, Idx,
                                  FixedVectorType::get(ScalarTy, EltsPerVector));
       }
-      // Second attempt to check, if just a permute is better estimated than
-      // subvector extract.
-      SubMask.assign(NumElts, PoisonMaskElem);
-      copy(MaskSlice, SubMask.begin());
-      InstructionCost OriginalCost =
-          ::getShuffleCost(TTI, *ShuffleKinds[Part],
-                           FixedVectorType::get(ScalarTy, NumElts), SubMask);
-      if (OriginalCost < Cost)
-        Cost = OriginalCost;
     }
     return Cost;
   }