Skip to content

Commit cb2d56c

Browse files
authored
[NFC][HLSL][DirectX] Consolidate ResourceClassNames (#152213)
During the split of the various `Frontend/HLSL` libraries, there was an oversight to duplicate the `ResourceClassNames` definitions. This commit simply consolidates the definitions into `DXContainer.h` as `getResourceClasses`
1 parent 47f54e4 commit cb2d56c

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

llvm/include/llvm/BinaryFormat/DXContainer.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "llvm/ADT/BitmaskEnum.h"
1717
#include "llvm/ADT/StringRef.h"
1818
#include "llvm/Support/Compiler.h"
19+
#include "llvm/Support/DXILABI.h"
1920
#include "llvm/Support/Error.h"
2021
#include "llvm/Support/SwapByteOrder.h"
2122
#include "llvm/TargetParser/Triple.h"
@@ -157,6 +158,8 @@ enum class FeatureFlags : uint64_t {
157158
static_assert((uint64_t)FeatureFlags::NextUnusedBit <= 1ull << 63,
158159
"Shader flag bits exceed enum size.");
159160

161+
LLVM_ABI ArrayRef<EnumEntry<llvm::dxil::ResourceClass>> getResourceClasses();
162+
160163
#define ROOT_SIGNATURE_FLAG(Num, Val) Val = Num,
161164
enum class RootFlags : uint32_t {
162165
#include "DXContainerConstants.def"

llvm/lib/BinaryFormat/DXContainer.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,17 @@ ArrayRef<EnumEntry<SigComponentType>> dxbc::getSigComponentTypes() {
6060
return ArrayRef(SigComponentTypes);
6161
}
6262

63+
static const EnumEntry<dxil::ResourceClass> ResourceClassNames[] = {
64+
{"SRV", llvm::dxil::ResourceClass::SRV},
65+
{"UAV", llvm::dxil::ResourceClass::UAV},
66+
{"CBV", llvm::dxil::ResourceClass::CBuffer},
67+
{"Sampler", llvm::dxil::ResourceClass::Sampler},
68+
};
69+
70+
ArrayRef<EnumEntry<llvm::dxil::ResourceClass>> dxbc::getResourceClasses() {
71+
return ArrayRef(ResourceClassNames);
72+
}
73+
6374
static const EnumEntry<RootFlags> RootFlagNames[] = {
6475
#define ROOT_SIGNATURE_FLAG(Val, Enum) {#Enum, RootFlags::Enum},
6576
#include "llvm/BinaryFormat/DXContainerConstants.def"

llvm/lib/Frontend/HLSL/HLSLRootSignature.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,9 @@ static raw_ostream &operator<<(raw_ostream &OS,
9292
return OS;
9393
}
9494

95-
static const EnumEntry<dxil::ResourceClass> ResourceClassNames[] = {
96-
{"CBV", dxil::ResourceClass::CBuffer},
97-
{"SRV", dxil::ResourceClass::SRV},
98-
{"UAV", dxil::ResourceClass::UAV},
99-
{"Sampler", dxil::ResourceClass::Sampler},
100-
};
101-
10295
static raw_ostream &operator<<(raw_ostream &OS, const ClauseType &Type) {
10396
OS << enumToStringRef(dxil::ResourceClass(llvm::to_underlying(Type)),
104-
ArrayRef(ResourceClassNames));
97+
dxbc::getResourceClasses());
10598

10699
return OS;
107100
}

llvm/lib/Frontend/HLSL/RootSignatureMetadata.cpp

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,6 @@ static std::optional<StringRef> extractMdStringValue(MDNode *Node,
5151
return NodeText->getString();
5252
}
5353

54-
static const EnumEntry<dxil::ResourceClass> ResourceClassNames[] = {
55-
{"CBV", dxil::ResourceClass::CBuffer},
56-
{"SRV", dxil::ResourceClass::SRV},
57-
{"UAV", dxil::ResourceClass::UAV},
58-
{"Sampler", dxil::ResourceClass::Sampler},
59-
};
60-
6154
namespace {
6255

6356
// We use the OverloadVisit with std::visit to ensure the compiler catches if a
@@ -128,7 +121,7 @@ MDNode *MetadataBuilder::BuildRootDescriptor(const RootDescriptor &Descriptor) {
128121
IRBuilder<> Builder(Ctx);
129122
StringRef ResName =
130123
enumToStringRef(dxil::ResourceClass(to_underlying(Descriptor.Type)),
131-
ArrayRef(ResourceClassNames));
124+
dxbc::getResourceClasses());
132125
assert(!ResName.empty() && "Provided an invalid Resource Class");
133126
SmallString<7> Name({"Root", ResName});
134127
Metadata *Operands[] = {
@@ -170,7 +163,7 @@ MDNode *MetadataBuilder::BuildDescriptorTableClause(
170163
IRBuilder<> Builder(Ctx);
171164
StringRef ResName =
172165
enumToStringRef(dxil::ResourceClass(to_underlying(Clause.Type)),
173-
ArrayRef(ResourceClassNames));
166+
dxbc::getResourceClasses());
174167
assert(!ResName.empty() && "Provided an invalid Resource Class");
175168
Metadata *Operands[] = {
176169
MDString::get(Ctx, ResName),

0 commit comments

Comments
 (0)