[CodeGen] Rename MVT::iPTRAny to MVT::pAny #113733
Open
+13
−12
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
Created using spr 1.3.4
llvmbot
added
mlir:core
|
@llvm/pr-subscribers-backend-nvptx @llvm/pr-subscribers-mlir-core Author: Jessica Clarke (jrtc27) ChangesWhilst in upstream LLVM iPTRAny is only ever an integer, essentially an Thus, rename it to pAny, reflecting that it is an overloaded pointer This has been verified to have no effect on the generated files for LLVM Full diff: https://github.com/llvm/llvm-project/pull/113733.diff 8 Files Affected:
diff --git a/llvm/include/llvm/CodeGen/ValueTypes.h b/llvm/include/llvm/CodeGen/ValueTypes.h
index 3db6f33a8093f0..a6301f0b6135f3 100644
--- a/llvm/include/llvm/CodeGen/ValueTypes.h
+++ b/llvm/include/llvm/CodeGen/ValueTypes.h
@@ -230,7 +230,7 @@ namespace llvm {
/// Return true if this is an overloaded type for TableGen.
bool isOverloaded() const {
- return (V==MVT::iAny || V==MVT::fAny || V==MVT::vAny || V==MVT::iPTRAny);
+ return (V==MVT::iAny || V==MVT::fAny || V==MVT::vAny || V==MVT::pAny);
}
/// Return true if the bit size is a multiple of 8.
diff --git a/llvm/include/llvm/CodeGen/ValueTypes.td b/llvm/include/llvm/CodeGen/ValueTypes.td
index 493c0cfcab60ce..6d6b92958b4321 100644
--- a/llvm/include/llvm/CodeGen/ValueTypes.td
+++ b/llvm/include/llvm/CodeGen/ValueTypes.td
@@ -338,9 +338,9 @@ def MetadataVT : ValueType<0, 505> { // Metadata
let LLVMName = "Metadata";
}
-// Pseudo valuetype mapped to the current pointer size to any address space.
+// Pseudo valuetype to represent "pointer to any address space"
// Should only be used in TableGen.
-def iPTRAny : VTAny<506>;
+def pAny : VTAny<506>;
// Pseudo valuetype to represent "vector of any size"
// Should only be used in TableGen.
diff --git a/llvm/include/llvm/CodeGenTypes/MachineValueType.h b/llvm/include/llvm/CodeGenTypes/MachineValueType.h
index c9a5098ef1623e..5c47ad4824a791 100644
--- a/llvm/include/llvm/CodeGenTypes/MachineValueType.h
+++ b/llvm/include/llvm/CodeGenTypes/MachineValueType.h
@@ -320,7 +320,7 @@ namespace llvm {
llvm_unreachable("Value type is non-standard value, Other.");
case iPTR:
llvm_unreachable("Value type size is target-dependent. Ask TLI.");
- case iPTRAny:
+ case pAny:
case iAny:
case fAny:
case vAny:
diff --git a/llvm/include/llvm/IR/Intrinsics.h b/llvm/include/llvm/IR/Intrinsics.h
index e893295e3272b9..89dfff256e0c43 100644
--- a/llvm/include/llvm/IR/Intrinsics.h
+++ b/llvm/include/llvm/IR/Intrinsics.h
@@ -92,7 +92,7 @@ namespace Intrinsic {
/// return the existing declaration.
///
/// The \p Tys parameter is for intrinsics with overloaded types (e.g., those
- /// using iAny, fAny, vAny, or iPTRAny). For a declaration of an overloaded
+ /// using iAny, fAny, vAny, or pAny). For a declaration of an overloaded
/// intrinsic, Tys must provide exactly one type for each overloaded type in
/// the intrinsic.
Function *getOrInsertDeclaration(Module *M, ID id, ArrayRef<Type *> Tys = {});
diff --git a/llvm/include/llvm/IR/Intrinsics.td b/llvm/include/llvm/IR/Intrinsics.td
index 94e53f372127da..09f446326e2463 100644
--- a/llvm/include/llvm/IR/Intrinsics.td
+++ b/llvm/include/llvm/IR/Intrinsics.td
@@ -388,7 +388,7 @@ class LLVMAnyType<ValueType vt> : LLVMType<vt> {
!eq(vt, iAny) : ArgKind.AnyInteger,
!eq(vt, fAny) : ArgKind.AnyFloat,
!eq(vt, vAny) : ArgKind.AnyVector,
- !eq(vt, iPTRAny) : ArgKind.AnyPointer,
+ !eq(vt, pAny) : ArgKind.AnyPointer,
);
let Sig = [
IIT_ARG.Number,
@@ -412,8 +412,8 @@ class LLVMQualPointerType<int addrspace>
]);
}
-class LLVMAnyPointerType : LLVMAnyType<iPTRAny> {
- assert isAny, "iPTRAny should have isOverloaded";
+class LLVMAnyPointerType : LLVMAnyType<pAny> {
+ assert isAny, "pAny should have isOverloaded";
}
// Match the type of another intrinsic parameter. Number is an index into the
diff --git a/llvm/lib/Target/NVPTX/NVPTXInstrInfo.td b/llvm/lib/Target/NVPTX/NVPTXInstrInfo.td
index 5f6cba397c5352..1ca3aefb0b0934 100644
--- a/llvm/lib/Target/NVPTX/NVPTXInstrInfo.td
+++ b/llvm/lib/Target/NVPTX/NVPTXInstrInfo.td
@@ -1922,7 +1922,7 @@ def imem : Operand<iPTR> {
let PrintMethod = "printOperand";
}
-def imemAny : Operand<iPTRAny> {
+def imemAny : Operand<pAny> {
let PrintMethod = "printOperand";
}
diff --git a/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp b/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp
index 3446bfeb3e7e19..f17c62dd1fd9d4 100644
--- a/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp
+++ b/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp
@@ -813,8 +813,8 @@ void TypeInfer::expandOverloads(TypeSetByHwMode &VTS) const {
void TypeInfer::expandOverloads(TypeSetByHwMode::SetType &Out,
const TypeSetByHwMode::SetType &Legal) const {
- if (Out.count(MVT::iPTRAny)) {
- Out.erase(MVT::iPTRAny);
+ if (Out.count(MVT::pAny)) {
+ Out.erase(MVT::pAny);
Out.insert(MVT::iPTR);
} else if (Out.count(MVT::iAny)) {
Out.erase(MVT::iAny);
diff --git a/mlir/tools/mlir-tblgen/LLVMIRIntrinsicGen.cpp b/mlir/tools/mlir-tblgen/LLVMIRIntrinsicGen.cpp
index 411a98a48bfb28..525c8d6d3e89bc 100644
--- a/mlir/tools/mlir-tblgen/LLVMIRIntrinsicGen.cpp
+++ b/mlir/tools/mlir-tblgen/LLVMIRIntrinsicGen.cpp
@@ -76,7 +76,7 @@ static IndicesTy getOverloadableTypeIdxs(const Record &record,
case llvm::MVT::iAny:
case llvm::MVT::fAny:
case llvm::MVT::Any:
- case llvm::MVT::iPTRAny:
+ case llvm::MVT::pAny:
case llvm::MVT::vAny:
overloadedOps.set(r.index());
break;
|
|
@llvm/pr-subscribers-mlir-llvm Author: Jessica Clarke (jrtc27) ChangesWhilst in upstream LLVM iPTRAny is only ever an integer, essentially an Thus, rename it to pAny, reflecting that it is an overloaded pointer This has been verified to have no effect on the generated files for LLVM Full diff: https://github.com/llvm/llvm-project/pull/113733.diff 8 Files Affected:
diff --git a/llvm/include/llvm/CodeGen/ValueTypes.h b/llvm/include/llvm/CodeGen/ValueTypes.h
index 3db6f33a8093f0..a6301f0b6135f3 100644
--- a/llvm/include/llvm/CodeGen/ValueTypes.h
+++ b/llvm/include/llvm/CodeGen/ValueTypes.h
@@ -230,7 +230,7 @@ namespace llvm {
/// Return true if this is an overloaded type for TableGen.
bool isOverloaded() const {
- return (V==MVT::iAny || V==MVT::fAny || V==MVT::vAny || V==MVT::iPTRAny);
+ return (V==MVT::iAny || V==MVT::fAny || V==MVT::vAny || V==MVT::pAny);
}
/// Return true if the bit size is a multiple of 8.
diff --git a/llvm/include/llvm/CodeGen/ValueTypes.td b/llvm/include/llvm/CodeGen/ValueTypes.td
index 493c0cfcab60ce..6d6b92958b4321 100644
--- a/llvm/include/llvm/CodeGen/ValueTypes.td
+++ b/llvm/include/llvm/CodeGen/ValueTypes.td
@@ -338,9 +338,9 @@ def MetadataVT : ValueType<0, 505> { // Metadata
let LLVMName = "Metadata";
}
-// Pseudo valuetype mapped to the current pointer size to any address space.
+// Pseudo valuetype to represent "pointer to any address space"
// Should only be used in TableGen.
-def iPTRAny : VTAny<506>;
+def pAny : VTAny<506>;
// Pseudo valuetype to represent "vector of any size"
// Should only be used in TableGen.
diff --git a/llvm/include/llvm/CodeGenTypes/MachineValueType.h b/llvm/include/llvm/CodeGenTypes/MachineValueType.h
index c9a5098ef1623e..5c47ad4824a791 100644
--- a/llvm/include/llvm/CodeGenTypes/MachineValueType.h
+++ b/llvm/include/llvm/CodeGenTypes/MachineValueType.h
@@ -320,7 +320,7 @@ namespace llvm {
llvm_unreachable("Value type is non-standard value, Other.");
case iPTR:
llvm_unreachable("Value type size is target-dependent. Ask TLI.");
- case iPTRAny:
+ case pAny:
case iAny:
case fAny:
case vAny:
diff --git a/llvm/include/llvm/IR/Intrinsics.h b/llvm/include/llvm/IR/Intrinsics.h
index e893295e3272b9..89dfff256e0c43 100644
--- a/llvm/include/llvm/IR/Intrinsics.h
+++ b/llvm/include/llvm/IR/Intrinsics.h
@@ -92,7 +92,7 @@ namespace Intrinsic {
/// return the existing declaration.
///
/// The \p Tys parameter is for intrinsics with overloaded types (e.g., those
- /// using iAny, fAny, vAny, or iPTRAny). For a declaration of an overloaded
+ /// using iAny, fAny, vAny, or pAny). For a declaration of an overloaded
/// intrinsic, Tys must provide exactly one type for each overloaded type in
/// the intrinsic.
Function *getOrInsertDeclaration(Module *M, ID id, ArrayRef<Type *> Tys = {});
diff --git a/llvm/include/llvm/IR/Intrinsics.td b/llvm/include/llvm/IR/Intrinsics.td
index 94e53f372127da..09f446326e2463 100644
--- a/llvm/include/llvm/IR/Intrinsics.td
+++ b/llvm/include/llvm/IR/Intrinsics.td
@@ -388,7 +388,7 @@ class LLVMAnyType<ValueType vt> : LLVMType<vt> {
!eq(vt, iAny) : ArgKind.AnyInteger,
!eq(vt, fAny) : ArgKind.AnyFloat,
!eq(vt, vAny) : ArgKind.AnyVector,
- !eq(vt, iPTRAny) : ArgKind.AnyPointer,
+ !eq(vt, pAny) : ArgKind.AnyPointer,
);
let Sig = [
IIT_ARG.Number,
@@ -412,8 +412,8 @@ class LLVMQualPointerType<int addrspace>
]);
}
-class LLVMAnyPointerType : LLVMAnyType<iPTRAny> {
- assert isAny, "iPTRAny should have isOverloaded";
+class LLVMAnyPointerType : LLVMAnyType<pAny> {
+ assert isAny, "pAny should have isOverloaded";
}
// Match the type of another intrinsic parameter. Number is an index into the
diff --git a/llvm/lib/Target/NVPTX/NVPTXInstrInfo.td b/llvm/lib/Target/NVPTX/NVPTXInstrInfo.td
index 5f6cba397c5352..1ca3aefb0b0934 100644
--- a/llvm/lib/Target/NVPTX/NVPTXInstrInfo.td
+++ b/llvm/lib/Target/NVPTX/NVPTXInstrInfo.td
@@ -1922,7 +1922,7 @@ def imem : Operand<iPTR> {
let PrintMethod = "printOperand";
}
-def imemAny : Operand<iPTRAny> {
+def imemAny : Operand<pAny> {
let PrintMethod = "printOperand";
}
diff --git a/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp b/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp
index 3446bfeb3e7e19..f17c62dd1fd9d4 100644
--- a/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp
+++ b/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp
@@ -813,8 +813,8 @@ void TypeInfer::expandOverloads(TypeSetByHwMode &VTS) const {
void TypeInfer::expandOverloads(TypeSetByHwMode::SetType &Out,
const TypeSetByHwMode::SetType &Legal) const {
- if (Out.count(MVT::iPTRAny)) {
- Out.erase(MVT::iPTRAny);
+ if (Out.count(MVT::pAny)) {
+ Out.erase(MVT::pAny);
Out.insert(MVT::iPTR);
} else if (Out.count(MVT::iAny)) {
Out.erase(MVT::iAny);
diff --git a/mlir/tools/mlir-tblgen/LLVMIRIntrinsicGen.cpp b/mlir/tools/mlir-tblgen/LLVMIRIntrinsicGen.cpp
index 411a98a48bfb28..525c8d6d3e89bc 100644
--- a/mlir/tools/mlir-tblgen/LLVMIRIntrinsicGen.cpp
+++ b/mlir/tools/mlir-tblgen/LLVMIRIntrinsicGen.cpp
@@ -76,7 +76,7 @@ static IndicesTy getOverloadableTypeIdxs(const Record &record,
case llvm::MVT::iAny:
case llvm::MVT::fAny:
case llvm::MVT::Any:
- case llvm::MVT::iPTRAny:
+ case llvm::MVT::pAny:
case llvm::MVT::vAny:
overloadedOps.set(r.index());
break;
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
Created using spr 1.3.4
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.
Whilst in upstream LLVM iPTRAny is only ever an integer, essentially an
alias for iPTR, this is not true in CHERI LLVM, where it gets used to
mean "iPTR or cPTR", i.e. either an integer address or a capability
(with cPTR and cN being the capability equivalents of iPTR and iN).
Moreover, iPTRAny is already not itself regarded as an integer (calling
isInteger() will give false), so the "i" prefix is misleading, and it
stands out as different from all the other xAny that have a single
letter prefix denoting their type.
Thus, rename it to pAny, reflecting that it is an overloaded pointer
type, which could end up being specialised to an integer type, but does
not have to be.
This has been verified to have no effect on the generated files for LLVM
itself or any in-tree target beyond the replacement of the identifier
iPTRAny with pAny in GenVT.inc.