Skip to content

Commit a83ed04

Browse files
authored
[DirectX] Follow naming conventions for enumerators in DXILABI.h. NFC (#86237)
These all-caps names differ from the llvm naming conventions for no good reason, and `VOID` in all caps can cause problems in windows environments (see [1]). Rename them to UpperCamelCase. [1]: clangd/clangd#1983
1 parent 2039268 commit a83ed04

File tree

3 files changed

+43
-43
lines changed

3 files changed

+43
-43
lines changed

llvm/include/llvm/Support/DXILABI.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@ namespace llvm {
2323
namespace dxil {
2424

2525
enum class ParameterKind : uint8_t {
26-
INVALID = 0,
27-
VOID,
28-
HALF,
29-
FLOAT,
30-
DOUBLE,
26+
Invalid = 0,
27+
Void,
28+
Half,
29+
Float,
30+
Double,
3131
I1,
3232
I8,
3333
I16,
3434
I32,
3535
I64,
36-
OVERLOAD,
37-
CBUFFER_RET,
38-
RESOURCE_RET,
39-
DXIL_HANDLE,
36+
Overload,
37+
CBufferRet,
38+
ResourceRet,
39+
DXILHandle,
4040
};
4141

4242
/// The kind of resource for an SRV or UAV resource. Sometimes referred to as

llvm/lib/Target/DirectX/DXILOpBuilder.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,13 @@ static StructType *getHandleType(LLVMContext &Ctx) {
190190
static Type *getTypeFromParameterKind(ParameterKind Kind, Type *OverloadTy) {
191191
auto &Ctx = OverloadTy->getContext();
192192
switch (Kind) {
193-
case ParameterKind::VOID:
193+
case ParameterKind::Void:
194194
return Type::getVoidTy(Ctx);
195-
case ParameterKind::HALF:
195+
case ParameterKind::Half:
196196
return Type::getHalfTy(Ctx);
197-
case ParameterKind::FLOAT:
197+
case ParameterKind::Float:
198198
return Type::getFloatTy(Ctx);
199-
case ParameterKind::DOUBLE:
199+
case ParameterKind::Double:
200200
return Type::getDoubleTy(Ctx);
201201
case ParameterKind::I1:
202202
return Type::getInt1Ty(Ctx);
@@ -208,11 +208,11 @@ static Type *getTypeFromParameterKind(ParameterKind Kind, Type *OverloadTy) {
208208
return Type::getInt32Ty(Ctx);
209209
case ParameterKind::I64:
210210
return Type::getInt64Ty(Ctx);
211-
case ParameterKind::OVERLOAD:
211+
case ParameterKind::Overload:
212212
return OverloadTy;
213-
case ParameterKind::RESOURCE_RET:
213+
case ParameterKind::ResourceRet:
214214
return getResRetType(OverloadTy, Ctx);
215-
case ParameterKind::DXIL_HANDLE:
215+
case ParameterKind::DXILHandle:
216216
return getHandleType(Ctx);
217217
default:
218218
break;
@@ -320,8 +320,8 @@ Type *DXILOpBuilder::getOverloadTy(dxil::OpCode OpCode, FunctionType *FT) {
320320
auto ParamKinds = getOpCodeParameterKind(*Prop);
321321
auto Kind = ParamKinds[Prop->OverloadParamIndex];
322322
// For ResRet and CBufferRet, OverloadTy is in field of StructType.
323-
if (Kind == ParameterKind::CBUFFER_RET ||
324-
Kind == ParameterKind::RESOURCE_RET) {
323+
if (Kind == ParameterKind::CBufferRet ||
324+
Kind == ParameterKind::ResourceRet) {
325325
auto *ST = cast<StructType>(OverloadType);
326326
OverloadType = ST->getElementType(0);
327327
}

llvm/utils/TableGen/DXILEmitter.cpp

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ static ParameterKind getParameterKind(const Record *R) {
7474
auto VTRec = R->getValueAsDef("VT");
7575
switch (getValueType(VTRec)) {
7676
case MVT::isVoid:
77-
return ParameterKind::VOID;
77+
return ParameterKind::Void;
7878
case MVT::f16:
79-
return ParameterKind::HALF;
79+
return ParameterKind::Half;
8080
case MVT::f32:
81-
return ParameterKind::FLOAT;
81+
return ParameterKind::Float;
8282
case MVT::f64:
83-
return ParameterKind::DOUBLE;
83+
return ParameterKind::Double;
8484
case MVT::i1:
8585
return ParameterKind::I1;
8686
case MVT::i8:
@@ -91,11 +91,11 @@ static ParameterKind getParameterKind(const Record *R) {
9191
return ParameterKind::I32;
9292
case MVT::fAny:
9393
case MVT::iAny:
94-
return ParameterKind::OVERLOAD;
94+
return ParameterKind::Overload;
9595
case MVT::Other:
9696
// Handle DXIL-specific overload types
9797
if (R->getValueAsInt("isHalfOrFloat") || R->getValueAsInt("isI16OrI32")) {
98-
return ParameterKind::OVERLOAD;
98+
return ParameterKind::Overload;
9999
}
100100
LLVM_FALLTHROUGH;
101101
default:
@@ -201,16 +201,16 @@ DXILOperationDesc::DXILOperationDesc(const Record *R) {
201201
/// \return std::string string representation of input Kind
202202
static std::string getParameterKindStr(ParameterKind Kind) {
203203
switch (Kind) {
204-
case ParameterKind::INVALID:
205-
return "INVALID";
206-
case ParameterKind::VOID:
207-
return "VOID";
208-
case ParameterKind::HALF:
209-
return "HALF";
210-
case ParameterKind::FLOAT:
211-
return "FLOAT";
212-
case ParameterKind::DOUBLE:
213-
return "DOUBLE";
204+
case ParameterKind::Invalid:
205+
return "Invalid";
206+
case ParameterKind::Void:
207+
return "Void";
208+
case ParameterKind::Half:
209+
return "Half";
210+
case ParameterKind::Float:
211+
return "Float";
212+
case ParameterKind::Double:
213+
return "Double";
214214
case ParameterKind::I1:
215215
return "I1";
216216
case ParameterKind::I8:
@@ -221,14 +221,14 @@ static std::string getParameterKindStr(ParameterKind Kind) {
221221
return "I32";
222222
case ParameterKind::I64:
223223
return "I64";
224-
case ParameterKind::OVERLOAD:
225-
return "OVERLOAD";
226-
case ParameterKind::CBUFFER_RET:
227-
return "CBUFFER_RET";
228-
case ParameterKind::RESOURCE_RET:
229-
return "RESOURCE_RET";
230-
case ParameterKind::DXIL_HANDLE:
231-
return "DXIL_HANDLE";
224+
case ParameterKind::Overload:
225+
return "Overload";
226+
case ParameterKind::CBufferRet:
227+
return "CBufferRet";
228+
case ParameterKind::ResourceRet:
229+
return "ResourceRet";
230+
case ParameterKind::DXILHandle:
231+
return "DXILHandle";
232232
}
233233
llvm_unreachable("Unknown llvm::dxil::ParameterKind enum");
234234
}
@@ -462,7 +462,7 @@ static void emitDXILOperationTable(std::vector<DXILOperationDesc> &Ops,
462462
[](raw_ostream &ParamOS, ParameterKind Kind) {
463463
ParamOS << "ParameterKind::" << getParameterKindStr(Kind);
464464
},
465-
"ParameterKind::INVALID");
465+
"ParameterKind::Invalid");
466466
OS << " };\n\n";
467467
OS << " unsigned Index = Prop.ParameterTableOffset;\n";
468468
OS << " return DXILOpParameterKindTable + Index;\n";

0 commit comments

Comments
 (0)