[MLIR] Fix type incompatibility in BitcastOp fold #125193
Conversation
This commit fixes a bug in the `arith::BitcastOp::fold` function where a poisoned constant value was incorrectly cast to `IntegerAttr`, causing a `cast<Ty>() argument of incompatible type!` error.
|
Thank you for submitting a Pull Request (PR) to the LLVM Project! This PR will be automatically labeled and the relevant teams will be notified. If you wish to, you can add reviewers by using the "Reviewers" section on this page. If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers. If you have further questions, they may be answered by the LLVM GitHub User Guide. You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums. |
|
@llvm/pr-subscribers-mlir-arith Author: Vadim Curcă (VadimCurca) ChangesThis commit fixes a bug in the Full diff: https://github.com/llvm/llvm-project/pull/125193.diff 2 Files Affected:
diff --git a/mlir/lib/Dialect/Arith/IR/ArithOps.cpp b/mlir/lib/Dialect/Arith/IR/ArithOps.cpp
index 75d59ba8c1a108..8a9f223089794e 100644
--- a/mlir/lib/Dialect/Arith/IR/ArithOps.cpp
+++ b/mlir/lib/Dialect/Arith/IR/ArithOps.cpp
@@ -1761,6 +1761,10 @@ OpFoldResult arith::BitcastOp::fold(FoldAdaptor adaptor) {
if (llvm::isa<ShapedType>(resType))
return {};
+ /// Bitcast poison.
+ if (llvm::isa<ub::PoisonAttr>(operand))
+ return ub::PoisonAttr::get(getContext());
+
/// Bitcast integer or float to integer or float.
APInt bits = llvm::isa<FloatAttr>(operand)
? llvm::cast<FloatAttr>(operand).getValue().bitcastToAPInt()
diff --git a/mlir/test/Dialect/Arith/canonicalize.mlir b/mlir/test/Dialect/Arith/canonicalize.mlir
index 3a16ee3d4f8fde..e3750bb020cade 100644
--- a/mlir/test/Dialect/Arith/canonicalize.mlir
+++ b/mlir/test/Dialect/Arith/canonicalize.mlir
@@ -1843,6 +1843,28 @@ func.func @bitcastOfBitcast(%arg : i16) -> i16 {
// -----
+// CHECK-LABEL: @bitcastPoisonItoFP(
+func.func @bitcastPoisonItoFP() -> f32 {
+ // CHECK: %[[P:.+]] = ub.poison : f32
+ // CHECK: return %[[P]] : f32
+ %p = ub.poison : i32
+ %res = arith.bitcast %p : i32 to f32
+ return %res : f32
+}
+
+// -----
+
+// CHECK-LABEL: @bitcastPoisonFPtoI(
+func.func @bitcastPoisonFPtoI() -> i32 {
+ // CHECK: %[[P:.+]] = ub.poison : i32
+ // CHECK: return %[[P]] : i32
+ %p = ub.poison : f32
+ %res = arith.bitcast %p : f32 to i32
+ return %res : i32
+}
+
+// -----
+
// CHECK-LABEL: test_maxsi
// CHECK-DAG: %[[C0:.+]] = arith.constant 42
// CHECK-DAG: %[[MAX_INT_CST:.+]] = arith.constant 127
|
|
@llvm/pr-subscribers-mlir Author: Vadim Curcă (VadimCurca) ChangesThis commit fixes a bug in the Full diff: https://github.com/llvm/llvm-project/pull/125193.diff 2 Files Affected:
diff --git a/mlir/lib/Dialect/Arith/IR/ArithOps.cpp b/mlir/lib/Dialect/Arith/IR/ArithOps.cpp
index 75d59ba8c1a108..8a9f223089794e 100644
--- a/mlir/lib/Dialect/Arith/IR/ArithOps.cpp
+++ b/mlir/lib/Dialect/Arith/IR/ArithOps.cpp
@@ -1761,6 +1761,10 @@ OpFoldResult arith::BitcastOp::fold(FoldAdaptor adaptor) {
if (llvm::isa<ShapedType>(resType))
return {};
+ /// Bitcast poison.
+ if (llvm::isa<ub::PoisonAttr>(operand))
+ return ub::PoisonAttr::get(getContext());
+
/// Bitcast integer or float to integer or float.
APInt bits = llvm::isa<FloatAttr>(operand)
? llvm::cast<FloatAttr>(operand).getValue().bitcastToAPInt()
diff --git a/mlir/test/Dialect/Arith/canonicalize.mlir b/mlir/test/Dialect/Arith/canonicalize.mlir
index 3a16ee3d4f8fde..e3750bb020cade 100644
--- a/mlir/test/Dialect/Arith/canonicalize.mlir
+++ b/mlir/test/Dialect/Arith/canonicalize.mlir
@@ -1843,6 +1843,28 @@ func.func @bitcastOfBitcast(%arg : i16) -> i16 {
// -----
+// CHECK-LABEL: @bitcastPoisonItoFP(
+func.func @bitcastPoisonItoFP() -> f32 {
+ // CHECK: %[[P:.+]] = ub.poison : f32
+ // CHECK: return %[[P]] : f32
+ %p = ub.poison : i32
+ %res = arith.bitcast %p : i32 to f32
+ return %res : f32
+}
+
+// -----
+
+// CHECK-LABEL: @bitcastPoisonFPtoI(
+func.func @bitcastPoisonFPtoI() -> i32 {
+ // CHECK: %[[P:.+]] = ub.poison : i32
+ // CHECK: return %[[P]] : i32
+ %p = ub.poison : f32
+ %res = arith.bitcast %p : f32 to i32
+ return %res : i32
+}
+
+// -----
+
// CHECK-LABEL: test_maxsi
// CHECK-DAG: %[[C0:.+]] = arith.constant 42
// CHECK-DAG: %[[MAX_INT_CST:.+]] = arith.constant 127
|
Dinistro
left a comment
Dinistro
left a comment
There was a problem hiding this comment.
LGTM, thanks for the fix 🙂
|
@VadimCurca Congratulations on having your first Pull Request (PR) merged into the LLVM Project! Your changes will be combined with recent changes from other authors, then tested by our build bots. If there is a problem with a build, you may receive a report in an email or a comment on this PR. Please check whether problems have been caused by your change specifically, as the builds can include changes from many authors. It is not uncommon for your change to be included in a build that fails due to someone else's changes, or infrastructure issues. How to do this, and the rest of the post-merge process, is covered in detail here. If your change does cause a problem, it may be reverted, or you can revert it yourself. This is a normal part of LLVM development. You can fix your changes and open a new PR to merge them again. If you don't get any reports, no action is required from you. Your changes are working as expected, well done! |
5 participants
This commit fixes a bug in the
arith::BitcastOp::foldfunction where a poisoned constant value was incorrectly cast toIntegerAttr, causing acast<Ty>() argument of incompatible type!error.