intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-29 12:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

[mlir][transforms] CSE ops with multiple regions

Browse Source 
There were issues with the CSE equivalence analysis that have been fixed with D142558. This makes it possible to CSE ops with multiple regions.

Differential Revision: https://reviews.llvm.org/D142562
This commit is contained in:
Matthias Springer
2023-01-27 12:14:10 +01:00
parent 846ec90924
commit aa4e54f2f4
2 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mlir/lib/Transforms/CSE.cpp
View File

@@ -199,11 +199,11 @@ LogicalResult CSE::simplifyOperation(ScopedMapTy &knownValues, Operation *op,
return success();
}
// Don't simplify operations with nested blocks. We don't currently model
// equality comparisons correctly among other things. It is also unclear
// whether we would want to CSE such operations.
if (op->getNumRegions() != 0 &&
(op->getNumRegions() != 1 || !llvm::hasSingleElement(op->getRegion(0))))
// Don't simplify operations with regions that have multiple blocks.
// TODO: We need additional tests to verify that we handle such IR correctly.
if (!llvm::all_of(op->getRegions(), [](Region &r) {
return r.getBlocks().empty() || llvm::hasSingleElement(r.getBlocks());
}))
return failure();
// Some simple use case of operation with memory side-effect are dealt with

25
mlir/test/Transforms/cse.mlir
View File

@@ -468,3 +468,28 @@ func.func @failing_issue_59135(%arg0: tensor<2x2xi1>, %arg1: f32, %arg2 : tensor
// CHECK: %[[OP:.+]] = test.cse_of_single_block_op
// CHECK: test.region_yield %[[TRUE]]
// CHECK: return %[[OP]], %[[OP]]
func.func @cse_multiple_regions(%c: i1, %t: tensor<5xf32>) -> (tensor<5xf32>, tensor<5xf32>) {
%r1 = scf.if %c -> (tensor<5xf32>) {
%0 = tensor.empty() : tensor<5xf32>
scf.yield %0 : tensor<5xf32>
} else {
scf.yield %t : tensor<5xf32>
}
%r2 = scf.if %c -> (tensor<5xf32>) {
%0 = tensor.empty() : tensor<5xf32>
scf.yield %0 : tensor<5xf32>
} else {
scf.yield %t : tensor<5xf32>
}
return %r1, %r2 : tensor<5xf32>, tensor<5xf32>
}
// CHECK-LABEL: func @cse_multiple_regions
// CHECK: %[[if:.*]] = scf.if {{.*}} {
// CHECK: tensor.empty
// CHECK: scf.yield
// CHECK: } else {
// CHECK: scf.yield
// CHECK: }
// CHECK-NOT: scf.if
// CHECK: return %[[if]], %[[if]]