[Conversion] Migrate away from PointerUnion::{is,get} (NFC) #122421
+10
−10
Conversation
This file contains 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
Note that PointerUnion::{is,get} have been soft deprecated in
PointerUnion.h:
// FIXME: Replace the uses of is(), get() and dyn_cast() with
// isa<T>, cast<T> and the llvm::dyn_cast<T>
I'm not touching PointerUnion::dyn_cast for now because it's a bit
complicated; we could blindly migrate it to dyn_cast_if_present, but
we should probably use dyn_cast when the operand is known to be
non-null.
kazutakahirata
requested review from
antiagainst,
kuhar,
banach-space,
dcaballe and
nicolasvasilache
as code owners
|
@llvm/pr-subscribers-mlir-spirv Author: Kazu Hirata (kazutakahirata) ChangesNote that PointerUnion::{is,get} have been soft deprecated in // FIXME: Replace the uses of is(), get() and dyn_cast() with I'm not touching PointerUnion::dyn_cast for now because it's a bit Full diff: https://github.com/llvm/llvm-project/pull/122421.diff 3 Files Affected:
diff --git a/mlir/lib/Conversion/MemRefToSPIRV/MemRefToSPIRV.cpp b/mlir/lib/Conversion/MemRefToSPIRV/MemRefToSPIRV.cpp
index 49a391938eaf69..04bc62262c3d89 100644
--- a/mlir/lib/Conversion/MemRefToSPIRV/MemRefToSPIRV.cpp
+++ b/mlir/lib/Conversion/MemRefToSPIRV/MemRefToSPIRV.cpp
@@ -911,7 +911,7 @@ LogicalResult ReinterpretCastPattern::matchAndRewrite(
if (auto val = dyn_cast<Value>(offset))
return val;
- int64_t attrVal = cast<IntegerAttr>(offset.get<Attribute>()).getInt();
+ int64_t attrVal = cast<IntegerAttr>(cast<Attribute>(offset)).getInt();
Attribute attr = rewriter.getIntegerAttr(intType, attrVal);
return rewriter.createOrFold<spirv::ConstantOp>(loc, intType, attr);
}();
diff --git a/mlir/lib/Conversion/MeshToMPI/MeshToMPI.cpp b/mlir/lib/Conversion/MeshToMPI/MeshToMPI.cpp
index e1de125ccaeded..cc32f9fd059c67 100644
--- a/mlir/lib/Conversion/MeshToMPI/MeshToMPI.cpp
+++ b/mlir/lib/Conversion/MeshToMPI/MeshToMPI.cpp
@@ -241,12 +241,12 @@ struct ConvertUpdateHaloOp
// convert a OpFoldResult into a Value
auto toValue = [&rewriter, &loc](OpFoldResult &v) {
- return v.is<Value>()
- ? v.get<Value>()
+ return isa<Value>(v)
+ ? cast<Value>(v)
: rewriter.create<::mlir::arith::ConstantOp>(
loc,
rewriter.getIndexAttr(
- cast<IntegerAttr>(v.get<Attribute>()).getInt()));
+ cast<IntegerAttr>(cast<Attribute>(v)).getInt()));
};
auto dest = op.getDestination();
@@ -267,11 +267,11 @@ struct ConvertUpdateHaloOp
getMixedValues(op.getStaticHaloSizes(), op.getHaloSizes(), rewriter);
// subviews need Index values
for (auto &sz : haloSizes) {
- if (sz.is<Value>()) {
- sz = rewriter
- .create<arith::IndexCastOp>(loc, rewriter.getIndexType(),
- sz.get<Value>())
- .getResult();
+ if (auto value = dyn_cast<Value>(sz)) {
+ sz =
+ rewriter
+ .create<arith::IndexCastOp>(loc, rewriter.getIndexType(), value)
+ .getResult();
}
}
diff --git a/mlir/lib/Conversion/VectorToLLVM/ConvertVectorToLLVM.cpp b/mlir/lib/Conversion/VectorToLLVM/ConvertVectorToLLVM.cpp
index 9657f583c375bb..d688d8e2ab6588 100644
--- a/mlir/lib/Conversion/VectorToLLVM/ConvertVectorToLLVM.cpp
+++ b/mlir/lib/Conversion/VectorToLLVM/ConvertVectorToLLVM.cpp
@@ -124,7 +124,7 @@ static Value getAsLLVMValue(OpBuilder &builder, Location loc,
return builder.create<LLVM::ConstantOp>(loc, intAttr).getResult();
}
- return foldResult.get<Value>();
+ return cast<Value>(foldResult);
}
namespace {
|
|
@llvm/pr-subscribers-mlir Author: Kazu Hirata (kazutakahirata) ChangesNote that PointerUnion::{is,get} have been soft deprecated in // FIXME: Replace the uses of is(), get() and dyn_cast() with I'm not touching PointerUnion::dyn_cast for now because it's a bit Full diff: https://github.com/llvm/llvm-project/pull/122421.diff 3 Files Affected:
diff --git a/mlir/lib/Conversion/MemRefToSPIRV/MemRefToSPIRV.cpp b/mlir/lib/Conversion/MemRefToSPIRV/MemRefToSPIRV.cpp
index 49a391938eaf69..04bc62262c3d89 100644
--- a/mlir/lib/Conversion/MemRefToSPIRV/MemRefToSPIRV.cpp
+++ b/mlir/lib/Conversion/MemRefToSPIRV/MemRefToSPIRV.cpp
@@ -911,7 +911,7 @@ LogicalResult ReinterpretCastPattern::matchAndRewrite(
if (auto val = dyn_cast<Value>(offset))
return val;
- int64_t attrVal = cast<IntegerAttr>(offset.get<Attribute>()).getInt();
+ int64_t attrVal = cast<IntegerAttr>(cast<Attribute>(offset)).getInt();
Attribute attr = rewriter.getIntegerAttr(intType, attrVal);
return rewriter.createOrFold<spirv::ConstantOp>(loc, intType, attr);
}();
diff --git a/mlir/lib/Conversion/MeshToMPI/MeshToMPI.cpp b/mlir/lib/Conversion/MeshToMPI/MeshToMPI.cpp
index e1de125ccaeded..cc32f9fd059c67 100644
--- a/mlir/lib/Conversion/MeshToMPI/MeshToMPI.cpp
+++ b/mlir/lib/Conversion/MeshToMPI/MeshToMPI.cpp
@@ -241,12 +241,12 @@ struct ConvertUpdateHaloOp
// convert a OpFoldResult into a Value
auto toValue = [&rewriter, &loc](OpFoldResult &v) {
- return v.is<Value>()
- ? v.get<Value>()
+ return isa<Value>(v)
+ ? cast<Value>(v)
: rewriter.create<::mlir::arith::ConstantOp>(
loc,
rewriter.getIndexAttr(
- cast<IntegerAttr>(v.get<Attribute>()).getInt()));
+ cast<IntegerAttr>(cast<Attribute>(v)).getInt()));
};
auto dest = op.getDestination();
@@ -267,11 +267,11 @@ struct ConvertUpdateHaloOp
getMixedValues(op.getStaticHaloSizes(), op.getHaloSizes(), rewriter);
// subviews need Index values
for (auto &sz : haloSizes) {
- if (sz.is<Value>()) {
- sz = rewriter
- .create<arith::IndexCastOp>(loc, rewriter.getIndexType(),
- sz.get<Value>())
- .getResult();
+ if (auto value = dyn_cast<Value>(sz)) {
+ sz =
+ rewriter
+ .create<arith::IndexCastOp>(loc, rewriter.getIndexType(), value)
+ .getResult();
}
}
diff --git a/mlir/lib/Conversion/VectorToLLVM/ConvertVectorToLLVM.cpp b/mlir/lib/Conversion/VectorToLLVM/ConvertVectorToLLVM.cpp
index 9657f583c375bb..d688d8e2ab6588 100644
--- a/mlir/lib/Conversion/VectorToLLVM/ConvertVectorToLLVM.cpp
+++ b/mlir/lib/Conversion/VectorToLLVM/ConvertVectorToLLVM.cpp
@@ -124,7 +124,7 @@ static Value getAsLLVMValue(OpBuilder &builder, Location loc,
return builder.create<LLVM::ConstantOp>(loc, intAttr).getResult();
}
- return foldResult.get<Value>();
+ return cast<Value>(foldResult);
}
namespace {
|
nikic
approved these changes
Jan 10, 2025
| @@ -241,12 +241,12 @@ struct ConvertUpdateHaloOp | |||
|
|
|||
| // convert a OpFoldResult into a Value | |||
| auto toValue = [&rewriter, &loc](OpFoldResult &v) { | |||
| return v.is<Value>() | |||
| ? v.get<Value>() | |||
| return isa<Value>(v) | |||
There was a problem hiding this comment.
FWIW I would have used dyn_cast with an early return here rather than the big ternary...
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.
Note that PointerUnion::{is,get} have been soft deprecated in
PointerUnion.h:
// FIXME: Replace the uses of is(), get() and dyn_cast() with
// isa, cast and the llvm::dyn_cast
I'm not touching PointerUnion::dyn_cast for now because it's a bit
complicated; we could blindly migrate it to dyn_cast_if_present, but
we should probably use dyn_cast when the operand is known to be
non-null.