Skip to content

Commit d8a4a3f

Browse files
hekotahekota
committed
Rename DXILResourceBindingsInfo to DXILResourceBindingInfo
1 parent d5685ec commit d8a4a3f

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

‎llvm/include/llvm/Analysis/DXILResource.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ ModulePass *createDXILResourceWrapperPassPass();
591591

592592
//===----------------------------------------------------------------------===//
593593

594-
// DXILResourceBindingsInfo stores the results of DXILResourceBindingAnalysis
594+
// DXILResourceBindingInfo stores the results of DXILResourceBindingAnalysis
595595
// which analyses all llvm.dx.resource.handlefrombinding calls in the module
596596
// and puts together lists of used virtual register spaces and available
597597
// virtual register slot ranges for each binding type.
@@ -618,7 +618,7 @@ ModulePass *createDXILResourceWrapperPassPass();
618618
// }
619619
// }
620620
//
621-
class DXILResourceBindingsInfo {
621+
class DXILResourceBindingInfo {
622622
public:
623623
struct BindingRange {
624624
uint32_t LowerBound;
@@ -653,7 +653,7 @@ class DXILResourceBindingsInfo {
653653
void populate(Module &M, DXILResourceTypeMap &DRTM);
654654

655655
public:
656-
DXILResourceBindingsInfo()
656+
DXILResourceBindingInfo()
657657
: SRVSpaces(dxil::ResourceClass::SRV),
658658
UAVSpaces(dxil::ResourceClass::UAV),
659659
CBufferSpaces(dxil::ResourceClass::CBuffer),
@@ -686,9 +686,9 @@ class DXILResourceBindingAnalysis
686686
static AnalysisKey Key;
687687

688688
public:
689-
using Result = DXILResourceBindingsInfo;
689+
using Result = DXILResourceBindingInfo;
690690

691-
DXILResourceBindingsInfo run(Module &M, ModuleAnalysisManager &AM);
691+
DXILResourceBindingInfo run(Module &M, ModuleAnalysisManager &AM);
692692
};
693693

694694
} // namespace llvm

‎llvm/lib/Analysis/DXILResource.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -883,7 +883,7 @@ SmallVector<dxil::ResourceInfo *> DXILResourceMap::findByUse(const Value *Key) {
883883

884884
//===----------------------------------------------------------------------===//
885885

886-
void DXILResourceBindingsInfo::populate(Module &M, DXILResourceTypeMap &DRTM) {
886+
void DXILResourceBindingInfo::populate(Module &M, DXILResourceTypeMap &DRTM) {
887887
struct Binding {
888888
ResourceClass ResClass;
889889
uint32_t Space;
@@ -1007,9 +1007,9 @@ DXILResourceMap DXILResourceAnalysis::run(Module &M,
10071007
return Data;
10081008
}
10091009

1010-
DXILResourceBindingsInfo
1010+
DXILResourceBindingInfo
10111011
DXILResourceBindingAnalysis::run(Module &M, ModuleAnalysisManager &AM) {
1012-
DXILResourceBindingsInfo Data;
1012+
DXILResourceBindingInfo Data;
10131013
DXILResourceTypeMap &DRTM = AM.getResult<DXILResourceTypeAnalysis>(M);
10141014
Data.populate(M, DRTM);
10151015
return Data;

‎llvm/unittests/Target/DirectX/ResourceBindingAnalysisTests.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class ResourceBindingAnalysisTest : public testing::Test {
4646
}
4747

4848
void checkExpectedSpaceAndFreeRanges(
49-
DXILResourceBindingsInfo::RegisterSpace &RegSpace, uint32_t ExpSpace,
49+
DXILResourceBindingInfo::RegisterSpace &RegSpace, uint32_t ExpSpace,
5050
ArrayRef<uint32_t> ExpValues) {
5151
EXPECT_EQ(RegSpace.Space, ExpSpace);
5252
EXPECT_EQ(RegSpace.FreeRanges.size() * 2, ExpValues.size());
@@ -75,14 +75,14 @@ declare void @a.func(target("dx.RawBuffer", float, 1, 0) %handle)
7575

7676
auto M = parseAsm(Assembly);
7777

78-
DXILResourceBindingsInfo &DRBI =
78+
DXILResourceBindingInfo &DRBI =
7979
MAM->getResult<DXILResourceBindingAnalysis>(*M);
8080

8181
EXPECT_EQ(false, DRBI.containsImplicitBinding());
8282
EXPECT_EQ(false, DRBI.containsOverlappingBinding());
8383

8484
// check that UAV has exactly one gap
85-
DXILResourceBindingsInfo::BindingSpaces &UAVSpaces =
85+
DXILResourceBindingInfo::BindingSpaces &UAVSpaces =
8686
DRBI.getBindingSpaces(ResourceClass::UAV);
8787
EXPECT_EQ(UAVSpaces.ResClass, ResourceClass::UAV);
8888
EXPECT_EQ(UAVSpaces.Spaces.size(), 1u);
@@ -92,7 +92,7 @@ declare void @a.func(target("dx.RawBuffer", float, 1, 0) %handle)
9292
// check that other kinds of register spaces are all available
9393
for (auto RC :
9494
{ResourceClass::SRV, ResourceClass::CBuffer, ResourceClass::Sampler}) {
95-
DXILResourceBindingsInfo::BindingSpaces &Spaces = DRBI.getBindingSpaces(RC);
95+
DXILResourceBindingInfo::BindingSpaces &Spaces = DRBI.getBindingSpaces(RC);
9696
EXPECT_EQ(Spaces.ResClass, RC);
9797
EXPECT_EQ(Spaces.Spaces.size(), 1u);
9898
checkExpectedSpaceAndFreeRanges(Spaces.Spaces[0], 0, {0, UINT32_MAX});
@@ -132,19 +132,19 @@ declare void @a.func(target("dx.RawBuffer", float, 1, 0) %handle)
132132

133133
auto M = parseAsm(Assembly);
134134

135-
DXILResourceBindingsInfo &DRBI =
135+
DXILResourceBindingInfo &DRBI =
136136
MAM->getResult<DXILResourceBindingAnalysis>(*M);
137137

138138
EXPECT_EQ(false, DRBI.containsImplicitBinding());
139139
EXPECT_EQ(false, DRBI.containsOverlappingBinding());
140140

141-
DXILResourceBindingsInfo::BindingSpaces &SRVSpaces =
141+
DXILResourceBindingInfo::BindingSpaces &SRVSpaces =
142142
DRBI.getBindingSpaces(ResourceClass::SRV);
143143
EXPECT_EQ(SRVSpaces.ResClass, ResourceClass::SRV);
144144
EXPECT_EQ(SRVSpaces.Spaces.size(), 1u);
145145
checkExpectedSpaceAndFreeRanges(SRVSpaces.Spaces[0], 0, {6, UINT32_MAX});
146146

147-
DXILResourceBindingsInfo::BindingSpaces &UAVSpaces =
147+
DXILResourceBindingInfo::BindingSpaces &UAVSpaces =
148148
DRBI.getBindingSpaces(ResourceClass::UAV);
149149
EXPECT_EQ(UAVSpaces.ResClass, ResourceClass::UAV);
150150
EXPECT_EQ(UAVSpaces.Spaces.size(), 2u);
@@ -153,7 +153,7 @@ declare void @a.func(target("dx.RawBuffer", float, 1, 0) %handle)
153153
checkExpectedSpaceAndFreeRanges(UAVSpaces.Spaces[1], 20,
154154
{0, 9, 15, UINT32_MAX});
155155

156-
DXILResourceBindingsInfo::BindingSpaces &CBufferSpaces =
156+
DXILResourceBindingInfo::BindingSpaces &CBufferSpaces =
157157
DRBI.getBindingSpaces(ResourceClass::CBuffer);
158158
EXPECT_EQ(CBufferSpaces.ResClass, ResourceClass::CBuffer);
159159
EXPECT_EQ(CBufferSpaces.Spaces.size(), 1u);
@@ -188,13 +188,13 @@ declare void @a.func(target("dx.RawBuffer", float, 0, 0) %handle)
188188

189189
auto M = parseAsm(Assembly);
190190

191-
DXILResourceBindingsInfo &DRBI =
191+
DXILResourceBindingInfo &DRBI =
192192
MAM->getResult<DXILResourceBindingAnalysis>(*M);
193193

194194
EXPECT_EQ(false, DRBI.containsImplicitBinding());
195195
EXPECT_EQ(true, DRBI.containsOverlappingBinding());
196196

197-
DXILResourceBindingsInfo::BindingSpaces &SRVSpaces =
197+
DXILResourceBindingInfo::BindingSpaces &SRVSpaces =
198198
DRBI.getBindingSpaces(ResourceClass::SRV);
199199
EXPECT_EQ(SRVSpaces.ResClass, ResourceClass::SRV);
200200
EXPECT_EQ(SRVSpaces.Spaces.size(), 2u);
@@ -228,13 +228,13 @@ declare void @a.func(target("dx.TypedBuffer", float, 1, 0, 0) %handle)
228228

229229
auto M = parseAsm(Assembly);
230230

231-
DXILResourceBindingsInfo &DRBI =
231+
DXILResourceBindingInfo &DRBI =
232232
MAM->getResult<DXILResourceBindingAnalysis>(*M);
233233

234234
EXPECT_EQ(false, DRBI.containsImplicitBinding());
235235
EXPECT_EQ(false, DRBI.containsOverlappingBinding());
236236

237-
DXILResourceBindingsInfo::BindingSpaces &UAVSpaces =
237+
DXILResourceBindingInfo::BindingSpaces &UAVSpaces =
238238
DRBI.getBindingSpaces(ResourceClass::UAV);
239239
EXPECT_EQ(UAVSpaces.ResClass, ResourceClass::UAV);
240240
EXPECT_EQ(UAVSpaces.Spaces.size(), 3u);
@@ -260,7 +260,7 @@ declare void @a.func(target("dx.TypedBuffer", float, 1, 0, 0) %handle)
260260

261261
auto M = parseAsm(Assembly);
262262

263-
DXILResourceBindingsInfo &DRBI =
263+
DXILResourceBindingInfo &DRBI =
264264
MAM->getResult<DXILResourceBindingAnalysis>(*M);
265265
EXPECT_EQ(true, DRBI.containsImplicitBinding());
266266
}

0 commit comments

Comments
 (0)