llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-backend-sparc Author: Aiden Grossman (boomanaiden154) <details> <summary>Changes</summary> Standard NewPM pass porting. --- Full diff: https://github.com/llvm/llvm-project/pull/237669.diff 5 Files Affected: - (modified) llvm/lib/Target/Sparc/SparcAsmPrinter.cpp (+32) - (added) llvm/lib/Target/Sparc/SparcAsmPrinter.h (+39) - (modified) llvm/lib/Target/Sparc/SparcCodeGenPassBuilder.cpp (+4-3) - (modified) llvm/lib/Target/Sparc/SparcPassRegistry.def (+8) - (modified) llvm/test/CodeGen/SPARC/newpm-pipeline.ll (+3) ``````````diff diff --git a/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp b/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp index 2979d78c57d63..d8300be254dcc 100644 --- a/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp +++ b/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp @@ -11,6 +11,7 @@ // //===----------------------------------------------------------------------===// +#include "SparcAsmPrinter.h" #include "MCTargetDesc/SparcInstPrinter.h" #include "MCTargetDesc/SparcMCAsmInfo.h" #include "MCTargetDesc/SparcMCTargetDesc.h" @@ -21,6 +22,7 @@ #include "TargetInfo/SparcTargetInfo.h" #include "llvm/BinaryFormat/ELF.h" #include "llvm/CodeGen/AsmPrinter.h" +#include "llvm/CodeGen/AsmPrinterAnalysis.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/CodeGen/MachineModuleInfoImpls.h" #include "llvm/CodeGen/MachineRegisterInfo.h" @@ -537,3 +539,33 @@ LLVMInitializeSparcAsmPrinter() { RegisterAsmPrinter<SparcAsmPrinter> Y(getTheSparcV9Target()); RegisterAsmPrinter<SparcAsmPrinter> Z(getTheSparcelTarget()); } + +PreservedAnalyses SparcAsmPrinterBeginPass::run(Module &M, + ModuleAnalysisManager &MAM) { + SparcAsmPrinter &AsmPrinter = static_cast<SparcAsmPrinter &>( + MAM.getResult<AsmPrinterAnalysis>(M).getPrinter()); + setupModuleAsmPrinter(M, MAM, AsmPrinter); + AsmPrinter.doInitialization(M); + return PreservedAnalyses::all(); +} + +PreservedAnalyses +SparcAsmPrinterPass::run(MachineFunction &MF, + MachineFunctionAnalysisManager &MFAM) { + SparcAsmPrinter &AsmPrinter = static_cast<SparcAsmPrinter &>( + MFAM.getResult<ModuleAnalysisManagerMachineFunctionProxy>(MF) + .getCachedResult<AsmPrinterAnalysis>(*MF.getFunction().getParent()) + ->getPrinter()); + setupMachineFunctionAsmPrinter(MFAM, MF, AsmPrinter); + AsmPrinter.runOnMachineFunction(MF); + return PreservedAnalyses::all(); +} + +PreservedAnalyses SparcAsmPrinterEndPass::run(Module &M, + ModuleAnalysisManager &MAM) { + SparcAsmPrinter &AsmPrinter = static_cast<SparcAsmPrinter &>( + MAM.getResult<AsmPrinterAnalysis>(M).getPrinter()); + setupModuleAsmPrinter(M, MAM, AsmPrinter); + AsmPrinter.doFinalization(M); + return PreservedAnalyses::all(); +} diff --git a/llvm/lib/Target/Sparc/SparcAsmPrinter.h b/llvm/lib/Target/Sparc/SparcAsmPrinter.h new file mode 100644 index 0000000000000..2369ae6b16ba3 --- /dev/null +++ b/llvm/lib/Target/Sparc/SparcAsmPrinter.h @@ -0,0 +1,39 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_LIB_TARGET_SPARC_SPARCASMPRINTER_H +#define LLVM_LIB_TARGET_SPARC_SPARCASMPRINTER_H + +#include "llvm/CodeGen/MachineFunctionAnalysisManager.h" +#include "llvm/IR/Analysis.h" +#include "llvm/IR/Module.h" +#include "llvm/IR/PassManager.h" + +namespace llvm { + +class SparcAsmPrinterBeginPass + : public RequiredPassInfoMixin<SparcAsmPrinterBeginPass> { +public: + PreservedAnalyses run(Module &M, ModuleAnalysisManager &MFAM); +}; + +class SparcAsmPrinterPass : public RequiredPassInfoMixin<SparcAsmPrinterPass> { +public: + PreservedAnalyses run(MachineFunction &MF, + MachineFunctionAnalysisManager &MFAM); +}; + +class SparcAsmPrinterEndPass + : public RequiredPassInfoMixin<SparcAsmPrinterEndPass> { +public: + PreservedAnalyses run(Module &M, ModuleAnalysisManager &MFAM); +}; + +} // namespace llvm + +#endif // LLVM_LIB_TARGET_SPARC_SPARCASMPRINTER_H diff --git a/llvm/lib/Target/Sparc/SparcCodeGenPassBuilder.cpp b/llvm/lib/Target/Sparc/SparcCodeGenPassBuilder.cpp index 5e7d4e1d7f546..4026d18a5bd0b 100644 --- a/llvm/lib/Target/Sparc/SparcCodeGenPassBuilder.cpp +++ b/llvm/lib/Target/Sparc/SparcCodeGenPassBuilder.cpp @@ -7,6 +7,7 @@ //===----------------------------------------------------------------------===// #include "Sparc.h" +#include "SparcAsmPrinter.h" #include "SparcTargetMachine.h" #include "llvm/CodeGen/AtomicExpand.h" #include "llvm/CodeGen/BranchRelaxation.h" @@ -63,15 +64,15 @@ void SparcCodeGenPassBuilder::addPreEmitPass(PassManagerWrapper &PMW) { } void SparcCodeGenPassBuilder::addAsmPrinterBegin(PassManagerWrapper &PMW) { - // TODO(boomanaiden154): Add SparcAsmPrinterBegin + addModulePass(SparcAsmPrinterBeginPass(), PMW, /*Force=*/true); } void SparcCodeGenPassBuilder::addAsmPrinter(PassManagerWrapper &PMW) { - // TODO(boomanaiden154): Add SparcAsmPrinter + addMachineFunctionPass(SparcAsmPrinterPass(), PMW, /*Force=*/true); } void SparcCodeGenPassBuilder::addAsmPrinterEnd(PassManagerWrapper &PMW) { - // TODO(boomanaiden154): Add SparcAsmPrinterEnd + addModulePass(SparcAsmPrinterEndPass(), PMW, /*Force=*/true); } } // namespace diff --git a/llvm/lib/Target/Sparc/SparcPassRegistry.def b/llvm/lib/Target/Sparc/SparcPassRegistry.def index e41655864c6e5..08804737c8ccb 100644 --- a/llvm/lib/Target/Sparc/SparcPassRegistry.def +++ b/llvm/lib/Target/Sparc/SparcPassRegistry.def @@ -13,9 +13,17 @@ // NOTE: NO INCLUDE GUARD DESIRED! +#ifndef MODULE_PASS +#define MODULE_PASS(NAME, CREATE_PASS) +#endif +MODULE_PASS("sparc-asm-printer-begin", SparcAsmPrinterBeginPass()) +MODULE_PASS("sparc-asm-printer-end", SparcAsmPrinterEndPass()) +#undef MODULE_PASS + #ifndef MACHINE_FUNCTION_PASS #define MACHINE_FUNCTION_PASS(NAME, CREATE_PASS) #endif +MACHINE_FUNCTION_PASS("sparc-asm-printer", SparcAsmPrinterPass()) MACHINE_FUNCTION_PASS("sparc-delay-slot-filler", SparcDelaySlotFillerPass()) MACHINE_FUNCTION_PASS("sparc-detect-round-change", SparcDetectRoundChangePass()) MACHINE_FUNCTION_PASS("sparc-errata-workaround", SparcErrataWorkaroundPass()) diff --git a/llvm/test/CodeGen/SPARC/newpm-pipeline.ll b/llvm/test/CodeGen/SPARC/newpm-pipeline.ll index e8f316d066bdb..b5fba8a5f829c 100644 --- a/llvm/test/CodeGen/SPARC/newpm-pipeline.ll +++ b/llvm/test/CodeGen/SPARC/newpm-pipeline.ll @@ -35,6 +35,7 @@ ; SPARC-NEXT: safe-stack ; SPARC-NEXT: stack-protector ; SPARC-NEXT: verify +; SPARC-NEXT: sparc-asm-printer-begin ; SPARC-NEXT: function ; SPARC-NEXT: machine-function ; SPARC-NEXT: sparc-isel @@ -93,4 +94,6 @@ ; SPARC-NEXT: machine-sanmd ; SPARC-NEXT: stack-frame-layout ; SPARC-NEXT: verify +; SPARC-NEXT: sparc-asm-printer ; SPARC-NEXT: free-machine-function +; SPARC-NEXT: sparc-asm-printer-end `````````` </details> https://github.com/llvm/llvm-project/pull/237669 _______________________________________________ llvm-branch-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
