Revert "[SandboxVec] Add a simple pack reuse pass (#141848)"

This reverts commit 1268352.

Author: vporpo

llvm/include/llvm/Transforms/Vectorize/SandboxVectorizer/Passes/PackReuse.h

@@ -17,25 +17,7 @@
 #include "llvm/SandboxIR/Type.h"
 #include "llvm/SandboxIR/Utils.h"
 
-namespace llvm {
-/// Traits for DenseMap.
-template <> struct DenseMapInfo<SmallVector<sandboxir::Value *>> {
-  static inline SmallVector<sandboxir::Value *> getEmptyKey() {
-    return SmallVector<sandboxir::Value *>({(sandboxir::Value *)-1});
-  }
-  static inline SmallVector<sandboxir::Value *> getTombstoneKey() {
-    return SmallVector<sandboxir::Value *>({(sandboxir::Value *)-2});
-  }
-  static unsigned getHashValue(const SmallVector<sandboxir::Value *> &Vec) {
-    return hash_combine_range(Vec.begin(), Vec.end());
-  }
-  static bool isEqual(const SmallVector<sandboxir::Value *> &Vec1,
-                      const SmallVector<sandboxir::Value *> &Vec2) {
-    return Vec1 == Vec2;
-  }
-};
-
-namespace sandboxir {
+namespace llvm::sandboxir {
 
 class VecUtils {
 public:
@@ -197,79 +179,13 @@ class VecUtils {
   /// \Returns the first integer power of 2 that is <= Num.
   static unsigned getFloorPowerOf2(unsigned Num);
 
-  /// Helper struct for `matchPack()`. Describes the instructions and operands
-  /// of a pack pattern.
-  struct PackPattern {
-    /// The insertelement instructions that form the pack pattern in bottom-up
-    /// order, i.e., the first instruction in `Instrs` is the bottom-most
-    /// InsertElement instruction of the pack pattern.
-    /// For example in this simple pack pattern:
-    ///  %Pack0 = insertelement <2 x i8> poison, i8 %v0, i64 0
-    ///  %Pack1 = insertelement <2 x i8> %Pack0, i8 %v1, i64 1
-    /// this is [ %Pack1, %Pack0 ].
-    SmallVector<Instruction *> Instrs;
-    /// The "external" operands of the pack pattern, i.e., the values that get
-    /// packed into a vector, skipping the ones in `Instrs`. The operands are in
-    /// bottom-up order, starting from the operands of the bottom-most insert.
-    /// So in our example this would be [ %v1, %v0 ].
-    SmallVector<Value *> Operands;
-  };
-
-  /// If \p I is the last instruction of a pack pattern (i.e., an InsertElement
-  /// into a vector), then this function returns the instructions in the pack
-  /// and the operands in the pack, else returns nullopt.
-  /// Here is an example of a matched pattern:
-  ///  %PackA0 = insertelement <2 x i8> poison, i8 %v0, i64 0
-  ///  %PackA1 = insertelement <2 x i8> %PackA0, i8 %v1, i64 1
-  /// TODO: this currently detects only simple canonicalized patterns.
-  static std::optional<PackPattern> matchPack(Instruction *I) {
-    // TODO: Support vector pack patterns.
-    // TODO: Support out-of-order inserts.
-
-    // Early return if `I` is not an Insert.
-    if (!isa<InsertElementInst>(I))
-      return std::nullopt;
-    auto *BB0 = I->getParent();
-    // The pack contains as many instrs as the lanes of the bottom-most Insert
-    unsigned ExpectedNumInserts = VecUtils::getNumLanes(I);
-    assert(ExpectedNumInserts >= 2 && "Expected at least 2 inserts!");
-    PackPattern Pack;
-    Pack.Operands.resize(ExpectedNumInserts);
-    // Collect the inserts by walking up the use-def chain.
-    Instruction *InsertI = I;
-    for (auto ExpectedLane : reverse(seq<unsigned>(ExpectedNumInserts))) {
-      if (InsertI == nullptr)
-        return std::nullopt;
-      if (InsertI->getParent() != BB0)
-        return std::nullopt;
-      // Check the lane.
-      auto *LaneC = dyn_cast<ConstantInt>(InsertI->getOperand(2));
-      if (LaneC == nullptr || LaneC->getSExtValue() != ExpectedLane)
-        return std::nullopt;
-      Pack.Instrs.push_back(InsertI);
-      Pack.Operands[ExpectedLane] = InsertI->getOperand(1);
-
-      Value *Op = InsertI->getOperand(0);
-      if (ExpectedLane == 0) {
-        // Check the topmost insert. The operand should be a Poison.
-        if (!isa<PoisonValue>(Op))
-          return std::nullopt;
-      } else {
-        InsertI = dyn_cast<InsertElementInst>(Op);
-      }
-    }
-    return Pack;
-  }
-
 #ifndef NDEBUG
   /// Helper dump function for debugging.
   LLVM_DUMP_METHOD static void dump(ArrayRef<Value *> Bndl);
   LLVM_DUMP_METHOD static void dump(ArrayRef<Instruction *> Bndl);
 #endif // NDEBUG
 };
 
-} // namespace sandboxir
-
-} // namespace llvm
+} // namespace llvm::sandboxir
 
 #endif // LLVM_TRANSFORMS_VECTORIZE_SANDBOXVECTORIZER_VECUTILS_H

llvm/include/llvm/Transforms/Vectorize/SandboxVectorizer/VecUtils.h

@@ -9,7 +9,6 @@ add_llvm_component_library(LLVMVectorize
   SandboxVectorizer/Interval.cpp
   SandboxVectorizer/Legality.cpp
   SandboxVectorizer/Passes/BottomUpVec.cpp
-  SandboxVectorizer/Passes/PackReuse.cpp
   SandboxVectorizer/Passes/RegionsFromBBs.cpp
   SandboxVectorizer/Passes/RegionsFromMetadata.cpp
   SandboxVectorizer/Passes/SeedCollection.cpp

llvm/lib/Transforms/Vectorize/CMakeLists.txt

@@ -18,7 +18,6 @@
 #endif
 
 REGION_PASS("null", ::llvm::sandboxir::NullPass)
-REGION_PASS("pack-reuse", ::llvm::sandboxir::PackReuse)
 REGION_PASS("print-instruction-count", ::llvm::sandboxir::PrintInstructionCount)
 REGION_PASS("print-region", ::llvm::sandboxir::PrintRegion)
 REGION_PASS("tr-save", ::llvm::sandboxir::TransactionSave)

llvm/lib/Transforms/Vectorize/SandboxVectorizer/Passes/PackReuse.cpp

@@ -2,7 +2,6 @@
 
 #include "llvm/Transforms/Vectorize/SandboxVectorizer/Passes/BottomUpVec.h"
 #include "llvm/Transforms/Vectorize/SandboxVectorizer/Passes/NullPass.h"
-#include "llvm/Transforms/Vectorize/SandboxVectorizer/Passes/PackReuse.h"
 #include "llvm/Transforms/Vectorize/SandboxVectorizer/Passes/PrintInstructionCount.h"
 #include "llvm/Transforms/Vectorize/SandboxVectorizer/Passes/PrintRegion.h"
 #include "llvm/Transforms/Vectorize/SandboxVectorizer/Passes/RegionsFromBBs.h"