Rename enableConv2DToImg2Col option to useIm2colForConvs

- Rename option from enableConv2DToImg2Col to useIm2colForConvs
- Update CLI flag from enable-conv2d-to-img2col to use-im2col-for-convs
- Update pipeline flag from iree-global-opt-enable-conv2d-to-img2col to
  iree-global-opt-use-im2col-for-convs

Signed-off-by: Phoebe Chen <phoebe.chen@sifive.com>

Author: phoebesv

compiler/src/iree/compiler/GlobalOptimization/Passes.cpp

@@ -118,7 +118,7 @@ void buildGlobalOptimizationPassPipeline(
       .addPass(IREE::Util::createOptimizeIntArithmeticPass)
       .addPass(createLinalgQuantizedConvToConvPass)
       .addPass(createLinalgQuantizedMatmulToMatmulPass)
-      .addPredicatedPass(transformOptions.enableConv2DToImg2Col,
+      .addPredicatedPass(transformOptions.useIm2colForConvs,
                          createConvertConv2DToImg2ColPass)
       .addPass(IREE::Flow::createCanonicalizePass)
       .addPass(createRemoveZeroExtentTensorsPass)

compiler/src/iree/compiler/GlobalOptimization/Passes.h

@@ -121,10 +121,10 @@ struct TransformOptions : public PassPipelineOptions<TransformOptions> {
       llvm::cl::desc("Converts linalg named matmul ops to linalg generic ops."),
       llvm::cl::init(false),
   };
-  Option<bool> enableConv2DToImg2Col{
+  Option<bool> useIm2colForConvs{
       *this,
-      "enable-conv2d-to-img2col",
-      llvm::cl::desc("Enables conversion of Conv2D operations to img2col + "
+      "use-im2col-for-convs",
+      llvm::cl::desc("Enables converting convolution operations to im2col + "
                      "matmul form to leverage optimized matmul implementations."),
       llvm::cl::init(false),
   };

compiler/src/iree/compiler/Pipelines/Options.cpp

@@ -303,8 +303,8 @@ void GlobalOptimizationOptions::bindOptions(OptionsBinder &binder) {
                      "global optimization to enable better fusion."),
       llvm::cl::cat(category));
   binder.opt<bool>(
-      "iree-global-opt-enable-conv2d-to-img2col", enableConv2DToImg2Col,
-      llvm::cl::desc("Enables conversion of Conv2D operations to img2col + "
+      "iree-global-opt-use-im2col-for-convs", useIm2colForConvs,
+      llvm::cl::desc("Enables converting convolution operations to im2col + "
                      "matmul form to leverage optimized matmul implementations."),
       llvm::cl::cat(category));
 }

compiler/src/iree/compiler/Pipelines/Options.h

@@ -187,8 +187,8 @@ struct GlobalOptimizationOptions {
   // Converts linalg named matmul ops to linalg generic ops.
   bool generalizeMatmul = false;
 
-  // Enables conversion of Conv2D operations to img2col + matmul form.
-  bool enableConv2DToImg2Col = false;
+  // Enables converting convolution operations to im2col + matmul form.
+  bool useIm2colForConvs = false;
 
   void bindOptions(OptionsBinder &binder);
   using FromFlags = OptionsFromFlags<GlobalOptimizationOptions>;

compiler/src/iree/compiler/Pipelines/Pipelines.cpp

@@ -212,8 +212,8 @@ void buildIREEPrecompileTransformPassPipeline(
       globalOptimizationOptions.stripAssertions;
   globalTransformOptions.generalizeMatmul =
       globalOptimizationOptions.generalizeMatmul;
-  globalTransformOptions.enableConv2DToImg2Col =
-      globalOptimizationOptions.enableConv2DToImg2Col;
+  globalTransformOptions.useIm2colForConvs =
+      globalOptimizationOptions.useIm2colForConvs;
   globalTransformOptions.constExprHoisting = pipelineOptions.constExprHoisting;
   globalTransformOptions.constExprMaxSizeIncreaseThreshold =
       pipelineOptions.constExprMaxSizeIncreaseThreshold;