Skip to content

[mlir][scf] Fix unrolling when the yielded value is defined above the loop. #122177

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
Jan 9, 2025
Merged

[mlir][scf] Fix unrolling when the yielded value is defined above the loop. #122177

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 @@ -361,7 +361,7 @@ static void generateUnrolledLoop(

// Update yielded values.
for (unsigned i = 0, e = lastYielded.size(); i < e; i++)
lastYielded[i] = operandMap.lookup(yieldedValues[i]);
lastYielded[i] = operandMap.lookupOrDefault(yieldedValues[i]);
}

// Make sure we annotate the Ops in the original body. We do this last so that
Expand Down
29 changes: 29 additions & 0 deletions mlir/test/Dialect/SCF/loop-unroll.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,3 +489,32 @@ func.func @static_loop_unroll_with_integer_iv() -> (f32, f32) {
// UNROLL-BY-3-NEXT: scf.yield %[[EADD]], %[[EMUL]] : f32, f32
// UNROLL-BY-3-NEXT: }
// UNROLL-BY-3-NEXT: return %[[EFOR]]#0, %[[EFOR]]#1 : f32, f32

// -----

// Test loop unrolling when the yielded value is defined above the loop.
func.func @loop_unroll_static_yield_value_defined_above(%init: i32) {
%c42 = arith.constant 42 : i32
%c0 = arith.constant 0 : index
%c1 = arith.constant 1 : index
%c4 = arith.constant 4 : index
%103:2 = scf.for %i = %c0 to %c4 step %c1
iter_args(%iter1 = %c42, %iter2 = %init) -> (i32, i32) {
%0 = arith.andi %iter2, %iter1 : i32
scf.yield %0, %init : i32, i32
}
return
}
// UNROLL-OUTER-BY-2-LABEL: @loop_unroll_static_yield_value_defined_above(
// UNROLL-OUTER-BY-2-SAME: %[[INIT:.*]]: i32) {
// UNROLL-OUTER-BY-2-DAG: %[[C42:.*]] = arith.constant 42 : i32
// UNROLL-OUTER-BY-2-DAG: %[[C0:.*]] = arith.constant 0 : index
// UNROLL-OUTER-BY-2-DAG: %[[C4:.*]] = arith.constant 4 : index
// UNROLL-OUTER-BY-2-DAG: %[[C2:.*]] = arith.constant 2 : index
// UNROLL-OUTER-BY-2: scf.for %{{.*}} = %[[C0]] to %[[C4]] step %[[C2]]
// UNROLL-OUTER-BY-2-SAME: iter_args(%[[ITER1:.*]] = %[[C42]],
// UNROLL-OUTER-BY-2-SAME: %[[ITER2:.*]] = %[[INIT]])
// UNROLL-OUTER-BY-2: %[[SUM:.*]] = arith.andi %[[ITER2]], %[[ITER1]]
// UNROLL-OUTER-BY-2: %[[SUM1:.*]] = arith.andi %[[INIT]], %[[SUM]]
// UNROLL-OUTER-BY-2: scf.yield %[[SUM1]], %[[INIT]] : i32, i32

Loading