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

[MLIR][affine] Prevent fusion when ops with memory effect free are present between producer and consumer 

This commit fixes a bug in affine fusion pipeline where an
incorrect fusion is performed despite a dealloc op is present
between a producer and a consumer. This is done by creating a
node for dealloc op in the MDG.

Reviewed By: bondhugula, dcaballe

Differential Revision: https://reviews.llvm.org/D97032
This commit is contained in:
Vinayaka Bandishti 2021-02-22 21:31:48 +05:30 committed by Uday Bondhugula
parent ed4230732a
commit 15332982c3
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mlir/lib/Transforms/LoopFusion.cpp
View File

@ -768,7 +768,8 @@ bool MemRefDependenceGraph::init(FuncOp f) {
SmallVector<MemoryEffects::EffectInstance, 1> effects;
effectInterface.getEffects(effects);
if (llvm::any_of(effects, [](const MemoryEffects::EffectInstance &it) {
return isa<MemoryEffects::Write>(it.getEffect());
return isa<MemoryEffects::Write, MemoryEffects::Free>(
it.getEffect());
})) {
Node node(nextNodeId++, &op);
nodes.insert({node.id, node});

31
mlir/test/Transforms/loop-fusion.mlir
View File

@ -2835,3 +2835,34 @@ func @should_fuse_multi_store_producer_with_scaping_memrefs_and_preserve_src(
return
}
// -----
func @should_not_fuse_due_to_dealloc(%arg0: memref<16xf32>){
%A = alloc() : memref<16xf32>
%C = alloc() : memref<16xf32>
%cst_1 = constant 1.000000e+00 : f32
affine.for %arg1 = 0 to 16 {
%a = affine.load %arg0[%arg1] : memref<16xf32>
affine.store %a, %A[%arg1] : memref<16xf32>
affine.store %a, %C[%arg1] : memref<16xf32>
}
dealloc %C : memref<16xf32>
%B = alloc() : memref<16xf32>
affine.for %arg1 = 0 to 16 {
%a = affine.load %A[%arg1] : memref<16xf32>
%b = addf %cst_1, %a : f32
affine.store %b, %B[%arg1] : memref<16xf32>
}
dealloc %A : memref<16xf32>
return
}
// CHECK-LABEL: func @should_not_fuse_due_to_dealloc
// CHECK: affine.for
// CHECK-NEXT: affine.load
// CHECK-NEXT: affine.store
// CHECK-NEXT: affine.store
// CHECK: dealloc
// CHECK: affine.for
// CHECK-NEXT: affine.load
// CHECK-NEXT: addf
// CHECK-NEXT: affine.store