Skip to content

[mlir] Fix ComposeExpandOfCollapseOp for dynamic case #142663

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 2 commits into from
Jun 11, 2025
Merged

[mlir] Fix ComposeExpandOfCollapseOp for dynamic case #142663

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
510f3c7
[mlir] Fix ComposeExpandOfCollapseOp for dynamic case
IanWood1 Jun 3, 2025
37a0e5b
Check >=2 dyn for source and result
IanWood1 Jun 5, 2025
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/include/mlir/Dialect/Utils/ReshapeOpsUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,11 +387,14 @@ struct ComposeExpandOfCollapseOp : public OpRewritePattern<ExpandOpTy> {
auto resultSubShape =
resultShape.slice(resultIndices.front(), resultIndices.size());

if (llvm::count_if(srcSubShape, ShapedType::isDynamic) >= 2 &&
llvm::count_if(resultSubShape, ShapedType::isDynamic) >= 2)
return std::nullopt;

if (srcSubShape.size() == resultSubShape.size()) {
if (srcSubShape != resultSubShape ||
llvm::count_if(srcSubShape, ShapedType::isDynamic) >= 2) {
if (srcSubShape != resultSubShape)
return std::nullopt;
}

for (auto index : llvm::seq<int64_t>(0, srcSubShape.size())) {
composedReassociation.emplace_back(1, srcIndices.front() + index);
}
Expand Down
14 changes: 14 additions & 0 deletions mlir/test/Dialect/Tensor/canonicalize.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1319,6 +1319,20 @@ func.func @compose_expand_of_collapse_dynamic(%arg0 : tensor<4x?x10x64x2xf16>, %

// -----

func.func @no_compose_collapse_of_expand_dynamic(%arg0 : tensor<?x8x128x?xf16>, %arg1: index) -> tensor<?x128x?xf16> {
%collapse = tensor.collapse_shape %arg0 [[0, 1, 2, 3]] : tensor<?x8x128x?xf16> into tensor<?xf16>
%expanded_19 = tensor.expand_shape %collapse [[0, 1, 2]] output_shape [%arg1, 8, %arg1] : tensor<?xf16> into tensor<?x128x?xf16>
return %expanded_19 : tensor<?x128x?xf16>
}
// CHECK-LABEL: func @no_compose_collapse_of_expand_dynamic
// CHECK-SAME: %[[ARG0:.+]]: tensor
// CHECK-SAME: %[[ARG1:.+]]: index
// CHECK: %[[COLLAPSE:.+]] = tensor.collapse_shape %[[ARG0]]
// CHECK: %[[EXPAND:.+]] = tensor.expand_shape %[[COLLAPSE]]
// CHECK: return %[[EXPAND]]

// -----

// CHECK-LABEL: func @zero_rank_reshape_multi
func.func @zero_rank_reshape_multi(%arg0: tensor<f32>) -> tensor<f32> {
// CHECK: return %arg0
Expand Down
Loading