Skip to content

Commit 0604891

Browse files
V-FEXrtV-FEXrt
committed
More renames
1 parent 2ec3db0 commit 0604891

File tree

11 files changed

+94
-96
lines changed

11 files changed

+94
-96
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ ModulePass *createDXILResourceTypeWrapperPassPass();
438438

439439
//===----------------------------------------------------------------------===//
440440

441-
class DXILBindingMap {
441+
class DXILResourceMap {
442442
SmallVector<dxil::ResourceInfo> Infos;
443443
DenseMap<CallInst *, unsigned> CallMap;
444444
unsigned FirstUAV = 0;
@@ -520,7 +520,7 @@ class DXILBindingMap {
520520
const DataLayout &DL) const;
521521

522522
friend class DXILResourceAnalysis;
523-
friend class DXILResourceBindingWrapperPass;
523+
friend class DXILResourceWrapperPass;
524524
};
525525

526526
class DXILResourceAnalysis : public AnalysisInfoMixin<DXILResourceAnalysis> {
@@ -529,10 +529,10 @@ class DXILResourceAnalysis : public AnalysisInfoMixin<DXILResourceAnalysis> {
529529
static AnalysisKey Key;
530530

531531
public:
532-
using Result = DXILBindingMap;
532+
using Result = DXILResourceMap;
533533

534534
/// Gather resource info for the module \c M.
535-
DXILBindingMap run(Module &M, ModuleAnalysisManager &AM);
535+
DXILResourceMap run(Module &M, ModuleAnalysisManager &AM);
536536
};
537537

538538
/// Printer pass for the \c DXILResourceAnalysis results.
@@ -547,18 +547,18 @@ class DXILResourcePrinterPass : public PassInfoMixin<DXILResourcePrinterPass> {
547547
static bool isRequired() { return true; }
548548
};
549549

550-
class DXILResourceBindingWrapperPass : public ModulePass {
551-
std::unique_ptr<DXILBindingMap> Map;
550+
class DXILResourceWrapperPass : public ModulePass {
551+
std::unique_ptr<DXILResourceMap> Map;
552552
DXILResourceTypeMap *DRTM;
553553

554554
public:
555555
static char ID; // Class identification, replacement for typeinfo
556556

557-
DXILResourceBindingWrapperPass();
558-
~DXILResourceBindingWrapperPass() override;
557+
DXILResourceWrapperPass();
558+
~DXILResourceWrapperPass() override;
559559

560-
const DXILBindingMap &getBindingMap() const { return *Map; }
561-
DXILBindingMap &getBindingMap() { return *Map; }
560+
const DXILResourceMap &getBindingMap() const { return *Map; }
561+
DXILResourceMap &getBindingMap() { return *Map; }
562562

563563
void getAnalysisUsage(AnalysisUsage &AU) const override;
564564
bool runOnModule(Module &M) override;
@@ -568,7 +568,7 @@ class DXILResourceBindingWrapperPass : public ModulePass {
568568
void dump() const;
569569
};
570570

571-
ModulePass *createDXILResourceBindingWrapperPassPass();
571+
ModulePass *createDXILResourceWrapperPassPass();
572572

573573
} // namespace llvm
574574

‎llvm/include/llvm/InitializePasses.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void initializeDAHPass(PassRegistry &);
8484
void initializeDCELegacyPassPass(PassRegistry &);
8585
void initializeDXILMetadataAnalysisWrapperPassPass(PassRegistry &);
8686
void initializeDXILMetadataAnalysisWrapperPrinterPass(PassRegistry &);
87-
void initializeDXILResourceBindingWrapperPassPass(PassRegistry &);
87+
void initializeDXILResourceWrapperPassPass(PassRegistry &);
8888
void initializeDXILResourceTypeWrapperPassPass(PassRegistry &);
8989
void initializeDeadMachineInstructionElimPass(PassRegistry &);
9090
void initializeDebugifyMachineModulePass(PassRegistry &);

‎llvm/include/llvm/LinkAllPasses.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ struct ForcePassLinking {
7070
(void)llvm::createCallGraphViewerPass();
7171
(void)llvm::createCFGSimplificationPass();
7272
(void)llvm::createStructurizeCFGPass();
73-
(void)llvm::createDXILResourceBindingWrapperPassPass();
73+
(void)llvm::createDXILResourceWrapperPassPass();
7474
(void)llvm::createDXILResourceTypeWrapperPassPass();
7575
(void)llvm::createDeadArgEliminationPass();
7676
(void)llvm::createDeadCodeEliminationPass();

‎llvm/lib/Analysis/Analysis.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ void llvm::initializeAnalysis(PassRegistry &Registry) {
2525
initializeCallGraphDOTPrinterPass(Registry);
2626
initializeCallGraphViewerPass(Registry);
2727
initializeCycleInfoWrapperPassPass(Registry);
28-
initializeDXILResourceBindingWrapperPassPass(Registry);
28+
initializeDXILResourceWrapperPassPass(Registry);
2929
initializeDXILResourceTypeWrapperPassPass(Registry);
3030
initializeDependenceAnalysisWrapperPassPass(Registry);
3131
initializeDominanceFrontierWrapperPassPass(Registry);

‎llvm/lib/Analysis/DXILResource.cpp‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ bool DXILResourceTypeMap::invalidate(Module &M, const PreservedAnalyses &PA,
685685

686686
//===----------------------------------------------------------------------===//
687687

688-
void DXILBindingMap::populate(Module &M, DXILResourceTypeMap &DRTM) {
688+
void DXILResourceMap::populate(Module &M, DXILResourceTypeMap &DRTM) {
689689
SmallVector<std::tuple<CallInst *, ResourceInfo, ResourceTypeInfo>> CIToInfos;
690690

691691
for (Function &F : M.functions()) {
@@ -764,8 +764,8 @@ void DXILBindingMap::populate(Module &M, DXILResourceTypeMap &DRTM) {
764764
}
765765
}
766766

767-
void DXILBindingMap::print(raw_ostream &OS, DXILResourceTypeMap &DRTM,
768-
const DataLayout &DL) const {
767+
void DXILResourceMap::print(raw_ostream &OS, DXILResourceTypeMap &DRTM,
768+
const DataLayout &DL) const {
769769
for (unsigned I = 0, E = Infos.size(); I != E; ++I) {
770770
OS << "Binding " << I << ":\n";
771771
const dxil::ResourceInfo &RI = Infos[I];
@@ -781,7 +781,7 @@ void DXILBindingMap::print(raw_ostream &OS, DXILResourceTypeMap &DRTM,
781781
}
782782

783783
SmallVector<dxil::ResourceInfo>
784-
DXILBindingMap::findByUse(const Value *Key) const {
784+
DXILResourceMap::findByUse(const Value *Key) const {
785785
if (const PHINode *Phi = dyn_cast<PHINode>(Key)) {
786786
SmallVector<dxil::ResourceInfo> Children;
787787
for (const Value *V : Phi->operands()) {
@@ -824,19 +824,20 @@ DXILBindingMap::findByUse(const Value *Key) const {
824824
AnalysisKey DXILResourceTypeAnalysis::Key;
825825
AnalysisKey DXILResourceAnalysis::Key;
826826

827-
DXILBindingMap DXILResourceAnalysis::run(Module &M, ModuleAnalysisManager &AM) {
828-
DXILBindingMap Data;
827+
DXILResourceMap DXILResourceAnalysis::run(Module &M,
828+
ModuleAnalysisManager &AM) {
829+
DXILResourceMap Data;
829830
DXILResourceTypeMap &DRTM = AM.getResult<DXILResourceTypeAnalysis>(M);
830831
Data.populate(M, DRTM);
831832
return Data;
832833
}
833834

834835
PreservedAnalyses DXILResourcePrinterPass::run(Module &M,
835836
ModuleAnalysisManager &AM) {
836-
DXILBindingMap &DBM = AM.getResult<DXILResourceAnalysis>(M);
837+
DXILResourceMap &DRM = AM.getResult<DXILResourceAnalysis>(M);
837838
DXILResourceTypeMap &DRTM = AM.getResult<DXILResourceTypeAnalysis>(M);
838839

839-
DBM.print(OS, DRTM, M.getDataLayout());
840+
DRM.print(OS, DRTM, M.getDataLayout());
840841
return PreservedAnalyses::all();
841842
}
842843

@@ -854,32 +855,29 @@ ModulePass *llvm::createDXILResourceTypeWrapperPassPass() {
854855
return new DXILResourceTypeWrapperPass();
855856
}
856857

857-
DXILResourceBindingWrapperPass::DXILResourceBindingWrapperPass()
858-
: ModulePass(ID) {
859-
initializeDXILResourceBindingWrapperPassPass(
860-
*PassRegistry::getPassRegistry());
858+
DXILResourceWrapperPass::DXILResourceWrapperPass() : ModulePass(ID) {
859+
initializeDXILResourceWrapperPassPass(*PassRegistry::getPassRegistry());
861860
}
862861

863-
DXILResourceBindingWrapperPass::~DXILResourceBindingWrapperPass() = default;
862+
DXILResourceWrapperPass::~DXILResourceWrapperPass() = default;
864863

865-
void DXILResourceBindingWrapperPass::getAnalysisUsage(AnalysisUsage &AU) const {
864+
void DXILResourceWrapperPass::getAnalysisUsage(AnalysisUsage &AU) const {
866865
AU.addRequiredTransitive<DXILResourceTypeWrapperPass>();
867866
AU.setPreservesAll();
868867
}
869868

870-
bool DXILResourceBindingWrapperPass::runOnModule(Module &M) {
871-
Map.reset(new DXILBindingMap());
869+
bool DXILResourceWrapperPass::runOnModule(Module &M) {
870+
Map.reset(new DXILResourceMap());
872871

873872
DRTM = &getAnalysis<DXILResourceTypeWrapperPass>().getResourceTypeMap();
874873
Map->populate(M, *DRTM);
875874

876875
return false;
877876
}
878877

879-
void DXILResourceBindingWrapperPass::releaseMemory() { Map.reset(); }
878+
void DXILResourceWrapperPass::releaseMemory() { Map.reset(); }
880879

881-
void DXILResourceBindingWrapperPass::print(raw_ostream &OS,
882-
const Module *M) const {
880+
void DXILResourceWrapperPass::print(raw_ostream &OS, const Module *M) const {
883881
if (!Map) {
884882
OS << "No resource map has been built!\n";
885883
return;
@@ -889,13 +887,13 @@ void DXILResourceBindingWrapperPass::print(raw_ostream &OS,
889887

890888
#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
891889
LLVM_DUMP_METHOD
892-
void DXILResourceBindingWrapperPass::dump() const { print(dbgs(), nullptr); }
890+
void DXILResourceWrapperPass::dump() const { print(dbgs(), nullptr); }
893891
#endif
894892

895-
INITIALIZE_PASS(DXILResourceBindingWrapperPass, "dxil-resource",
893+
INITIALIZE_PASS(DXILResourceWrapperPass, "dxil-resource",
896894
"DXIL Resource Binding Analysis", false, true)
897-
char DXILResourceBindingWrapperPass::ID = 0;
895+
char DXILResourceWrapperPass::ID = 0;
898896

899-
ModulePass *llvm::createDXILResourceBindingWrapperPassPass() {
900-
return new DXILResourceBindingWrapperPass();
897+
ModulePass *llvm::createDXILResourceWrapperPassPass() {
898+
return new DXILResourceWrapperPass();
901899
}

‎llvm/lib/Target/DirectX/DXContainerGlobals.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class DXContainerGlobals : public llvm::ModulePass {
6767
AU.addRequired<RootSignatureAnalysisWrapper>();
6868
AU.addRequired<DXILMetadataAnalysisWrapperPass>();
6969
AU.addRequired<DXILResourceTypeWrapperPass>();
70-
AU.addRequired<DXILResourceBindingWrapperPass>();
70+
AU.addRequired<DXILResourceWrapperPass>();
7171
}
7272
};
7373

@@ -181,8 +181,8 @@ void DXContainerGlobals::addRootSignature(Module &M,
181181
}
182182

183183
void DXContainerGlobals::addResourcesForPSV(Module &M, PSVRuntimeInfo &PSV) {
184-
const DXILBindingMap &DBM =
185-
getAnalysis<DXILResourceBindingWrapperPass>().getBindingMap();
184+
const DXILResourceMap &DRM =
185+
getAnalysis<DXILResourceWrapperPass>().getBindingMap();
186186
DXILResourceTypeMap &DRTM =
187187
getAnalysis<DXILResourceTypeWrapperPass>().getResourceTypeMap();
188188

@@ -200,18 +200,18 @@ void DXContainerGlobals::addResourcesForPSV(Module &M, PSVRuntimeInfo &PSV) {
200200
return BindInfo;
201201
};
202202

203-
for (const dxil::ResourceInfo &RI : DBM.cbuffers()) {
203+
for (const dxil::ResourceInfo &RI : DRM.cbuffers()) {
204204
const dxil::ResourceInfo::ResourceBinding &Binding = RI.getBinding();
205205
PSV.Resources.push_back(MakeBinding(Binding, dxbc::PSV::ResourceType::CBV,
206206
dxil::ResourceKind::CBuffer));
207207
}
208-
for (const dxil::ResourceInfo &RI : DBM.samplers()) {
208+
for (const dxil::ResourceInfo &RI : DRM.samplers()) {
209209
const dxil::ResourceInfo::ResourceBinding &Binding = RI.getBinding();
210210
PSV.Resources.push_back(MakeBinding(Binding,
211211
dxbc::PSV::ResourceType::Sampler,
212212
dxil::ResourceKind::Sampler));
213213
}
214-
for (const dxil::ResourceInfo &RI : DBM.srvs()) {
214+
for (const dxil::ResourceInfo &RI : DRM.srvs()) {
215215
const dxil::ResourceInfo::ResourceBinding &Binding = RI.getBinding();
216216

217217
dxil::ResourceTypeInfo &TypeInfo = DRTM[RI.getHandleTy()];
@@ -226,7 +226,7 @@ void DXContainerGlobals::addResourcesForPSV(Module &M, PSVRuntimeInfo &PSV) {
226226
PSV.Resources.push_back(
227227
MakeBinding(Binding, ResType, TypeInfo.getResourceKind()));
228228
}
229-
for (const dxil::ResourceInfo &RI : DBM.uavs()) {
229+
for (const dxil::ResourceInfo &RI : DRM.uavs()) {
230230
const dxil::ResourceInfo::ResourceBinding &Binding = RI.getBinding();
231231

232232
dxil::ResourceTypeInfo &TypeInfo = DRTM[RI.getHandleTy()];
@@ -298,7 +298,7 @@ INITIALIZE_PASS_BEGIN(DXContainerGlobals, "dxil-globals",
298298
INITIALIZE_PASS_DEPENDENCY(ShaderFlagsAnalysisWrapper)
299299
INITIALIZE_PASS_DEPENDENCY(DXILMetadataAnalysisWrapperPass)
300300
INITIALIZE_PASS_DEPENDENCY(DXILResourceTypeWrapperPass)
301-
INITIALIZE_PASS_DEPENDENCY(DXILResourceBindingWrapperPass)
301+
INITIALIZE_PASS_DEPENDENCY(DXILResourceWrapperPass)
302302
INITIALIZE_PASS_END(DXContainerGlobals, "dxil-globals",
303303
"DXContainer Global Emitter", false, true)
304304

‎llvm/lib/Target/DirectX/DXILOpLowering.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ namespace {
7979
class OpLowerer {
8080
Module &M;
8181
DXILOpBuilder OpBuilder;
82-
DXILBindingMap &DBM;
82+
DXILResourceMap &DRM;
8383
DXILResourceTypeMap &DRTM;
8484
SmallVector<CallInst *> CleanupCasts;
8585

8686
public:
87-
OpLowerer(Module &M, DXILBindingMap &DBM, DXILResourceTypeMap &DRTM)
88-
: M(M), OpBuilder(M), DBM(DBM), DRTM(DRTM) {}
87+
OpLowerer(Module &M, DXILResourceMap &DRM, DXILResourceTypeMap &DRTM)
88+
: M(M), OpBuilder(M), DRM(DRM), DRTM(DRTM) {}
8989

9090
/// Replace every call to \c F using \c ReplaceCall, and then erase \c F. If
9191
/// there is an error replacing a call, we emit a diagnostic and return true.
@@ -266,8 +266,8 @@ class OpLowerer {
266266
return replaceFunction(F, [&](CallInst *CI) -> Error {
267267
IRB.SetInsertPoint(CI);
268268

269-
auto *It = DBM.find(CI);
270-
assert(It != DBM.end() && "Resource not in map?");
269+
auto *It = DRM.find(CI);
270+
assert(It != DRM.end() && "Resource not in map?");
271271
dxil::ResourceInfo &RI = *It;
272272

273273
const auto &Binding = RI.getBinding();
@@ -304,8 +304,8 @@ class OpLowerer {
304304
return replaceFunction(F, [&](CallInst *CI) -> Error {
305305
IRB.SetInsertPoint(CI);
306306

307-
auto *It = DBM.find(CI);
308-
assert(It != DBM.end() && "Resource not in map?");
307+
auto *It = DRM.find(CI);
308+
assert(It != DRM.end() && "Resource not in map?");
309309
dxil::ResourceInfo &RI = *It;
310310

311311
const auto &Binding = RI.getBinding();
@@ -856,10 +856,10 @@ class OpLowerer {
856856
} // namespace
857857

858858
PreservedAnalyses DXILOpLowering::run(Module &M, ModuleAnalysisManager &MAM) {
859-
DXILBindingMap &DBM = MAM.getResult<DXILResourceAnalysis>(M);
859+
DXILResourceMap &DRM = MAM.getResult<DXILResourceAnalysis>(M);
860860
DXILResourceTypeMap &DRTM = MAM.getResult<DXILResourceTypeAnalysis>(M);
861861

862-
bool MadeChanges = OpLowerer(M, DBM, DRTM).lowerIntrinsics();
862+
bool MadeChanges = OpLowerer(M, DRM, DRTM).lowerIntrinsics();
863863
if (!MadeChanges)
864864
return PreservedAnalyses::all();
865865
PreservedAnalyses PA;
@@ -873,21 +873,21 @@ namespace {
873873
class DXILOpLoweringLegacy : public ModulePass {
874874
public:
875875
bool runOnModule(Module &M) override {
876-
DXILBindingMap &DBM =
877-
getAnalysis<DXILResourceBindingWrapperPass>().getBindingMap();
876+
DXILResourceMap &DRM =
877+
getAnalysis<DXILResourceWrapperPass>().getBindingMap();
878878
DXILResourceTypeMap &DRTM =
879879
getAnalysis<DXILResourceTypeWrapperPass>().getResourceTypeMap();
880880

881-
return OpLowerer(M, DBM, DRTM).lowerIntrinsics();
881+
return OpLowerer(M, DRM, DRTM).lowerIntrinsics();
882882
}
883883
StringRef getPassName() const override { return "DXIL Op Lowering"; }
884884
DXILOpLoweringLegacy() : ModulePass(ID) {}
885885

886886
static char ID; // Pass identification.
887887
void getAnalysisUsage(llvm::AnalysisUsage &AU) const override {
888888
AU.addRequired<DXILResourceTypeWrapperPass>();
889-
AU.addRequired<DXILResourceBindingWrapperPass>();
890-
AU.addPreserved<DXILResourceBindingWrapperPass>();
889+
AU.addRequired<DXILResourceWrapperPass>();
890+
AU.addPreserved<DXILResourceWrapperPass>();
891891
AU.addPreserved<DXILMetadataAnalysisWrapperPass>();
892892
AU.addPreserved<ShaderFlagsAnalysisWrapper>();
893893
}
@@ -898,7 +898,7 @@ char DXILOpLoweringLegacy::ID = 0;
898898
INITIALIZE_PASS_BEGIN(DXILOpLoweringLegacy, DEBUG_TYPE, "DXIL Op Lowering",
899899
false, false)
900900
INITIALIZE_PASS_DEPENDENCY(DXILResourceTypeWrapperPass)
901-
INITIALIZE_PASS_DEPENDENCY(DXILResourceBindingWrapperPass)
901+
INITIALIZE_PASS_DEPENDENCY(DXILResourceWrapperPass)
902902
INITIALIZE_PASS_END(DXILOpLoweringLegacy, DEBUG_TYPE, "DXIL Op Lowering", false,
903903
false)
904904

‎llvm/lib/Target/DirectX/DXILPrepare.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ class DXILPrepareModule : public ModulePass {
248248
AU.addRequired<DXILMetadataAnalysisWrapperPass>();
249249
AU.addPreserved<ShaderFlagsAnalysisWrapper>();
250250
AU.addPreserved<DXILMetadataAnalysisWrapperPass>();
251-
AU.addPreserved<DXILResourceBindingWrapperPass>();
251+
AU.addPreserved<DXILResourceWrapperPass>();
252252
}
253253
static char ID; // Pass identification.
254254
};

0 commit comments

Comments
 (0)