Skip to content

[mlir][SPIRVToLLVM] Erase empty spirv.mlir.loop in LoopPattern #113527

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
CoTinker merged 2 commits into from
Oct 26, 2024
Merged

[mlir][SPIRVToLLVM] Erase empty spirv.mlir.loop in LoopPattern #113527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17b720e
[mlir][spirv] Erase empty `spirv.mlir.loop` in `LoopPattern`
CoTinker Oct 24, 2024
fc69e5b
Add tests
CoTinker Oct 24, 2024
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
6 changes: 6 additions & 0 deletions mlir/lib/Conversion/SPIRVToLLVM/SPIRVToLLVM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1083,6 +1083,12 @@ class LoopPattern : public SPIRVToLLVMConversion<spirv::LoopOp> {
if (loopOp.getLoopControl() != spirv::LoopControl::None)
return failure();

// `spirv.mlir.loop` with empty region is redundant and should be erased.
if (loopOp.getBody().empty()) {
rewriter.eraseOp(loopOp);
return success();
}

Location loc = loopOp.getLoc();

// Split the current block after `spirv.mlir.loop`. The remaining ops will
Expand Down
8 changes: 8 additions & 0 deletions mlir/test/Conversion/SPIRVToLLVM/control-flow-ops-to-llvm.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,14 @@ spirv.module Logical GLSL450 {
//===----------------------------------------------------------------------===//

spirv.module Logical GLSL450 {
// CHECK-LABEL: @empty_loop
spirv.func @empty_loop() "None" {
// CHECK: llvm.return
spirv.mlir.loop {
}
spirv.Return
}

// CHECK-LABEL: @infinite_loop
spirv.func @infinite_loop(%count : i32) -> () "None" {
// CHECK: llvm.br ^[[BB1:.*]]
Expand Down
Loading