Make the folder more robust against op fold() methods that generate a type mismatch
We could extend this with an interface to allow dialect to perform a type
conversion, but that would make the folder creating operation which isn't
the case at the moment, and isn't necessarily always desirable.
Reviewed By: rriddle
Differential Revision: https://reviews.llvm.org/D95991
diff --git a/mlir/test/Transforms/test-canonicalize.mlir b/mlir/test/Transforms/test-canonicalize.mlir
index 0cd308d..cc6af03 100644
--- a/mlir/test/Transforms/test-canonicalize.mlir
+++ b/mlir/test/Transforms/test-canonicalize.mlir
@@ -1,10 +1,10 @@
-// RUN: mlir-opt -allow-unregistered-dialect %s -pass-pipeline='func(canonicalize)' | FileCheck %s
+// RUN: mlir-opt %s -pass-pipeline='func(canonicalize)' | FileCheck %s
// CHECK-LABEL: func @remove_op_with_inner_ops_pattern
func @remove_op_with_inner_ops_pattern() {
// CHECK-NEXT: return
"test.op_with_region_pattern"() ({
- "foo.op_with_region_terminator"() : () -> ()
+ "test.op_with_region_terminator"() : () -> ()
}) : () -> ()
return
}
@@ -13,7 +13,7 @@
func @remove_op_with_inner_ops_fold_no_side_effect() {
// CHECK-NEXT: return
"test.op_with_region_fold_no_side_effect"() ({
- "foo.op_with_region_terminator"() : () -> ()
+ "test.op_with_region_terminator"() : () -> ()
}) : () -> ()
return
}
@@ -23,7 +23,7 @@
func @remove_op_with_inner_ops_fold(%arg0 : i32) -> (i32) {
// CHECK-NEXT: return %[[ARG_0]]
%0 = "test.op_with_region_fold"(%arg0) ({
- "foo.op_with_region_terminator"() : () -> ()
+ "test.op_with_region_terminator"() : () -> ()
}) : (i32) -> (i32)
return %0 : i32
}
@@ -51,3 +51,14 @@
// CHECK-NEXT: return %[[O0]], %[[O1]]
return %y, %z: i32, i32
}
+
+func @typemismatch() -> i32 {
+ %c42 = constant 42.0 : f32
+
+ // The "passthrough_fold" folder will naively return its operand, but we don't
+ // want to fold here because of the type mismatch.
+
+ // CHECK: "test.passthrough_fold"
+ %0 = "test.passthrough_fold"(%c42) : (f32) -> (i32)
+ return %0 : i32
+}
