[Mlir-commits] [mlir] a299539 - [mlir][linalg] Expand test case for tile-and-fuse with transform dialect

[Matthias Springer]

Author: Matthias Springer
Date: 2022-07-25T16:14:35+02:00
New Revision: a299539adeede887b39e4a913e98047651656592

URL: https://github.com/llvm/llvm-project/commit/a299539adeede887b39e4a913e98047651656592
DIFF: https://github.com/llvm/llvm-project/commit/a299539adeede887b39e4a913e98047651656592.diff

LOG: [mlir][linalg] Expand test case for tile-and-fuse with transform dialect

Reverse the order of the payload ops. fuse_into_containing_op should still work.

Differential Revision: https://reviews.llvm.org/D130355

Added: 
    

Modified: 
    mlir/test/Dialect/Linalg/transform-tile-and-fuse.mlir
    mlir/test/lib/Dialect/Transform/TestTransformDialectExtension.cpp
    mlir/test/lib/Dialect/Transform/TestTransformDialectExtension.td

Removed: 
    


################################################################################
diff  --git a/mlir/test/Dialect/Linalg/transform-tile-and-fuse.mlir b/mlir/test/Dialect/Linalg/transform-tile-and-fuse.mlir
index a2547d5973a54..1109950916ed8 100644
--- a/mlir/test/Dialect/Linalg/transform-tile-and-fuse.mlir
+++ b/mlir/test/Dialect/Linalg/transform-tile-and-fuse.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-opt %s --test-transform-dialect-interpreter -canonicalize | FileCheck %s
+// RUN: mlir-opt %s --test-transform-dialect-interpreter --split-input-file -canonicalize | FileCheck %s
 
 // This is a simple tile-and-fuse example with a single fusion group.
 
@@ -22,7 +22,7 @@ module {
         {__producer__}
         ins(%A, %B : tensor<?x?xf32>, tensor<?x?xf32>)
         outs(%5 : tensor<?x?xf32>) -> tensor<?x?xf32>
-    %7 = linalg.generic 
+    %7 = linalg.generic
         {__root__,
          indexing_maps = [affine_map<(d0, d1) -> (d0)>,
                           affine_map<(d0, d1) -> (d0, d1)>,
@@ -56,3 +56,64 @@ module {
     }
   }
 }
+
+// -----
+
+// Inverse the order of the payload ops passed to the tile_to_foreach_thread_op
+// op. Fusion should still work.
+
+module {
+  // CHECK: func @foo
+  // CHECK:   scf.foreach_thread {{.*}} {
+  // CHECK:     linalg.fill
+  // CHECK:     linalg.matmul
+  // CHECK:     linalg.generic
+  // CHECK:   }
+  func.func @foo(%A: tensor<?x?xf32>, %B: tensor<?x?xf32>, %C: tensor<?xf32>,
+                 %D: tensor<?x?xf32>, %sz0: index, %sz1: index)
+      -> tensor<?x?xf32>
+  {
+    %cst = arith.constant 0.000000e+00 : f32
+    %5 = linalg.fill
+        {__producer__}
+        ins(%cst : f32)
+        outs(%D : tensor<?x?xf32>) -> tensor<?x?xf32>
+    %6 = linalg.matmul
+        {__producer__}
+        ins(%A, %B : tensor<?x?xf32>, tensor<?x?xf32>)
+        outs(%5 : tensor<?x?xf32>) -> tensor<?x?xf32>
+    %7 = linalg.generic
+        {__root__,
+         indexing_maps = [affine_map<(d0, d1) -> (d0)>,
+                          affine_map<(d0, d1) -> (d0, d1)>,
+                          affine_map<(d0, d1) -> (d0, d1)>],
+         iterator_types = ["parallel", "parallel"]
+        }
+        ins(%C, %6 : tensor<?xf32>, tensor<?x?xf32>)
+        outs(%D : tensor<?x?xf32>) {
+    ^bb0(%arg2: f32, %arg3: f32, %arg4: f32):
+      %16 = arith.maxf %arg3, %cst : f32
+      %17 = arith.cmpf ogt, %arg2, %cst : f32
+      %18 = arith.select %17, %cst, %16 : f32
+      linalg.yield %18 : f32
+    } -> tensor<?x?xf32>
+    return %7 : tensor<?x?xf32>
+  }
+
+  transform.with_pdl_patterns {
+  ^bb0(%arg0: !pdl.operation):
+    transform.sequence %arg0 {
+    ^bb1(%arg1: !pdl.operation):
+      // Find the root and all producers.
+      %root = transform.structured.match attribute{"__root__"} in %arg1
+      %producers = transform.structured.match attribute{"__producer__"} in %arg1
+      %reversed_producers = transform.test_reverse_payload_ops %producers
+
+      // Tile the root.
+      %foreach_thread_op, %tiled_op = transform.structured.tile_to_foreach_thread_op %root num_threads [10, 20]
+
+      // Fuse all producers.
+      transform.structured.fuse_into_containing_op %reversed_producers into %foreach_thread_op
+    }
+  }
+}

diff  --git a/mlir/test/lib/Dialect/Transform/TestTransformDialectExtension.cpp b/mlir/test/lib/Dialect/Transform/TestTransformDialectExtension.cpp
index 3893508ff19f4..e7ad8afa85929 100644
--- a/mlir/test/lib/Dialect/Transform/TestTransformDialectExtension.cpp
+++ b/mlir/test/lib/Dialect/Transform/TestTransformDialectExtension.cpp
@@ -198,6 +198,16 @@ DiagnosedSilenceableFailure mlir::test::TestRemoveTestExtensionOp::apply(
   state.removeExtension<TestTransformStateExtension>();
   return DiagnosedSilenceableFailure::success();
 }
+
+DiagnosedSilenceableFailure
+mlir::test::TestReversePayloadOpsOp::apply(transform::TransformResults &results,
+                                           transform::TransformState &state) {
+  ArrayRef<Operation *> payloadOps = state.getPayloadOps(getTarget());
+  auto reversedOps = llvm::to_vector(llvm::reverse(payloadOps));
+  results.set(getResult().cast<OpResult>(), reversedOps);
+  return DiagnosedSilenceableFailure::success();
+}
+
 DiagnosedSilenceableFailure mlir::test::TestTransformOpWithRegions::apply(
     transform::TransformResults &results, transform::TransformState &state) {
   return DiagnosedSilenceableFailure::success();

diff  --git a/mlir/test/lib/Dialect/Transform/TestTransformDialectExtension.td b/mlir/test/lib/Dialect/Transform/TestTransformDialectExtension.td
index 3d05c6f4681d2..4cc6b415ec606 100644
--- a/mlir/test/lib/Dialect/Transform/TestTransformDialectExtension.td
+++ b/mlir/test/lib/Dialect/Transform/TestTransformDialectExtension.td
@@ -101,6 +101,16 @@ def TestRemoveTestExtensionOp
   let cppNamespace = "::mlir::test";
 }
 
+def TestReversePayloadOpsOp
+  : Op<Transform_Dialect, "test_reverse_payload_ops",
+    [FunctionalStyleTransformOpTrait, MemoryEffectsOpInterface,
+     DeclareOpInterfaceMethods<TransformOpInterface>]> {
+  let arguments = (ins PDL_Operation:$target);
+  let results = (outs PDL_Operation:$result);
+  let assemblyFormat = "$target attr-dict";
+  let cppNamespace = "::mlir::test";
+}
+
 def TestTransformOpWithRegions
   : Op<Transform_Dialect, "test_transform_op_with_regions",
        [DeclareOpInterfaceMethods<TransformOpInterface>,