[mlir][math] Rsqrt math expand pass expects static shaped operand #129006
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-mlir @llvm/pr-subscribers-mlir-math Author: Kai Sasaki (Lewuathe) ChangesSimilar to the issue reported in See: #128299 Full diff: https://github.com/llvm/llvm-project/pull/129006.diff 2 Files Affected:
diff --git a/mlir/lib/Dialect/Math/Transforms/ExpandPatterns.cpp b/mlir/lib/Dialect/Math/Transforms/ExpandPatterns.cpp
index bb592c667549c..7b5350ca26b60 100644
--- a/mlir/lib/Dialect/Math/Transforms/ExpandPatterns.cpp
+++ b/mlir/lib/Dialect/Math/Transforms/ExpandPatterns.cpp
@@ -646,6 +646,11 @@ static LogicalResult convertRsqrtOp(math::RsqrtOp op,
auto operand = op.getOperand();
auto operandTy = operand.getType();
+ // Operand type must be shatic shaped type to create const float.
+ auto shapedOperandType = dyn_cast<ShapedType>(operandTy);
+ if (shapedOperandType && !shapedOperandType.hasStaticShape())
+ return failure();
+
auto eTy = getElementTypeOrSelf(operandTy);
if (!isa<FloatType>(eTy))
return failure();
diff --git a/mlir/test/Dialect/Math/expand-math.mlir b/mlir/test/Dialect/Math/expand-math.mlir
index 946a411e4cc4b..8743efec5ecb4 100644
--- a/mlir/test/Dialect/Math/expand-math.mlir
+++ b/mlir/test/Dialect/Math/expand-math.mlir
@@ -787,3 +787,29 @@ func.func @unranked_ceil_op(%arg: tensor<*xf32>) -> tensor<*xf32>{
%a = math.ceil %arg : tensor<*xf32>
return %a: tensor<*xf32>
}
+
+// -----
+
+// CHECK-LABEL: func.func @non_static_shape_rsqrt_op
+// CHECK-SAME: (%[[ARG:.*]]: tensor<?xf32>)
+// CHECK-SAME: -> tensor<?xf32>
+// CHECK: %[[CEIL:.*]] = math.rsqrt %[[ARG]] : tensor<?xf32>
+// CHECK: return %[[CEIL]] : tensor<?xf32>
+
+func.func @non_static_shape_rsqrt_op(%arg: tensor<?xf32>) -> tensor<?xf32>{
+ %a = math.rsqrt %arg : tensor<?xf32>
+ return %a: tensor<?xf32>
+}
+
+// -----
+
+// CHECK-LABEL: func.func @unranked_rsqrt_op
+// CHECK-SAME: (%[[ARG:.*]]: tensor<*xf32>)
+// CHECK-SAME: -> tensor<*xf32>
+// CHECK: %[[CEIL:.*]] = math.rsqrt %[[ARG]] : tensor<*xf32>
+// CHECK: return %[[CEIL]] : tensor<*xf32>
+
+func.func @unranked_rsqrt_op(%arg: tensor<*xf32>) -> tensor<*xf32>{
+ %a = math.rsqrt %arg : tensor<*xf32>
+ return %a: tensor<*xf32>
+}
|
Similar to the issue reported in https://github.com/llvm/llvm-project/pull/128299/files, ExpandMath pattern for rsqrt expects the static shaped operands. Otherwise, it crashes due to the assertion violation.
Lewuathe
force-pushed
the
rsqrt-in-expand-math-expect-static-shape
branch
from
4d899de to
d01daf2
Compare
cferry-AMD
approved these changes
Feb 27, 2025
cheezeburglar
pushed a commit
to cheezeburglar/llvm-project
that referenced
this pull request
Feb 28, 2025
…vm#129006) Similar to the issue reported in llvm#128299 (review), ExpandMath pattern for rsqrt expects the static shaped operands. Otherwise, it crashes due to the assertion violation. See: llvm#128299
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Similar to the issue reported in
#128299 (review), ExpandMath pattern for rsqrt expects the static shaped operands. Otherwise, it crashes due to the assertion violation.
See: #128299