maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[MLIR] Fixed missing constraint append when adding an AffineIfOp domain 

The prior diff that introduced `addAffineIfOpDomain` missed appending
constraints from the ifOp domain. This revision fixes this problem.

Differential Revision: https://reviews.llvm.org/D86421
This commit is contained in:
Vincent Zhao 2020-08-28 00:27:36 +05:30 committed by Uday Bondhugula
parent 5e63083435
commit 28a7dfa33d
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mlir/lib/Analysis/AffineStructures.cpp
View File

@ -731,8 +731,11 @@ void FlatAffineConstraints::addAffineIfOpDomain(AffineIfOp ifOp) {
SmallVector<Value, 4> operands = ifOp.getOperands();
cst.setIdValues(0, cst.getNumDimAndSymbolIds(), operands);
// Merge the constraints from ifOp to the current domain.
// Merge the constraints from ifOp to the current domain. We need first merge
// and align the IDs from both constraints, and then append the constraints
// from the ifOp into the current one.
mergeAndAlignIdsWithOther(0, &cst);
append(cst);
}
// Searches for a constraint with a non-zero coefficient at 'colIdx' in

10
mlir/test/Transforms/memref-dependence-check.mlir
View File

@ -9,15 +9,15 @@ func @store_may_execute_before_load() {
%m = alloc() : memref<10xf32>
%cf7 = constant 7.0 : f32
%c0 = constant 4 : index
// There is a dependence from store 0 to load 1 at depth 1 because the
// ancestor IfOp of the store, dominates the ancestor ForSmt of the load,
// and thus the store "may" conditionally execute before the load.
// There is no dependence from store 0 to load 1 at depth if we take into account
// the constraint introduced by the following `affine.if`, which indicates that
// the store 0 will never be executed.
affine.if #set0(%c0) {
affine.for %i0 = 0 to 10 {
affine.store %cf7, %m[%i0] : memref<10xf32>
// expected-remark@above {{dependence from 0 to 0 at depth 1 = false}}
// expected-remark@above {{dependence from 0 to 0 at depth 2 = false}}
// expected-remark@above {{dependence from 0 to 1 at depth 1 = true}}
// expected-remark@above {{dependence from 0 to 1 at depth 1 = false}}
}
}
affine.for %i1 = 0 to 10 {
@ -1044,7 +1044,7 @@ func @test_interleaved_affine_for_if() {
%N = dim %0, %c0 : memref<101xf32>
%cf7 = constant 7.0 : f32
affine.for %i0 = 0 to 100 {
affine.for %i0 = 0 to 101 {
affine.if #set1(%i0)[%N] {
%1 = affine.load %0[%i0] : memref<101xf32>
// expected-remark@above {{dependence from 0 to 0 at depth 1 = false}}