Skip to content

[MLIR][Affine] Fix fusion crash for non-int/fp memref elt types #126829

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

Merged
merged 1 commit into from
Feb 12, 2025
Merged

[MLIR][Affine] Fix fusion crash for non-int/fp memref elt types #126829

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
3 changes: 3 additions & 0 deletions mlir/lib/Dialect/Affine/Transforms/LoopFusion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,6 +759,9 @@ struct GreedyFusion {
const DenseSet<Value> &srcEscapingMemRefs,
unsigned producerId, unsigned consumerId,
bool removeSrcNode) {
// We can't generate private memrefs if their size can't be computed.
if (!getMemRefIntOrFloatEltSizeInBytes(cast<MemRefType>(memref.getType())))
return false;
const Node *consumerNode = mdg->getNode(consumerId);
// If `memref` is an escaping one, do not create a private memref
// for the below scenarios, since doing so will leave the escaping
Expand Down
35 changes: 35 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
@@ -1,4 +1,5 @@
// RUN: mlir-opt -allow-unregistered-dialect %s -pass-pipeline='builtin.module(func.func(affine-loop-fusion{mode=producer}))' -split-input-file | FileCheck %s --check-prefix=PRODUCER-CONSUMER
// RUN: mlir-opt -allow-unregistered-dialect %s -pass-pipeline='builtin.module(func.func(affine-loop-fusion{mode=producer fusion-maximal}))' -split-input-file | FileCheck %s --check-prefix=PRODUCER-CONSUMER-MAXIMAL
// RUN: mlir-opt -allow-unregistered-dialect %s -pass-pipeline='builtin.module(func.func(affine-loop-fusion{fusion-maximal mode=sibling}))' -split-input-file | FileCheck %s --check-prefix=SIBLING-MAXIMAL
// RUN: mlir-opt -allow-unregistered-dialect %s -pass-pipeline='builtin.module(spirv.func(affine-loop-fusion{mode=producer}))' -split-input-file | FileCheck %s --check-prefix=SPIRV

Expand Down Expand Up @@ -345,3 +346,37 @@ func.func @same_memref_load_multiple_stores(%producer : memref<32xf32>, %produce
// PRODUCER-CONSUMER-NEXT: }
return
}

#map = affine_map<()[s0] -> (s0 + 5)>
#map1 = affine_map<()[s0] -> (s0 + 17)>

// Test with non-int/float memref types.

// PRODUCER-CONSUMER-MAXIMAL-LABEL: func @memref_index_type
func.func @memref_index_type() {
%0 = llvm.mlir.constant(2 : index) : i64
%2 = llvm.mlir.constant(0 : index) : i64
%3 = builtin.unrealized_conversion_cast %2 : i64 to index
%alloc = memref.alloc() {alignment = 64 : i64} : memref<8x18xf32>
%alloc_1 = memref.alloc() {alignment = 64 : i64} : memref<3xf32>
%alloc_2 = memref.alloc() {alignment = 64 : i64} : memref<3xindex>
affine.for %arg3 = 0 to 3 {
%4 = affine.load %alloc_2[%arg3] : memref<3xindex>
%5 = builtin.unrealized_conversion_cast %4 : index to i64
%6 = llvm.sub %0, %5 : i64
%7 = builtin.unrealized_conversion_cast %6 : i64 to index
affine.store %7, %alloc_2[%arg3] : memref<3xindex>
}
affine.for %arg3 = 0 to 3 {
%4 = affine.load %alloc_2[%arg3] : memref<3xindex>
%5 = affine.apply #map()[%4]
%6 = affine.apply #map1()[%3]
%7 = memref.load %alloc[%5, %6] : memref<8x18xf32>
affine.store %7, %alloc_1[%arg3] : memref<3xf32>
}
// Expect fusion.
// PRODUCER-CONSUMER-MAXIMAL: affine.for
// PRODUCER-CONSUMER-MAXIMAL-NOT: affine.for
// PRODUCER-CONSUMER-MAXIMAL: return
return
}