[GlobalOptimization] Update tests for Conv2D to Img2Col pass

Move test file from Preprocessing to GlobalOptimization and update
preprocessing_flags.mlir to remove references to the moved pass.

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

Author: phoebesv

compiler/src/iree/compiler/GlobalOptimization/test/BUILD.bazel

@@ -18,6 +18,7 @@ iree_lit_test_suite(
         # keep sorted
         [
             "cleanup_numeric_narrowing.mlir",
+            "conv2d_to_img2col.mlir",
             "data_layout_propagation.mlir",
             "demote_contraction_inputs_to_bf16.mlir",
             "detach_elementwise_from_named_ops.mlir",

compiler/src/iree/compiler/GlobalOptimization/test/CMakeLists.txt

@@ -15,6 +15,7 @@ iree_lit_test_suite(
     lit
   SRCS
     "cleanup_numeric_narrowing.mlir"
+    "conv2d_to_img2col.mlir"
     "data_layout_propagation.mlir"
     "demote_contraction_inputs_to_bf16.mlir"
     "detach_elementwise_from_named_ops.mlir"

…ssing/Common/test/conv2d_to_img2col.mlir …Optimization/test/conv2d_to_img2col.mlircompiler/src/iree/compiler/Preprocessing/Common/test/conv2d_to_img2col.mlir renamed to compiler/src/iree/compiler/GlobalOptimization/test/conv2d_to_img2col.mlir compiler/src/iree/compiler/Preprocessing/Common/test/conv2d_to_img2col.mlir renamed to compiler/src/iree/compiler/GlobalOptimization/test/conv2d_to_img2col.mlir

@@ -1,4 +1,4 @@
-// RUN: iree-opt --split-input-file -iree-preprocessing-convert-conv2d-to-img2col %s | FileCheck %s
+// RUN: iree-opt --split-input-file --iree-global-opt-convert-conv2d-to-img2col %s | FileCheck %s
 
 func.func @conv_16433136(%arg0: tensor<1x16x16x4xf32>, %arg1: tensor<3x3x4x16xf32>, %arg2: tensor<1x14x14x16xf32>) -> tensor<1x14x14x16xf32> {
     %0 = linalg.conv_2d_nhwc_hwcf

compiler/src/iree/compiler/Preprocessing/Common/BUILD.bazel

@@ -38,7 +38,6 @@ iree_compiler_cc_library(
         "ApplyPDLPatterns.cpp",
         "AttrBasedPipelinePass.cpp",
         "Convert1X1FilterConv2DToMatmul.cpp",
-        "ConvertConv2DToImg2Col.cpp",
         "ConvertConvFilterToChannelsLast.cpp",
         "ConvertConvToChannelsLast.cpp",
         "FoldAttentionWithTranspose.cpp",

compiler/src/iree/compiler/Preprocessing/Common/CMakeLists.txt

@@ -29,7 +29,6 @@ iree_cc_library(
     "ApplyPDLPatterns.cpp"
     "AttrBasedPipelinePass.cpp"
     "Convert1X1FilterConv2DToMatmul.cpp"
-    "ConvertConv2DToImg2Col.cpp"
     "ConvertConvFilterToChannelsLast.cpp"
     "ConvertConvToChannelsLast.cpp"
     "FoldAttentionWithTranspose.cpp"

compiler/src/iree/compiler/Preprocessing/Common/test/CMakeLists.txt

@@ -16,7 +16,6 @@ iree_lit_test_suite(
   SRCS
     "attr_based_pipeline.mlir"
     "conv1x1_to_matmul.mlir"
-    "conv2d_to_img2col.mlir"
     "conv_filter_to_channels_last.mlir"
     "conv_to_channels_last.mlir"
     "fold_attention_with_transpose.mlir"

tests/compiler_driver/preprocessing_flags.mlir

@@ -2,8 +2,8 @@
 // RUN:   --iree-hal-target-device=local \
 // RUN:   --iree-hal-local-target-device-backends=llvm-cpu \
 // RUN:   --compile-to=preprocessing \
-// RUN:   --iree-preprocessing-pass-pipeline="builtin.module(util.func(iree-preprocessing-convert-conv2d-to-img2col,iree-preprocessing-pad-linalg-ops{pad-size=16}))" \
-// RUN:   --mlir-print-ir-after=iree-preprocessing-convert-conv2d-to-img2col --mlir-print-ir-after=iree-preprocessing-pad-linalg-ops %s 2>&1 \
+// RUN:   --iree-preprocessing-pass-pipeline="builtin.module(util.func(iree-preprocessing-pad-linalg-ops{pad-size=16}))" \
+// RUN:   --mlir-print-ir-after=iree-preprocessing-pad-linalg-ops %s 2>&1 \
 // RUN:   | FileCheck %s
 
 func.func @test(%arg0 : tensor<10x20xf32>, %arg1 : tensor<20x30xf32>, %arg2 : tensor<10x30xf32>) -> tensor<10x30xf32> {
@@ -13,7 +13,6 @@ func.func @test(%arg0 : tensor<10x20xf32>, %arg1 : tensor<20x30xf32>, %arg2 : te
 }
 
 // Just check that the pass runs, and that the compilation finishes
-//       CHECK: ConvertConv2DToImg2ColPass (iree-preprocessing-convert-conv2d-to-img2col)
 //       CHECK: PadLinalgOpsPass (iree-preprocessing-pad-linalg-ops)
 // CHECK-LABEL: module
 //       CHECK:   util.func public @test(