Skip to content
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

Jump to bottom

[Flow] Fold flow reshape with mismatching dyn dims #18680

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+22 −11
Open

[Flow] Fold flow reshape with mismatching dyn dims #18680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48c6ee6
Fold flow reshape with mismatching dyn dims
IanWood1 Oct 3, 2024
b4d27e5
Add reshape test that doesnt get folded
IanWood1 Oct 3, 2024
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
11 changes: 5 additions & 6 deletions compiler/src/iree/compiler/Dialect/Flow/IR/FlowOpFolders.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,24 +744,23 @@ static uint64_t getFlattenedIndex(ShapedType type, ArrayRef<uint64_t> index) {

static bool compareShapesEqual(ShapedType lhsType, ValueRange lhsDynamicDims,
ShapedType rhsType, ValueRange rhsDynamicDims) {
if (lhsType.hasStaticShape() && rhsType.hasStaticShape() &&
lhsType == rhsType) {
if (lhsType.hasStaticShape() && rhsType.hasStaticShape()) {
// Static shape equivalence means we can fast-path the check.
return true;
return lhsType == rhsType;
}
if (lhsType.getRank() != rhsType.getRank()) {
return false;
}
unsigned dynamicDimIndex = 0;
unsigned numNonmatchingSSADims = 0;
for (unsigned i = 0; i < lhsType.getRank(); ++i) {
if (lhsType.isDynamicDim(i) != rhsType.isDynamicDim(i)) {
// Static/dynamic dimension mismatch - definitely differ.
return false;
} else if (lhsType.isDynamicDim(i)) {
unsigned j = dynamicDimIndex++;
if (lhsDynamicDims[j] != rhsDynamicDims[j]) {
// Dynamic dimensions with different SSA values - probably differ.
return false;
numNonmatchingSSADims++;
}
} else {
if (lhsType.getDimSize(i) != rhsType.getDimSize(i)) {
Expand All @@ -770,7 +769,7 @@ static bool compareShapesEqual(ShapedType lhsType, ValueRange lhsDynamicDims,
}
}
}
return true;
return numNonmatchingSSADims <= 1;
}

//===----------------------------------------------------------------------===//
Expand Down
22 changes: 17 additions & 5 deletions compiler/src/iree/compiler/Dialect/Flow/IR/test/tensor_folding.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,26 +112,38 @@ util.func public @reshapeNoOpDynamic(%arg0: tensor<4x?xf32>, %dim: index) -> ten

// CHECK-LABEL: @reshapeDynamicDifferent
util.func public @reshapeDynamicDifferent(%arg0: tensor<4x?xf32>, %dim0: index, %dim1: index) -> tensor<4x?xf32> {
// CHECK-NEXT: flow.tensor.reshape %arg0
// CHECK-NEXT: util.return %arg0 : tensor<4x?xf32>
IanWood1 marked this conversation as resolved.
Show resolved Hide resolved
%0 = flow.tensor.reshape %arg0 : tensor<4x?xf32>{%dim0} -> tensor<4x?xf32>{%dim1}
util.return %0 : tensor<4x?xf32>
}

// -----

// CHECK-LABEL: @flattenReshapeChain
// CHECK-LABEL: @foldReshapeChain
// CHECK-SAME: %[[ARG:.+]]: tensor<4x?xf32>,
// CHECK-SAME: %[[DIM0:.+]]: index, %[[DIM1:.+]]: index, %[[DIM2:.+]]: index
util.func public @flattenReshapeChain(%arg0: tensor<4x?xf32>, %dim0: index, %dim1: index, %dim2: index) -> tensor<4x?xf32> {
// CHECK-NEXT: %[[RET:.+]] = flow.tensor.reshape %[[ARG]] : tensor<4x?xf32>{%[[DIM0]]} -> tensor<4x?xf32>{%[[DIM2]]}
util.func public @foldReshapeChain(%arg0: tensor<4x?xf32>, %dim0: index, %dim1: index, %dim2: index) -> tensor<4x?xf32> {
%0 = flow.tensor.reshape %arg0 : tensor<4x?xf32>{%dim0} -> tensor<4x?xf32>{%dim1}
%1 = flow.tensor.reshape %0 : tensor<4x?xf32>{%dim1} -> tensor<4x?xf32>{%dim2}
// CHECK-NEXT: util.return %[[RET]]
// CHECK-NEXT: util.return %[[ARG]]
util.return %1 : tensor<4x?xf32>
}

// -----

// CHECK-LABEL: @flattenReshapeChain
// CHECK-SAME: %[[ARG:.+]]: tensor<?x?xf32>,
// CHECK-SAME: %[[DIM0:.+]]: index, %[[DIM1:.+]]: index, %[[DIM2:.+]]: index, %[[DIM3:.+]]: index, %[[DIM4:.+]]: index, %[[DIM5:.+]]: index
util.func public @flattenReshapeChain(%arg0: tensor<?x?xf32>, %dim0: index, %dim1: index, %dim2: index, %dim3 : index, %dim4 : index, %dim5 : index) -> tensor<?x?xf32> {
// CHECK-NEXT: %[[RET:.+]] = flow.tensor.reshape %[[ARG]] : tensor<?x?xf32>{%[[DIM0]], %[[DIM1]]} -> tensor<?x?xf32>{%[[DIM4]], %[[DIM5]]}
%0 = flow.tensor.reshape %arg0 : tensor<?x?xf32>{%dim0, %dim1} -> tensor<?x?xf32>{%dim2, %dim3}
%1 = flow.tensor.reshape %0 : tensor<?x?xf32>{%dim2, %dim3} -> tensor<?x?xf32>{%dim4, %dim5}
// CHECK-NEXT: util.return %[[RET]]
util.return %1 : tensor<?x?xf32>
}

// -----

// CHECK-LABEL: @flattenReshapeBitcastChain
// CHECK-SAME: %[[ARG:.+]]: tensor<4x?xi16>,
// CHECK-SAME: %[[DIM0:.+]]: index, %[[DIM1:.+]]: index, %[[DIM2:.+]]: index
Expand Down
Loading