Delete LoadStoreVectorizationPass which is unused in IREE (#5514)

We have a proper flow to vectorize element wise ops after tiling, and it is not used in old pipeline. We can delete the pass and the option. The registration of `createVectorizeLinalgConvPass` was missing. The PR also adds it to init_conversions.h.
iree-org · Apr 19, 2021 · d1b5956 · d1b5956
1 parent 064a416
commit d1b5956
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 538 deletions.
diff --git a/iree/compiler/Conversion/LinalgToSPIRV/CodeGenOptionUtils.cpp b/iree/compiler/Conversion/LinalgToSPIRV/CodeGenOptionUtils.cpp
@@ -43,11 +43,6 @@ SPIRVCodegenOptions getSPIRVCodegenOptionsFromClOptions() {
       llvm::cl::desc("Use workgroup memory in SPIR-V code generation"),
       llvm::cl::init(false));
 
-  static llvm::cl::opt<bool> clVectorizeMemref(
-      "iree-spirv-enable-memref-vectorization",
-      llvm::cl::desc("Vectorize memref if possible in SPIR-V code generation"),
-      llvm::cl::init(false));
-
   static llvm::cl::list<unsigned> clWorkgroupSizes(
       "iree-spirv-workgroup-size",
       llvm::cl::desc("Set workgroup size to use for SPIR-V code generation"),
@@ -68,7 +63,6 @@ SPIRVCodegenOptions getSPIRVCodegenOptionsFromClOptions() {
   options.enableVectorization =
       clEnableLinalgOnTensorsSPIRV || clEnableVectorization;
   options.useWorkgroupMemory = clUseWorkgroupMemory;
-  options.vectorizeMemref = clVectorizeMemref;
   options.usingLinalgOnTensors = clEnableLinalgOnTensorsSPIRV;
   return options;
 }

diff --git a/iree/compiler/Conversion/LinalgToSPIRV/Passes.cpp b/iree/compiler/Conversion/LinalgToSPIRV/Passes.cpp
@@ -94,10 +94,6 @@ static void addLinalgToSPIRVPasses(OpPassManager &pm,
   }
 
   pm.addPass(createTileAndVectorizeInOneWorkgroupPass(options));
-  if (options.vectorizeMemref) {
-    pm.nest<ModuleOp>().addNestedPass<FuncOp>(
-        createLoadStoreVectorizationPass());
-  }
   pm.nest<ModuleOp>().addPass(createCanonicalizerPass());
 
   //===--------------------------------------------------------------------===//

diff --git a/iree/compiler/Conversion/LinalgToVector/BUILD b/iree/compiler/Conversion/LinalgToVector/BUILD
@@ -21,7 +21,6 @@ package(
 cc_library(
     name = "LinalgToVector",
     srcs = [
-        "LoadStoreVectorization.cpp",
         "VectorizeConv.cpp",
     ],
     hdrs = [

diff --git a/iree/compiler/Conversion/LinalgToVector/CMakeLists.txt b/iree/compiler/Conversion/LinalgToVector/CMakeLists.txt
@@ -16,7 +16,6 @@ iree_cc_library(
   HDRS
     "Passes.h"
   SRCS
-    "LoadStoreVectorization.cpp"
     "VectorizeConv.cpp"
   DEPS
     LLVMSupport

diff --git a/iree/compiler/Conversion/LinalgToVector/LoadStoreVectorization.cpp b/iree/compiler/Conversion/LinalgToVector/LoadStoreVectorization.cpp
diff --git a/iree/compiler/Conversion/LinalgToVector/Passes.h b/iree/compiler/Conversion/LinalgToVector/Passes.h
@@ -20,9 +20,6 @@
 namespace mlir {
 namespace iree_compiler {
 
-/// Creates a pass to vectorize Linalg operations.
-std::unique_ptr<Pass> createLoadStoreVectorizationPass();
-
 /// Creates a pass to vectorize a very specific form of linalg.conv ops.
 std::unique_ptr<Pass> createVectorizeLinalgConvPass();
 

diff --git a/iree/compiler/Conversion/LinalgToVector/test/BUILD b/iree/compiler/Conversion/LinalgToVector/test/BUILD
@@ -28,7 +28,6 @@ iree_lit_test_suite(
     srcs = enforce_glob(
         [
             "vectorize_linalg_conv.mlir",
-            "vectorize_linalg_ops.mlir",
         ],
         include = ["*.mlir"],
     ),

diff --git a/iree/compiler/Conversion/LinalgToVector/test/CMakeLists.txt b/iree/compiler/Conversion/LinalgToVector/test/CMakeLists.txt
@@ -15,7 +15,6 @@ iree_lit_test_suite(
     lit
   SRCS
     "vectorize_linalg_conv.mlir"
-    "vectorize_linalg_ops.mlir"
   DATA
     iree::tools::IreeFileCheck
     iree::tools::iree-opt