Skip to content

[mlir][spirv] SCFToSPIRV: fix WhileOp block args types conversion #68588

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
Oct 10, 2023
Merged

[mlir][spirv] SCFToSPIRV: fix WhileOp block args types conversion #68588

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
9 changes: 7 additions & 2 deletions mlir/lib/Conversion/SCFToSPIRV/SCFToSPIRV.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,11 +344,16 @@ struct WhileOpConversion final : SCFToSPIRVPattern<scf::WhileOp> {
auto loopOp = rewriter.create<spirv::LoopOp>(loc, spirv::LoopControl::None);
loopOp.addEntryAndMergeBlock();

OpBuilder::InsertionGuard guard(rewriter);

Region &beforeRegion = whileOp.getBefore();
Region &afterRegion = whileOp.getAfter();

if (failed(rewriter.convertRegionTypes(&beforeRegion, typeConverter)) ||
failed(rewriter.convertRegionTypes(&afterRegion, typeConverter)))
return rewriter.notifyMatchFailure(whileOp,
"Failed to convert region types");

OpBuilder::InsertionGuard guard(rewriter);

Block &entryBlock = *loopOp.getEntryBlock();
Block &beforeBlock = beforeRegion.front();
Block &afterBlock = afterRegion.front();
Expand Down
58 changes: 58 additions & 0 deletions mlir/test/Conversion/SCFToSPIRV/while.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,62 @@ func.func @while_loop2(%arg0: f32) -> i64 {
return %res : i64
}

// -----

// CHECK-LABEL: @while_loop_before_typeconv
func.func @while_loop_before_typeconv(%arg0: index) -> i64 {
// CHECK-SAME: (%[[ARG:.*]]: i32)
// CHECK: %[[VAR:.*]] = spirv.Variable : !spirv.ptr<i64, Function>
// CHECK: spirv.mlir.loop {
// CHECK: spirv.Branch ^[[HEADER:.*]](%[[ARG]] : i32)
// CHECK: ^[[HEADER]](%[[INDVAR1:.*]]: i32):
// CHECK: spirv.BranchConditional %{{.*}}, ^[[BODY:.*]](%{{.*}} : i64), ^[[MERGE:.*]]
// CHECK: ^[[BODY]](%[[INDVAR2:.*]]: i64):
// CHECK: spirv.Branch ^[[HEADER]](%{{.*}} : i32)
// CHECK: ^[[MERGE]]:
// CHECK: spirv.mlir.merge
// CHECK: }
%res = scf.while (%arg1 = %arg0) : (index) -> i64 {
%shared = "foo.shared_compute"(%arg1) : (index) -> i64
%condition = "foo.evaluate_condition"(%arg1, %shared) : (index, i64) -> i1
scf.condition(%condition) %shared : i64
} do {
^bb0(%arg2: i64):
%res = "foo.payload"(%arg2) : (i64) -> index
scf.yield %res : index
}
// CHECK: %[[OUT:.*]] = spirv.Load "Function" %[[VAR]] : i64
// CHECK: spirv.ReturnValue %[[OUT]] : i64
return %res : i64
}

// -----

// CHECK-LABEL: @while_loop_after_typeconv
func.func @while_loop_after_typeconv(%arg0: f32) -> index {
// CHECK-SAME: (%[[ARG:.*]]: f32)
// CHECK: %[[VAR:.*]] = spirv.Variable : !spirv.ptr<i32, Function>
// CHECK: spirv.mlir.loop {
// CHECK: spirv.Branch ^[[HEADER:.*]](%[[ARG]] : f32)
// CHECK: ^[[HEADER]](%[[INDVAR1:.*]]: f32):
// CHECK: spirv.BranchConditional %{{.*}}, ^[[BODY:.*]](%{{.*}} : i32), ^[[MERGE:.*]]
// CHECK: ^[[BODY]](%[[INDVAR2:.*]]: i32):
// CHECK: spirv.Branch ^[[HEADER]](%{{.*}} : f32)
// CHECK: ^[[MERGE]]:
// CHECK: spirv.mlir.merge
// CHECK: }
%res = scf.while (%arg1 = %arg0) : (f32) -> index {
%shared = "foo.shared_compute"(%arg1) : (f32) -> index
%condition = "foo.evaluate_condition"(%arg1, %shared) : (f32, index) -> i1
scf.condition(%condition) %shared : index
} do {
^bb0(%arg2: index):
%res = "foo.payload"(%arg2) : (index) -> f32
scf.yield %res : f32
}
// CHECK: %[[OUT:.*]] = spirv.Load "Function" %[[VAR]] : i32
// CHECK: spirv.ReturnValue %[[OUT]] : i32
return %res : index
}

} // end module