forked from llvm/llvm-project
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[mlir] Add a utility method to move operation dependencies. (llvm#129975
) The added utility method moves all SSA values that an operation depends upon before an insertion point. This is useful during transformations where such movements might make transformations (like fusion) more powerful. To test the operation add a transform dialect op that calls the move operation. To be able to capture the `notifyMatchFailure` messages from the transformation and to report/check these in the test modify the `ErrorCheckingTrackingListener` to capture the last match failure notification. --------- Signed-off-by: MaheshRavishankar <[email protected]>
- Loading branch information
1 parent
5bf0486
commit 205c532
Showing
10 changed files
with
452 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,236 @@ | ||
| // RUN: mlir-opt --allow-unregistered-dialect --transform-interpreter --split-input-file --verify-diagnostics %s | FileCheck %s | ||
|
|
||
| // Check simple move of dependent operation before insertion. | ||
| func.func @simple_move() -> f32 { | ||
| %0 = "before"() : () -> (f32) | ||
| %1 = "moved_op"() : () -> (f32) | ||
| %2 = "foo"(%1) : (f32) -> (f32) | ||
| return %2 : f32 | ||
| } | ||
| // CHECK-LABEL: func @simple_move() | ||
| // CHECK: %[[MOVED:.+]] = "moved_op" | ||
| // CHECK: %[[BEFORE:.+]] = "before" | ||
| // CHECK: %[[FOO:.+]] = "foo"(%[[MOVED]]) | ||
| // CHECK: return %[[FOO]] | ||
|
|
||
| module attributes {transform.with_named_sequence} { | ||
| transform.named_sequence @__transform_main(%arg0 : !transform.any_op {transform.readonly}) { | ||
| %op1 = transform.structured.match ops{["foo"]} in %arg0 | ||
| : (!transform.any_op) -> !transform.any_op | ||
| %op2 = transform.structured.match ops{["before"]} in %arg0 | ||
| : (!transform.any_op) -> !transform.any_op | ||
| transform.test.move_operand_deps %op1 before %op2 | ||
| : !transform.any_op, !transform.any_op | ||
| transform.yield | ||
| } | ||
| } | ||
|
|
||
| // ----- | ||
|
|
||
| // Move operands that are implicitly captured by the op | ||
| func.func @move_region_dependencies() -> f32 { | ||
| %0 = "before"() : () -> (f32) | ||
| %1 = "moved_op"() : () -> (f32) | ||
| %2 = "foo"() ({ | ||
| %3 = "inner_op"(%1) : (f32) -> (f32) | ||
| "yield"(%3) : (f32) -> () | ||
| }) : () -> (f32) | ||
| return %2 : f32 | ||
| } | ||
| // CHECK-LABEL: func @move_region_dependencies() | ||
| // CHECK: %[[MOVED:.+]] = "moved_op" | ||
| // CHECK: %[[BEFORE:.+]] = "before" | ||
| // CHECK: %[[FOO:.+]] = "foo" | ||
| // CHECK: return %[[FOO]] | ||
|
|
||
| module attributes {transform.with_named_sequence} { | ||
| transform.named_sequence @__transform_main(%arg0 : !transform.any_op {transform.readonly}) { | ||
| %op1 = transform.structured.match ops{["foo"]} in %arg0 | ||
| : (!transform.any_op) -> !transform.any_op | ||
| %op2 = transform.structured.match ops{["before"]} in %arg0 | ||
| : (!transform.any_op) -> !transform.any_op | ||
| transform.test.move_operand_deps %op1 before %op2 | ||
| : !transform.any_op, !transform.any_op | ||
| transform.yield | ||
| } | ||
| } | ||
|
|
||
| // ----- | ||
|
|
||
| // Move operations in toplogical sort order | ||
| func.func @move_in_topological_sort_order() -> f32 { | ||
| %0 = "before"() : () -> (f32) | ||
| %1 = "moved_op_1"() : () -> (f32) | ||
| %2 = "moved_op_2"() : () -> (f32) | ||
| %3 = "moved_op_3"(%1) : (f32) -> (f32) | ||
| %4 = "moved_op_4"(%1, %3) : (f32, f32) -> (f32) | ||
| %5 = "moved_op_5"(%2) : (f32) -> (f32) | ||
| %6 = "foo"(%4, %5) : (f32, f32) -> (f32) | ||
| return %6 : f32 | ||
| } | ||
| // CHECK-LABEL: func @move_in_topological_sort_order() | ||
| // CHECK: %[[MOVED_1:.+]] = "moved_op_1" | ||
| // CHECK-DAG: %[[MOVED_2:.+]] = "moved_op_3"(%[[MOVED_1]]) | ||
| // CHECK-DAG: %[[MOVED_3:.+]] = "moved_op_4"(%[[MOVED_1]], %[[MOVED_2]]) | ||
| // CHECK-DAG: %[[MOVED_4:.+]] = "moved_op_2" | ||
| // CHECK-DAG: %[[MOVED_5:.+]] = "moved_op_5"(%[[MOVED_4]]) | ||
| // CHECK: %[[BEFORE:.+]] = "before" | ||
| // CHECK: %[[FOO:.+]] = "foo"(%[[MOVED_3]], %[[MOVED_5]]) | ||
| // CHECK: return %[[FOO]] | ||
|
|
||
| module attributes {transform.with_named_sequence} { | ||
| transform.named_sequence @__transform_main(%arg0 : !transform.any_op {transform.readonly}) { | ||
| %op1 = transform.structured.match ops{["foo"]} in %arg0 | ||
| : (!transform.any_op) -> !transform.any_op | ||
| %op2 = transform.structured.match ops{["before"]} in %arg0 | ||
| : (!transform.any_op) -> !transform.any_op | ||
| transform.test.move_operand_deps %op1 before %op2 | ||
| : !transform.any_op, !transform.any_op | ||
| transform.yield | ||
| } | ||
| } | ||
|
|
||
| // ----- | ||
|
|
||
| func.func @move_region_dependencies() -> f32 { | ||
| %0 = "before"() : () -> (f32) | ||
| %1 = "moved_op_1"() : () -> (f32) | ||
| %2 = "moved_op_2"() ({ | ||
| "yield"(%1) : (f32) -> () | ||
| }) : () -> (f32) | ||
| %3 = "foo"() ({ | ||
| "yield"(%2) : (f32) -> () | ||
| }) : () -> (f32) | ||
| return %3 : f32 | ||
| } | ||
|
|
||
| module attributes {transform.with_named_sequence} { | ||
| transform.named_sequence @__transform_main(%arg0 : !transform.any_op {transform.readonly}) { | ||
| %op1 = transform.structured.match ops{["foo"]} in %arg0 | ||
| : (!transform.any_op) -> !transform.any_op | ||
| %op2 = transform.structured.match ops{["before"]} in %arg0 | ||
| : (!transform.any_op) -> !transform.any_op | ||
| transform.test.move_operand_deps %op1 before %op2 | ||
| : !transform.any_op, !transform.any_op | ||
| transform.yield | ||
| } | ||
| } | ||
| // CHECK-LABEL: func @move_region_dependencies() | ||
| // CHECK: %[[MOVED_1:.+]] = "moved_op_1" | ||
| // CHECK: %[[MOVED_2:.+]] = "moved_op_2" | ||
| // CHECK: "yield"(%[[MOVED_1]]) | ||
| // CHECK: "before" | ||
| // CHECK: %[[FOO:.+]] = "foo" | ||
| // CHECK: return %[[FOO]] | ||
|
|
||
| // ----- | ||
|
|
||
| // Current implementation omits following basic block argument when | ||
| // computing slices. Verify that this gives expected result. | ||
| func.func @ignore_basic_block_arguments() -> f32 { | ||
| ^bb0(): | ||
| %8 = "test"() : () -> (f32) | ||
| return %8: f32 | ||
| ^bb1(%bbArg : f32): | ||
| %0 = "before"() : () -> (f32) | ||
| %1 = "moved_op"() ({ | ||
| "yield"(%bbArg) : (f32) -> () | ||
| }) : () -> (f32) | ||
| %2 = "foo"() ({ | ||
| "yield"(%1) : (f32) -> () | ||
| }) : () -> (f32) | ||
| return %2 : f32 | ||
| } | ||
|
|
||
| module attributes {transform.with_named_sequence} { | ||
| transform.named_sequence @__transform_main(%arg0 : !transform.any_op {transform.readonly}) { | ||
| %op1 = transform.structured.match ops{["foo"]} in %arg0 | ||
| : (!transform.any_op) -> !transform.any_op | ||
| %op2 = transform.structured.match ops{["before"]} in %arg0 | ||
| : (!transform.any_op) -> !transform.any_op | ||
| transform.test.move_operand_deps %op1 before %op2 | ||
| : !transform.any_op, !transform.any_op | ||
| transform.yield | ||
| } | ||
| } | ||
| // CHECK-LABEL: func @ignore_basic_block_arguments() | ||
| // CHECK: %[[MOVED_1:.+]] = "moved_op" | ||
| // CHECK: "before" | ||
| // CHECK: %[[FOO:.+]] = "foo" | ||
| // CHECK: return %[[FOO]] | ||
|
|
||
| // ----- | ||
|
|
||
| // Fail when the "before" operation is part of the operation slice. | ||
| func.func @do_not_move_slice() -> f32 { | ||
| %0 = "before"() : () -> (f32) | ||
| %1 = "moved_op"(%0) : (f32) -> (f32) | ||
| %2 = "foo"(%1) : (f32) -> (f32) | ||
| return %2 : f32 | ||
| } | ||
|
|
||
| module attributes {transform.with_named_sequence} { | ||
| transform.named_sequence @__transform_main(%arg0 : !transform.any_op {transform.readonly}) { | ||
| %op1 = transform.structured.match ops{["foo"]} in %arg0 | ||
| : (!transform.any_op) -> !transform.any_op | ||
| %op2 = transform.structured.match ops{["before"]} in %arg0 | ||
| : (!transform.any_op) -> !transform.any_op | ||
| // expected-remark@+1{{cannot move dependencies before operation in backward slice of op}} | ||
| transform.test.move_operand_deps %op1 before %op2 | ||
| : !transform.any_op, !transform.any_op | ||
| transform.yield | ||
| } | ||
| } | ||
|
|
||
| // ----- | ||
|
|
||
| // Fail when the "before" operation is part of the operation slice (computed | ||
| // when looking through implicitly captured values). | ||
| func.func @do_not_move_slice() -> f32 { | ||
| %0 = "before"() : () -> (f32) | ||
| %1 = "moved_op"() ({ | ||
| "yield"(%0) : (f32) -> () | ||
| }) : () -> (f32) | ||
| %2 = "foo"() ({ | ||
| "yield"(%1) : (f32) -> () | ||
| }) : () -> (f32) | ||
| return %2 : f32 | ||
| } | ||
|
|
||
| module attributes {transform.with_named_sequence} { | ||
| transform.named_sequence @__transform_main(%arg0 : !transform.any_op {transform.readonly}) { | ||
| %op1 = transform.structured.match ops{["foo"]} in %arg0 | ||
| : (!transform.any_op) -> !transform.any_op | ||
| %op2 = transform.structured.match ops{["before"]} in %arg0 | ||
| : (!transform.any_op) -> !transform.any_op | ||
| // expected-remark@+1{{cannot move dependencies before operation in backward slice of op}} | ||
| transform.test.move_operand_deps %op1 before %op2 | ||
| : !transform.any_op, !transform.any_op | ||
| transform.yield | ||
| } | ||
| } | ||
|
|
||
| // ----- | ||
|
|
||
| // Dont move ops when insertion point does not dominate the op | ||
| func.func @do_not_move() -> f32 { | ||
| %1 = "moved_op"() : () -> (f32) | ||
| %2 = "foo"() ({ | ||
| "yield"(%1) : (f32) -> () | ||
| }) : () -> (f32) | ||
| %3 = "before"() : () -> f32 | ||
| return %2 : f32 | ||
| } | ||
|
|
||
| module attributes {transform.with_named_sequence} { | ||
| transform.named_sequence @__transform_main(%arg0 : !transform.any_op {transform.readonly}) { | ||
| %op1 = transform.structured.match ops{["foo"]} in %arg0 | ||
| : (!transform.any_op) -> !transform.any_op | ||
| %op2 = transform.structured.match ops{["before"]} in %arg0 | ||
| : (!transform.any_op) -> !transform.any_op | ||
| // expected-remark@+1{{insertion point does not dominate op}} | ||
| transform.test.move_operand_deps %op1 before %op2 | ||
| : !transform.any_op, !transform.any_op | ||
| transform.yield | ||
| } | ||
| } |
Oops, something went wrong.