Skip to content

[MLIR][Affine] Loop fusion in a block containing Linalg op #129136

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[MLIR][Affine] Loop fusion in a block containing Linalg op #129136

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
9 changes: 6 additions & 3 deletions mlir/lib/Dialect/Affine/Analysis/Utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "mlir/Dialect/Affine/IR/AffineOps.h"
#include "mlir/Dialect/Affine/IR/AffineValueMap.h"
#include "mlir/Dialect/Arith/IR/Arith.h"
#include "mlir/Dialect/Linalg/IR/Linalg.h"
#include "mlir/Dialect/Utils/StaticValueUtils.h"
#include "mlir/IR/IntegerSet.h"
#include "mlir/Interfaces/CallInterfaces.h"
Expand Down Expand Up @@ -252,6 +253,9 @@ bool MemRefDependenceGraph::init() {
// Create graph nodes.
DenseMap<Operation *, unsigned> forToNodeMap;
for (Operation &op : block) {
bool hasUnsupportedRegion =
op.getNumRegions() != 0 &&
!isa<RegionBranchOpInterface, linalg::LinalgOp>(op);
if (auto forOp = dyn_cast<AffineForOp>(op)) {
Node *node = addNodeToMDG(&op, *this, memrefAccesses);
if (!node)
Expand All @@ -277,8 +281,7 @@ bool MemRefDependenceGraph::init() {
Node *node = addNodeToMDG(&op, *this, memrefAccesses);
if (!node)
return false;
} else if (!isMemoryEffectFree(&op) &&
(op.getNumRegions() == 0 || isa<RegionBranchOpInterface>(op))) {
} else if (!isMemoryEffectFree(&op) && !hasUnsupportedRegion) {
// Create graph node for top-level op unless it is known to be
// memory-effect free. This covers all unknown/unregistered ops,
// non-affine ops with memory effects, and region-holding ops with a
Expand All @@ -287,7 +290,7 @@ bool MemRefDependenceGraph::init() {
Node *node = addNodeToMDG(&op, *this, memrefAccesses);
if (!node)
return false;
} else if (op.getNumRegions() != 0 && !isa<RegionBranchOpInterface>(op)) {
} else if (hasUnsupportedRegion) {
// Return false if non-handled/unknown region-holding ops are found. We
// won't know what such ops do or what its regions mean; for e.g., it may
// not be an imperative op.
Expand Down
30 changes: 30 additions & 0 deletions mlir/test/Dialect/Affine/loop-fusion-4.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,36 @@ func.func @sibling_reduction(%input : memref<10xf32>, %output : memref<10xf32>,

// -----

// Check that presence of a Linalg operator in a block does not prevent
// fusion from happening in this block.

// ALL-LABEL: func @fusion_in_block_containing_linalg
func.func @fusion_in_block_containing_linalg(%arg0: memref<5xi8>, %arg1: memref<5xi8>) {
%c15_i8 = arith.constant 15 : i8
%alloc = memref.alloc() : memref<5xi8>
affine.for %arg3 = 0 to 5 {
affine.store %c15_i8, %alloc[%arg3] : memref<5xi8>
}
affine.for %arg3 = 0 to 5 {
%0 = affine.load %alloc[%arg3] : memref<5xi8>
%1 = affine.load %arg0[%arg3] : memref<5xi8>
%2 = arith.muli %0, %1 : i8
affine.store %2, %alloc[%arg3] : memref<5xi8>
}
// ALL: affine.for
// ALL-NEXT: affine.store
// ALL-NEXT: affine.load
// ALL-NEXT: affine.load
// ALL-NEXT: arith.muli
// ALL-NEXT: affine.store
// ALL-NEXT: }
linalg.elemwise_binary ins(%alloc, %alloc: memref<5xi8>, memref<5xi8>) outs(%arg1: memref<5xi8>)
// ALL-NEXT: linalg.elemwise_binary
return
}

// -----

// From https://github.com/llvm/llvm-project/issues/54541

#map = affine_map<(d0) -> (d0 mod 65536)>
Expand Down