shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

[RegionUtils] replace uses in nested regions when isolating from above (#180548)

Browse Source 
When making a region IsolatedFromAbove, replace uses in any region
within the parent region, not just the immediate parent region.
This commit is contained in:
Scott Manley 2026-02-10 07:36:47 -06:00 committed by GitHub
parent 6558595ca3
commit 370a571597
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mlir/lib/Transforms/Utils/RegionUtils.cpp
View File

@ -157,8 +157,9 @@ SmallVector<Value> mlir::makeRegionIsolatedFromAbove(
// Create a mapping between the captured values and the new arguments added.
IRMapping map;
auto replaceIfFn = [&](OpOperand &use) {
return use.getOwner()->getBlock()->getParent() == &region;
return region.isAncestor(use.getOwner()->getParentRegion());
};
for (auto [arg, capturedVal] :
llvm::zip(newEntryBlockArgs.take_back(finalCapturedValues.size()),
finalCapturedValues)) {

25
mlir/test/Transforms/make-isolated-from-above.mlir
View File

@ -113,3 +113,28 @@ func.func @make_isolated_from_above_multiple_blocks(%arg0 : index, %arg1 : index
// CLONE2-NEXT: cf.br ^bb1
// CLONE2: ^bb1:
// CLONE2: "foo.yield"(%[[C0]], %[[C1]], %[[D0]], %[[D1]], %[[B0]])
// -----
// CHECK-LABEL: func @make_isolated_from_above_nested_region
// CHECK-SAME: %[[ARG0:[a-zA-Z0-9]+]]: memref<8xindex>
// CHECK: %[[C1:.+]] = arith.constant 1 : index
// CHECK: %[[C8:.+]] = arith.constant 8 : index
// CHECK: test.isolated_one_region_op %[[C1]], %[[ARG0]], %[[C8]]
// CHECK: ^bb0(%[[B0:[a-zA-Z0-9]+]]: index, %[[B1:[a-zA-Z0-9]+]]: memref<8xindex>, %[[B2:[a-zA-Z0-9]+]]: index)
// CHECK: scf.for %arg4 = %[[B0]] to %[[B2]] step %[[B0]]
// CHECK: memref.store %[[B0]], %[[B1]][%arg4] : memref<8xindex>
// CHECK: "foo.yield"() : () -> ()
func.func @make_isolated_from_above_nested_region(%arg0 : memref<8xindex>) {
%c1 = arith.constant 1 : index
%c8 = arith.constant 8 : index
"test.one_region_with_operands_op"() ({
scf.for %arg1 = %c1 to %c8 step %c1 {
memref.store %c1, %arg0[%arg1] : memref<8xindex>
}
"foo.yield"() : () -> ()
}) : () -> ()
return
}