[clang] [RISCV][NFC] Use enum types to improve debuggability (PR #188418)
Pengcheng Wang via cfe-commits
cfe-commits at lists.llvm.org
Wed Mar 25 02:09:51 PDT 2026
https://github.com/wangpc-pp updated https://github.com/llvm/llvm-project/pull/188418
>From 76a571df56552ecc6753bb126cd2e78b74c16eb5 Mon Sep 17 00:00:00 2001
From: Pengcheng Wang <wangpengcheng.pp at bytedance.com>
Date: Wed, 25 Mar 2026 14:25:56 +0800
Subject: [PATCH 1/2] [RISCV][NFC] Use enum types to improve debuggability
So that we can see the enum values instead of integral values when
dumping in debuggers.
---
.../clang/Support/RISCVVIntrinsicUtils.h | 13 +++++----
clang/lib/Support/RISCVVIntrinsicUtils.cpp | 28 +++++++++----------
2 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/clang/include/clang/Support/RISCVVIntrinsicUtils.h b/clang/include/clang/Support/RISCVVIntrinsicUtils.h
index 4016cc2f77dec..18738f2c3aa4b 100644
--- a/clang/include/clang/Support/RISCVVIntrinsicUtils.h
+++ b/clang/include/clang/Support/RISCVVIntrinsicUtils.h
@@ -173,14 +173,15 @@ struct PrototypeDescriptor {
BaseTypeModifier PT,
VectorTypeModifier VTM = VectorTypeModifier::NoModifier,
TypeModifier TM = TypeModifier::NoModifier)
- : PT(static_cast<uint8_t>(PT)), VTM(static_cast<uint8_t>(VTM)),
- TM(static_cast<uint8_t>(TM)) {}
- constexpr PrototypeDescriptor(uint8_t PT, uint8_t VTM, uint8_t TM)
: PT(PT), VTM(VTM), TM(TM) {}
+ constexpr PrototypeDescriptor(uint8_t PT, uint8_t VTM, uint8_t TM)
+ : PT(static_cast<BaseTypeModifier>(PT)),
+ VTM(static_cast<VectorTypeModifier>(VTM)),
+ TM(static_cast<TypeModifier>(TM)) {}
- uint8_t PT = static_cast<uint8_t>(BaseTypeModifier::Invalid);
- uint8_t VTM = static_cast<uint8_t>(VectorTypeModifier::NoModifier);
- uint8_t TM = static_cast<uint8_t>(TypeModifier::NoModifier);
+ BaseTypeModifier PT = BaseTypeModifier::Invalid;
+ VectorTypeModifier VTM = VectorTypeModifier::NoModifier;
+ TypeModifier TM = TypeModifier::NoModifier;
bool operator!=(const PrototypeDescriptor &PD) const {
return !(*this == PD);
diff --git a/clang/lib/Support/RISCVVIntrinsicUtils.cpp b/clang/lib/Support/RISCVVIntrinsicUtils.cpp
index a5430aee6b746..2c55c178ead08 100644
--- a/clang/lib/Support/RISCVVIntrinsicUtils.cpp
+++ b/clang/lib/Support/RISCVVIntrinsicUtils.cpp
@@ -481,7 +481,7 @@ PrototypeDescriptor::parsePrototypeDescriptor(
default:
llvm_unreachable("Illegal primitive type transformers!");
}
- PD.PT = static_cast<uint8_t>(PT);
+ PD.PT = PT;
PrototypeDescriptorStr = PrototypeDescriptorStr.drop_back();
// Compute the vector type transformers, it can only appear one time.
@@ -650,7 +650,7 @@ PrototypeDescriptor::parsePrototypeDescriptor(
llvm_unreachable("Illegal complex type transformers!");
}
}
- PD.VTM = static_cast<uint8_t>(VTM);
+ PD.VTM = VTM;
// Compute the remain type transformers
TypeModifier TM = TypeModifier::NoModifier;
@@ -688,7 +688,7 @@ PrototypeDescriptor::parsePrototypeDescriptor(
llvm_unreachable("Illegal non-primitive type transformer!");
}
}
- PD.TM = static_cast<uint8_t>(TM);
+ PD.TM = TM;
return PD;
}
@@ -972,9 +972,9 @@ static uint64_t computeRVVTypeHashValue(BasicType BT, int Log2LMUL,
// | Log2LMUL + 3 | BT | Proto.PT | Proto.TM | Proto.VTM |
assert(Log2LMUL >= -3 && Log2LMUL <= 3);
return (Log2LMUL + 3) | (static_cast<uint64_t>(BT) & 0xffff) << 8 |
- ((uint64_t)(Proto.PT & 0xff) << 24) |
- ((uint64_t)(Proto.TM & 0xff) << 32) |
- ((uint64_t)(Proto.VTM & 0xff) << 40);
+ (static_cast<uint64_t>(Proto.PT) << 24) |
+ (static_cast<uint64_t>(Proto.TM) << 32) |
+ (static_cast<uint64_t>(Proto.VTM) << 40);
}
std::optional<RVVTypePtr> RVVTypeCache::computeType(BasicType BT, int Log2LMUL,
@@ -1087,9 +1087,9 @@ llvm::SmallVector<PrototypeDescriptor> RVVIntrinsic::computeBuiltinTypes(
if (IsTuple) {
PrototypeDescriptor BasePtrOperand = Prototype[1];
PrototypeDescriptor MaskoffType = PrototypeDescriptor(
- static_cast<uint8_t>(BaseTypeModifier::Vector),
- static_cast<uint8_t>(getTupleVTM(NF)),
- BasePtrOperand.TM & ~static_cast<uint8_t>(TypeModifier::Pointer));
+ BaseTypeModifier::Vector, getTupleVTM(NF),
+ static_cast<TypeModifier>(BasePtrOperand.TM &
+ ~TypeModifier::Pointer));
NewPrototype.insert(NewPrototype.begin() + 1, MaskoffType);
} else {
// Convert
@@ -1097,7 +1097,7 @@ llvm::SmallVector<PrototypeDescriptor> RVVIntrinsic::computeBuiltinTypes(
// to
// (void, op0 address, op1 address, ..., maskedoff0, maskedoff1, ...)
PrototypeDescriptor MaskoffType = NewPrototype[1];
- MaskoffType.TM &= ~static_cast<uint8_t>(TypeModifier::Pointer);
+ MaskoffType.TM &= ~TypeModifier::Pointer;
NewPrototype.insert(NewPrototype.begin() + NF + 1, NF, MaskoffType);
}
}
@@ -1126,9 +1126,9 @@ llvm::SmallVector<PrototypeDescriptor> RVVIntrinsic::computeBuiltinTypes(
if (IsTuple) {
PrototypeDescriptor BasePtrOperand = Prototype[0];
PrototypeDescriptor MaskoffType = PrototypeDescriptor(
- static_cast<uint8_t>(BaseTypeModifier::Vector),
- static_cast<uint8_t>(getTupleVTM(NF)),
- BasePtrOperand.TM & ~static_cast<uint8_t>(TypeModifier::Pointer));
+ BaseTypeModifier::Vector, getTupleVTM(NF),
+ static_cast<TypeModifier>(BasePtrOperand.TM &
+ ~TypeModifier::Pointer));
NewPrototype.insert(NewPrototype.begin(), MaskoffType);
} else {
// NF > 1 cases for segment load operations.
@@ -1137,7 +1137,7 @@ llvm::SmallVector<PrototypeDescriptor> RVVIntrinsic::computeBuiltinTypes(
// to
// (void, op0 address, op1 address, maskedoff0, maskedoff1, ...)
PrototypeDescriptor MaskoffType = Prototype[1];
- MaskoffType.TM &= ~static_cast<uint8_t>(TypeModifier::Pointer);
+ MaskoffType.TM &= ~TypeModifier::Pointer;
NewPrototype.insert(NewPrototype.begin() + NF + 1, NF, MaskoffType);
}
}
>From 96a63db62b065403ac490a04845539fcd9aa71e3 Mon Sep 17 00:00:00 2001
From: Pengcheng Wang <wangpengcheng.pp at bytedance.com>
Date: Wed, 25 Mar 2026 17:09:29 +0800
Subject: [PATCH 2/2] Remove more static_cast
---
clang/lib/Support/RISCVVIntrinsicUtils.cpp | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/clang/lib/Support/RISCVVIntrinsicUtils.cpp b/clang/lib/Support/RISCVVIntrinsicUtils.cpp
index 2c55c178ead08..218d7b75ff7f2 100644
--- a/clang/lib/Support/RISCVVIntrinsicUtils.cpp
+++ b/clang/lib/Support/RISCVVIntrinsicUtils.cpp
@@ -1086,10 +1086,9 @@ llvm::SmallVector<PrototypeDescriptor> RVVIntrinsic::computeBuiltinTypes(
} else if (NF > 1) {
if (IsTuple) {
PrototypeDescriptor BasePtrOperand = Prototype[1];
- PrototypeDescriptor MaskoffType = PrototypeDescriptor(
- BaseTypeModifier::Vector, getTupleVTM(NF),
- static_cast<TypeModifier>(BasePtrOperand.TM &
- ~TypeModifier::Pointer));
+ PrototypeDescriptor MaskoffType =
+ PrototypeDescriptor(BaseTypeModifier::Vector, getTupleVTM(NF),
+ BasePtrOperand.TM & ~TypeModifier::Pointer);
NewPrototype.insert(NewPrototype.begin() + 1, MaskoffType);
} else {
// Convert
@@ -1125,10 +1124,9 @@ llvm::SmallVector<PrototypeDescriptor> RVVIntrinsic::computeBuiltinTypes(
} else if (PolicyAttrs.isTUPolicy() && HasPassthruOp) {
if (IsTuple) {
PrototypeDescriptor BasePtrOperand = Prototype[0];
- PrototypeDescriptor MaskoffType = PrototypeDescriptor(
- BaseTypeModifier::Vector, getTupleVTM(NF),
- static_cast<TypeModifier>(BasePtrOperand.TM &
- ~TypeModifier::Pointer));
+ PrototypeDescriptor MaskoffType =
+ PrototypeDescriptor(BaseTypeModifier::Vector, getTupleVTM(NF),
+ BasePtrOperand.TM & ~TypeModifier::Pointer);
NewPrototype.insert(NewPrototype.begin(), MaskoffType);
} else {
// NF > 1 cases for segment load operations.
More information about the cfe-commits
mailing list