llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-backend-directx Author: Aiden Grossman (boomanaiden154) <details> <summary>Changes</summary> Standard NewPM pass porting. --- Full diff: https://github.com/llvm/llvm-project/pull/238173.diff 7 Files Affected: - (modified) llvm/lib/Target/DirectX/DXContainerPDB.cpp (+33-12) - (modified) llvm/lib/Target/DirectX/DirectX.h (+7-2) - (modified) llvm/lib/Target/DirectX/DirectXPassRegistry.def (+1) - (modified) llvm/lib/Target/DirectX/DirectXTargetMachine.cpp (+2-2) - (modified) llvm/test/CodeGen/DirectX/ContainerData/PDBParts.ll (+1-1) - (modified) llvm/test/CodeGen/DirectX/ContainerData/PdbInPrivate-no-pdbname.ll (+2-2) - (modified) llvm/test/CodeGen/DirectX/ContainerData/PdbInPrivate.ll (+3-3) ``````````diff diff --git a/llvm/lib/Target/DirectX/DXContainerPDB.cpp b/llvm/lib/Target/DirectX/DXContainerPDB.cpp index 0af3ca8485b4d9..d06b8f0ae4d41f 100644 --- a/llvm/lib/Target/DirectX/DXContainerPDB.cpp +++ b/llvm/lib/Target/DirectX/DXContainerPDB.cpp @@ -15,8 +15,10 @@ #include "llvm/DebugInfo/MSF/MSFBuilder.h" #include "llvm/DebugInfo/PDB/Native/InfoStreamBuilder.h" #include "llvm/DebugInfo/PDB/Native/PDBFileBuilder.h" +#include "llvm/IR/Analysis.h" #include "llvm/IR/Constants.h" #include "llvm/IR/Module.h" +#include "llvm/IR/PassManager.h" #include "llvm/MC/MCDXContainerWriter.h" #include "llvm/Pass.h" #include "llvm/Support/CommandLine.h" @@ -29,7 +31,7 @@ using namespace llvm; namespace { -class DXContainerPDB : public ModulePass, MCDXContainerBaseWriter { +class DXContainerPDBImpl : MCDXContainerBaseWriter { Module *M = nullptr; SmallVector<MCDXContainerPart> Parts; @@ -38,9 +40,16 @@ class DXContainerPDB : public ModulePass, MCDXContainerBaseWriter { Parts.clear(); } +public: + bool shouldSkipSection(StringRef SectionName, size_t SectionSize) override; + ArrayRef<MCDXContainerPart> collectParts() override; + bool runOnModule(Module &M); +}; + +class DXContainerPDBLegacy : public ModulePass { public: static char ID; - DXContainerPDB() : ModulePass(ID) {} + DXContainerPDBLegacy() : ModulePass(ID) {} StringRef getPassName() const override { return "DirectX PDB Emitter"; } @@ -49,15 +58,12 @@ class DXContainerPDB : public ModulePass, MCDXContainerBaseWriter { void getAnalysisUsage(AnalysisUsage &AU) const override { AU.setPreservesAll(); } - - bool shouldSkipSection(StringRef SectionName, size_t SectionSize) override; - ArrayRef<MCDXContainerPart> collectParts() override; }; } // namespace -bool DXContainerPDB::shouldSkipSection(StringRef SectionName, - size_t SectionSize) { +bool DXContainerPDBImpl::shouldSkipSection(StringRef SectionName, + size_t SectionSize) { if (MCDXContainerBaseWriter::shouldSkipSection(SectionName, SectionSize)) return true; if (dxil::SlimDebug && SectionName == "ILDB") @@ -77,7 +83,7 @@ static StringRef getGlobalData(const GlobalVariable &GV) { return {}; } -ArrayRef<MCDXContainerPart> DXContainerPDB::collectParts() { +ArrayRef<MCDXContainerPart> DXContainerPDBImpl::collectParts() { Parts.clear(); for (const GlobalVariable &GV : M->globals()) { StringRef Name = GV.getSection(); @@ -104,7 +110,7 @@ static GlobalVariable *createPrivateDataGlobal(Module &M, StringRef Data) { return GV; } -bool DXContainerPDB::runOnModule(Module &M) { +bool DXContainerPDBImpl::runOnModule(Module &M) { llvm::scope_exit Cleanup([&]() { reset(); }); this->M = &M; @@ -200,7 +206,22 @@ bool DXContainerPDB::runOnModule(Module &M) { return true; } -char DXContainerPDB::ID = 0; -INITIALIZE_PASS(DXContainerPDB, "dxil-pdb", "DirectX PDB Emitter", false, true) +char DXContainerPDBLegacy::ID = 0; +INITIALIZE_PASS(DXContainerPDBLegacy, "dxil-container-pdb", + "DirectX PDB Emitter", false, true) + +ModulePass *llvm::createDXContainerPDBLegacyPass() { + return new DXContainerPDBLegacy(); +} + +bool DXContainerPDBLegacy::runOnModule(Module &M) { + DXContainerPDBImpl Impl; + return Impl.runOnModule(M); +} -ModulePass *llvm::createDXContainerPDBPass() { return new DXContainerPDB(); } +PreservedAnalyses DXContainerPDBPass::run(Module &M, + ModuleAnalysisManager &MAM) { + DXContainerPDBImpl Impl; + Impl.runOnModule(M); + return PreservedAnalyses::all(); +} diff --git a/llvm/lib/Target/DirectX/DirectX.h b/llvm/lib/Target/DirectX/DirectX.h index d33dd8b97a919a..5336bd7ffb7146 100644 --- a/llvm/lib/Target/DirectX/DirectX.h +++ b/llvm/lib/Target/DirectX/DirectX.h @@ -267,10 +267,15 @@ class DXContainerGlobalsPass ModulePass *createDXContainerGlobalsLegacyPass(); /// Initializer for DXContainerPDB pass. -void initializeDXContainerPDBPass(PassRegistry &); +void initializeDXContainerPDBLegacyPass(PassRegistry &); /// Pass for emitting DirectX PDB files. -ModulePass *createDXContainerPDBPass(); +class DXContainerPDBPass : public RequiredPassInfoMixin<DXContainerPDBPass> { +public: + PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM); +}; + +ModulePass *createDXContainerPDBLegacyPass(); /// Pass to finalize linkage of functions. class DXILFinalizeLinkagePass diff --git a/llvm/lib/Target/DirectX/DirectXPassRegistry.def b/llvm/lib/Target/DirectX/DirectXPassRegistry.def index 3da41c3dc7dda8..663e044f314ec0 100644 --- a/llvm/lib/Target/DirectX/DirectXPassRegistry.def +++ b/llvm/lib/Target/DirectX/DirectXPassRegistry.def @@ -25,6 +25,7 @@ MODULE_ANALYSIS("dxil-signature-analysis", dxil::SignatureAnalysis()) #define MODULE_PASS(NAME, CREATE_PASS) #endif MODULE_PASS("dx-container-globals", DXContainerGlobalsPass()) +MODULE_PASS("dx-container-pdb", DXContainerPDBPass()) MODULE_PASS("dxil-cbuffer-access", DXILCBufferAccessPass()) MODULE_PASS("dxil-finalize-linkage", DXILFinalizeLinkagePass()) MODULE_PASS("dxil-data-scalarization", DXILDataScalarizationPass()) diff --git a/llvm/lib/Target/DirectX/DirectXTargetMachine.cpp b/llvm/lib/Target/DirectX/DirectXTargetMachine.cpp index 6fa23113d1393d..ce2f65401305c4 100644 --- a/llvm/lib/Target/DirectX/DirectXTargetMachine.cpp +++ b/llvm/lib/Target/DirectX/DirectXTargetMachine.cpp @@ -59,7 +59,7 @@ LLVMInitializeDirectXTarget() { initializeEmbedDXILPassPass(*PR); initializeWriteDXILPassPass(*PR); initializeDXContainerGlobalsLegacyPass(*PR); - initializeDXContainerPDBPass(*PR); + initializeDXContainerPDBLegacyPass(*PR); initializeGlobalDCELegacyPassPass(*PR); initializeDXILOpLoweringLegacyPass(*PR); initializeDXILRemoveUnusedResourcesLegacyPass(*PR); @@ -183,7 +183,7 @@ bool DirectXTargetMachine::addPassesToEmitFile( // We embed the other DXContainer globals after embedding DXIL so that the // globals don't pollute the DXIL. PM.add(createDXContainerGlobalsLegacyPass()); - PM.add(createDXContainerPDBPass()); + PM.add(createDXContainerPDBLegacyPass()); if (addAsmPrinter(PM, Out, DwoOut, FileType, MMIWP->getMMI().getContext())) diff --git a/llvm/test/CodeGen/DirectX/ContainerData/PDBParts.ll b/llvm/test/CodeGen/DirectX/ContainerData/PDBParts.ll index e7480d8f33f5b8..f5379b50fc8f1c 100644 --- a/llvm/test/CodeGen/DirectX/ContainerData/PDBParts.ll +++ b/llvm/test/CodeGen/DirectX/ContainerData/PDBParts.ll @@ -1,4 +1,4 @@ -; RUN: opt %s -dxil-pdb -o /dev/null +; RUN: opt %s -dxil-container-pdb -o /dev/null ; RUN: llvm-pdbutil pdb2yaml --dxcontainer PDBPartsTest.pdb | FileCheck %s ; Check that PDB file contains only debug-info relevant parts. diff --git a/llvm/test/CodeGen/DirectX/ContainerData/PdbInPrivate-no-pdbname.ll b/llvm/test/CodeGen/DirectX/ContainerData/PdbInPrivate-no-pdbname.ll index f07d19416b2671..56bac357a3528b 100644 --- a/llvm/test/CodeGen/DirectX/ContainerData/PdbInPrivate-no-pdbname.ll +++ b/llvm/test/CodeGen/DirectX/ContainerData/PdbInPrivate-no-pdbname.ll @@ -1,5 +1,5 @@ -;; Check that dxil-pdb can emit PRIV using a temporary PDB when PDBNAME is absent. -; RUN: opt %s -dxil-pdb --dx-pdb-in-private -S -o - | FileCheck %s +;; Check that dxil-container-pdb can emit PRIV using a temporary PDB when PDBNAME is absent. +; RUN: opt %s -dxil-container-pdb --dx-pdb-in-private -S -o - | FileCheck %s ;; CHECK: @dx.priv = private constant {{.*}} section "PRIV" diff --git a/llvm/test/CodeGen/DirectX/ContainerData/PdbInPrivate.ll b/llvm/test/CodeGen/DirectX/ContainerData/PdbInPrivate.ll index 7edc3fd8918d1c..cc71c335d891f4 100644 --- a/llvm/test/CodeGen/DirectX/ContainerData/PdbInPrivate.ll +++ b/llvm/test/CodeGen/DirectX/ContainerData/PdbInPrivate.ll @@ -1,8 +1,8 @@ -; RUN: opt %s -dxil-pdb --dx-pdb-in-private -S -o - | FileCheck %s --check-prefix=CHECK-IR -; RUN: opt %s -dxil-pdb --dx-pdb-in-private -o /dev/null +; RUN: opt %s -dxil-container-pdb --dx-pdb-in-private -S -o - | FileCheck %s --check-prefix=CHECK-IR +; RUN: opt %s -dxil-container-pdb --dx-pdb-in-private -o /dev/null ; RUN: llvm-pdbutil pdb2yaml --dxcontainer PdbInPrivateTest.pdb | FileCheck %s --check-prefix=CHECK-PDB -;; Check that dxil-pdb pass emits a PRIV global when --dx-pdb-in-private is set. +;; Check that dxil-container-pdb pass emits a PRIV global when --dx-pdb-in-private is set. ; CHECK-IR: @dx.priv = private constant {{.*}} section "PRIV" ; Check that the companion PDB file is still written when PDBNAME is present. `````````` </details> https://github.com/llvm/llvm-project/pull/238173 _______________________________________________ llvm-branch-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
