Skip to content

[mlir] fix crash when scf utils work on llvm.func #120688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 20, 2024
Merged

[mlir] fix crash when scf utils work on llvm.func #120688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mlir/lib/Dialect/SCF/Utils/Utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ FailureOr<func::FuncOp> mlir::outlineSingleBlockRegion(RewriterBase &rewriter,

// Outline before current function.
OpBuilder::InsertionGuard g(rewriter);
rewriter.setInsertionPoint(region.getParentOfType<func::FuncOp>());
rewriter.setInsertionPoint(region.getParentOfType<FunctionOpInterface>());

SetVector<Value> captures;
getUsedValuesDefinedAbove(region, captures);
Expand Down
27 changes: 27 additions & 0 deletions mlir/test/Transforms/scf-if-utils.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,30 @@ func.func @outline_empty_if_else(%cond: i1, %a: index, %b: memref<?xf32>, %c: i8
}
return
}

// -----

// This test checks scf utils can work on llvm func.

// CHECK: func @outlined_then0() {
// CHECK-NEXT: return
// CHECK-NEXT: }
// CHECK: func @outlined_else0(%{{.*}}: i1, %{{.*}}: i32) {
// CHECK-NEXT: "some_op"(%{{.*}}, %{{.*}}) : (i1, i32) -> ()
// CHECK-NEXT: return
// CHECK-NEXT: }
// CHECK: llvm.func @llvm_func(%{{.*}}: i1, %{{.*}}: i32) {
// CHECK-NEXT: scf.if %{{.*}} {
// CHECK-NEXT: func.call @outlined_then0() : () -> ()
// CHECK-NEXT: } else {
// CHECK-NEXT: func.call @outlined_else0(%{{.*}}, %{{.*}}) : (i1, i32) -> ()
// CHECK-NEXT: }
// CHECK-NEXT: llvm.return
// CHECK-NEXT: }
llvm.func @llvm_func(%cond: i1, %a: i32) {
scf.if %cond {
} else {
"some_op"(%cond, %a) : (i1, i32) -> ()
}
llvm.return
}
4 changes: 4 additions & 0 deletions mlir/test/lib/Dialect/SCF/TestSCFUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ struct TestSCFIfUtilsPass
StringRef getDescription() const final { return "test scf.if utils"; }
explicit TestSCFIfUtilsPass() = default;

void getDependentDialects(DialectRegistry &registry) const override {
registry.insert<func::FuncDialect>();
}

void runOnOperation() override {
int count = 0;
getOperation().walk([&](scf::IfOp ifOp) {
Expand Down
Loading