Skip to content

[MLIR] Fixes arith.sub folder crash on dynamically shaped tensors #118908

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
joker-eph merged 1 commit into from
Dec 6, 2024
Merged

[MLIR] Fixes arith.sub folder crash on dynamically shaped tensors #118908

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
8 changes: 6 additions & 2 deletions mlir/lib/Dialect/Arith/IR/ArithOps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,8 +393,12 @@ void arith::AddUIExtendedOp::getCanonicalizationPatterns(

OpFoldResult arith::SubIOp::fold(FoldAdaptor adaptor) {
// subi(x,x) -> 0
if (getOperand(0) == getOperand(1))
return Builder(getContext()).getZeroAttr(getType());
if (getOperand(0) == getOperand(1)) {
auto shapedType = dyn_cast<ShapedType>(getType());
// We can't generate a constant with a dynamic shaped tensor.
if (!shapedType || shapedType.hasStaticShape())
return Builder(getContext()).getZeroAttr(getType());
}
// subi(x,0) -> x
if (matchPattern(adaptor.getRhs(), m_Zero()))
return getLhs();
Expand Down
21 changes: 21 additions & 0 deletions mlir/test/Dialect/Arith/canonicalize.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,6 +869,27 @@ func.func @tripleAddAddOvf2(%arg0: index) -> index {
return %add2 : index
}


// CHECK-LABEL: @foldSubXX_tensor
// CHECK: %[[c0:.+]] = arith.constant dense<0> : tensor<10xi32>
// CHECK: %[[sub:.+]] = arith.subi
// CHECK: return %[[c0]], %[[sub]]
func.func @foldSubXX_tensor(%static : tensor<10xi32>, %dyn : tensor<?x?xi32>) -> (tensor<10xi32>, tensor<?x?xi32>) {
%static_sub = arith.subi %static, %static : tensor<10xi32>
%dyn_sub = arith.subi %dyn, %dyn : tensor<?x?xi32>
return %static_sub, %dyn_sub : tensor<10xi32>, tensor<?x?xi32>
}

// CHECK-LABEL: @foldSubXX_vector
// CHECK-DAG: %[[c0:.+]] = arith.constant dense<0> : vector<8xi32>
// CHECK-DAG: %[[c0_scalable:.+]] = arith.constant dense<0> : vector<[4]xi32>
// CHECK: return %[[c0]], %[[c0_scalable]]
func.func @foldSubXX_vector(%static : vector<8xi32>, %dyn : vector<[4]xi32>) -> (vector<8xi32>, vector<[4]xi32>) {
%static_sub = arith.subi %static, %static : vector<8xi32>
%dyn_sub = arith.subi %dyn, %dyn : vector<[4]xi32>
return %static_sub, %dyn_sub : vector<8xi32>, vector<[4]xi32>
}

// CHECK-LABEL: @tripleAddSub0
// CHECK: %[[cres:.+]] = arith.constant 59 : index
// CHECK: %[[add:.+]] = arith.subi %[[cres]], %arg0 : index
Expand Down
Loading