[mlir][scf] ExecuteRegionOp folders to consider no_inline attribute (#158083)
Fix missing handling of no_inline existence in ExecuteRegionOp folders.
Co-authored-by: Dor Arad <dor.arad@mobileye.com>
GitOrigin-RevId: 43ba999d1205f787e76f4d4a01f45380d373efe9
diff --git a/lib/Dialect/SCF/IR/SCF.cpp b/lib/Dialect/SCF/IR/SCF.cpp
index 45b14fc..c35989e 100644
--- a/lib/Dialect/SCF/IR/SCF.cpp
+++ b/lib/Dialect/SCF/IR/SCF.cpp
@@ -237,6 +237,8 @@
LogicalResult matchAndRewrite(ExecuteRegionOp op,
PatternRewriter &rewriter) const override {
+ if (op.getNoInline())
+ return failure();
if (!isa<FunctionOpInterface, ExecuteRegionOp>(op->getParentOp()))
return failure();
diff --git a/test/Dialect/SCF/canonicalize.mlir b/test/Dialect/SCF/canonicalize.mlir
index 2752c49..4ad2da8 100644
--- a/test/Dialect/SCF/canonicalize.mlir
+++ b/test/Dialect/SCF/canonicalize.mlir
@@ -1483,6 +1483,24 @@
// -----
+// CHECK-LABEL: func @execute_region_under_func_no_inline
+func.func @execute_region_under_func_no_inline() {
+ "test.foo"() : () -> ()
+ %v = scf.execute_region -> i64 no_inline {
+ %x = "test.val"() : () -> i64
+ scf.yield %x : i64
+ }
+ "test.bar"(%v) : (i64) -> ()
+ return
+}
+
+// CHECK-NEXT: "test.foo"() : () -> ()
+// CHECK-NEXT: scf.execute_region
+// CHECK-NEXT: %[[VAL:.*]] = "test.val"() : () -> i64
+// CHECK-NEXT: scf.yield %[[VAL]] : i64
+
+// -----
+
// CHECK-LABEL: func @func_execute_region_inline
func.func @func_execute_region_inline() {
"test.foo"() : () -> ()