[llvm-branch-commits] [Mips] Port AsmPrinter to NewPM (PR #237470)
via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Fri Oct 30 20:34:49 PDT 2026
llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-backend-mips
Author: Aiden Grossman (boomanaiden154)
<details>
<summary>Changes</summary>
Standard NewPM pass porting.
---
Full diff: https://github.com/llvm/llvm-project/pull/237470.diff
5 Files Affected:
- (modified) llvm/lib/Target/Mips/MipsAsmPrinter.cpp (+31)
- (modified) llvm/lib/Target/Mips/MipsAsmPrinter.h (+18)
- (modified) llvm/lib/Target/Mips/MipsCodeGenPassBuilder.cpp (+4-3)
- (modified) llvm/lib/Target/Mips/MipsPassRegistry.def (+3)
- (modified) llvm/test/CodeGen/Mips/newpm-pipeline.ll (+9)
``````````diff
diff --git a/llvm/lib/Target/Mips/MipsAsmPrinter.cpp b/llvm/lib/Target/Mips/MipsAsmPrinter.cpp
index 287c75912eef3..05653d8319073 100644
--- a/llvm/lib/Target/Mips/MipsAsmPrinter.cpp
+++ b/llvm/lib/Target/Mips/MipsAsmPrinter.cpp
@@ -28,6 +28,7 @@
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/Twine.h"
#include "llvm/BinaryFormat/ELF.h"
+#include "llvm/CodeGen/AsmPrinterAnalysis.h"
#include "llvm/CodeGen/MachineBasicBlock.h"
#include "llvm/CodeGen/MachineConstantPool.h"
#include "llvm/CodeGen/MachineFrameInfo.h"
@@ -1257,3 +1258,33 @@ LLVMInitializeMipsAsmPrinter() {
RegisterAsmPrinter<MipsAsmPrinter> A(getTheMips64Target());
RegisterAsmPrinter<MipsAsmPrinter> B(getTheMips64elTarget());
}
+
+PreservedAnalyses MipsAsmPrinterBeginPass::run(Module &M,
+ ModuleAnalysisManager &MAM) {
+ MipsAsmPrinter &AsmPrinter = static_cast<MipsAsmPrinter &>(
+ MAM.getResult<AsmPrinterAnalysis>(M).getPrinter());
+ setupModuleAsmPrinter(M, MAM, AsmPrinter);
+ AsmPrinter.doInitialization(M);
+ return PreservedAnalyses::all();
+}
+
+PreservedAnalyses
+MipsAsmPrinterPass::run(MachineFunction &MF,
+ MachineFunctionAnalysisManager &MFAM) {
+ MipsAsmPrinter &AsmPrinter = static_cast<MipsAsmPrinter &>(
+ MFAM.getResult<ModuleAnalysisManagerMachineFunctionProxy>(MF)
+ .getCachedResult<AsmPrinterAnalysis>(*MF.getFunction().getParent())
+ ->getPrinter());
+ setupMachineFunctionAsmPrinter(MFAM, MF, AsmPrinter);
+ AsmPrinter.runOnMachineFunction(MF);
+ return PreservedAnalyses::all();
+}
+
+PreservedAnalyses MipsAsmPrinterEndPass::run(Module &M,
+ ModuleAnalysisManager &MAM) {
+ MipsAsmPrinter &AsmPrinter = static_cast<MipsAsmPrinter &>(
+ MAM.getResult<AsmPrinterAnalysis>(M).getPrinter());
+ setupModuleAsmPrinter(M, MAM, AsmPrinter);
+ AsmPrinter.doFinalization(M);
+ return PreservedAnalyses::all();
+}
diff --git a/llvm/lib/Target/Mips/MipsAsmPrinter.h b/llvm/lib/Target/Mips/MipsAsmPrinter.h
index 0f6253a053581..61a9f214bf71a 100644
--- a/llvm/lib/Target/Mips/MipsAsmPrinter.h
+++ b/llvm/lib/Target/Mips/MipsAsmPrinter.h
@@ -159,6 +159,24 @@ class LLVM_LIBRARY_VISIBILITY MipsAsmPrinter : public AsmPrinter {
const MipsSubtarget &Subtarget);
};
+class MipsAsmPrinterBeginPass
+ : public RequiredPassInfoMixin<MipsAsmPrinterBeginPass> {
+public:
+ PreservedAnalyses run(Module &M, ModuleAnalysisManager &MFAM);
+};
+
+class MipsAsmPrinterPass : public RequiredPassInfoMixin<MipsAsmPrinterPass> {
+public:
+ PreservedAnalyses run(MachineFunction &MF,
+ MachineFunctionAnalysisManager &MFAM);
+};
+
+class MipsAsmPrinterEndPass
+ : public RequiredPassInfoMixin<MipsAsmPrinterEndPass> {
+public:
+ PreservedAnalyses run(Module &M, ModuleAnalysisManager &MFAM);
+};
+
} // end namespace llvm
#endif // LLVM_LIB_TARGET_MIPS_MIPSASMPRINTER_H
diff --git a/llvm/lib/Target/Mips/MipsCodeGenPassBuilder.cpp b/llvm/lib/Target/Mips/MipsCodeGenPassBuilder.cpp
index 0ed8bddceebde..315ec2775874d 100644
--- a/llvm/lib/Target/Mips/MipsCodeGenPassBuilder.cpp
+++ b/llvm/lib/Target/Mips/MipsCodeGenPassBuilder.cpp
@@ -7,6 +7,7 @@
//===----------------------------------------------------------------------===//
#include "Mips.h"
+#include "MipsAsmPrinter.h"
#include "MipsTargetMachine.h"
#include "llvm/CodeGen/AtomicExpand.h"
#include "llvm/Passes/CodeGenPassBuilder.h"
@@ -91,15 +92,15 @@ void MipsCodeGenPassBuilder::addPreEmitPass(PassManagerWrapper &PMW) {
}
void MipsCodeGenPassBuilder::addAsmPrinterBegin(PassManagerWrapper &PMW) {
- // TODO(boomanaiden154): Add MipsAsmPrinterBeginPass
+ addModulePass(MipsAsmPrinterBeginPass(), PMW, /*Force=*/true);
}
void MipsCodeGenPassBuilder::addAsmPrinter(PassManagerWrapper &PMW) {
- // TODO(boomanaiden154): Add MipsAsmPrinterPass
+ addMachineFunctionPass(MipsAsmPrinterPass(), PMW);
}
void MipsCodeGenPassBuilder::addAsmPrinterEnd(PassManagerWrapper &PMW) {
- // TODO(boomanaiden154): Add MipsAsmPrinterEndPass
+ addModulePass(MipsAsmPrinterEndPass(), PMW, /*Force=*/true);
}
void MipsTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB){
diff --git a/llvm/lib/Target/Mips/MipsPassRegistry.def b/llvm/lib/Target/Mips/MipsPassRegistry.def
index 80549c1bae817..760d5e049c13c 100644
--- a/llvm/lib/Target/Mips/MipsPassRegistry.def
+++ b/llvm/lib/Target/Mips/MipsPassRegistry.def
@@ -17,6 +17,8 @@
#define MODULE_PASS(NAME, CREATE_PASS)
#endif
MODULE_PASS("mips-16-hard-float", Mips16HardFloatPass(*this))
+MODULE_PASS("mips-asm-printer-begin", MipsAsmPrinterBeginPass())
+MODULE_PASS("mips-asm-printer-end", MipsAsmPrinterEndPass())
MODULE_PASS("mips-os16", MipsOs16Pass())
#undef MODULE_PASS
@@ -24,6 +26,7 @@ MODULE_PASS("mips-os16", MipsOs16Pass())
#define MACHINE_FUNCTION_PASS(NAME, CREATE_PASS)
#endif
MACHINE_FUNCTION_PASS("mips-16-isel", Mips16ISelDAGPass(*this, getOptLevel()))
+MACHINE_FUNCTION_PASS("mips-asm-printer", MipsAsmPrinterPass())
MACHINE_FUNCTION_PASS("mips-branch-expansion", MipsBranchExpansionPass())
MACHINE_FUNCTION_PASS("mips-constant-islands", MipsConstantIslandPass())
MACHINE_FUNCTION_PASS("mips-delay-slot-filler", MipsDelaySlotFillerPass())
diff --git a/llvm/test/CodeGen/Mips/newpm-pipeline.ll b/llvm/test/CodeGen/Mips/newpm-pipeline.ll
index e08e0f2c96643..c29f670377cad 100644
--- a/llvm/test/CodeGen/Mips/newpm-pipeline.ll
+++ b/llvm/test/CodeGen/Mips/newpm-pipeline.ll
@@ -39,6 +39,7 @@
; MIPS-NEXT: safe-stack
; MIPS-NEXT: stack-protector
; MIPS-NEXT: verify
+; MIPS-NEXT: mips-asm-printer-begin
; MIPS-NEXT: function
; MIPS-NEXT: machine-function
; MIPS-NEXT: mips-16-isel
@@ -98,7 +99,9 @@
; MIPS-NEXT: machine-sanmd
; MIPS-NEXT: stack-frame-layout
; MIPS-NEXT: verify
+; MIPS-NEXT: mips-asm-printer
; MIPS-NEXT: free-machine-function
+; MIPS-NEXT: mips-asm-printer-end
; MIPS-OS16: require<MachineModuleAnalysis>
; MIPS-OS16-NEXT: require<profile-summary>
@@ -135,6 +138,7 @@
; MIPS-OS16-NEXT: safe-stack
; MIPS-OS16-NEXT: stack-protector
; MIPS-OS16-NEXT: verify
+; MIPS-OS16-NEXT: mips-asm-printer-begin
; MIPS-OS16-NEXT: function
; MIPS-OS16-NEXT: machine-function
; MIPS-OS16-NEXT: mips-16-isel
@@ -194,7 +198,9 @@
; MIPS-OS16-NEXT: machine-sanmd
; MIPS-OS16-NEXT: stack-frame-layout
; MIPS-OS16-NEXT: verify
+; MIPS-OS16-NEXT: mips-asm-printer
; MIPS-OS16-NEXT: free-machine-function
+; MIPS-OS16-NEXT: mips-asm-printer-end
; MIPS-MFIX4300: require<MachineModuleAnalysis>
; MIPS-MFIX4300-NEXT: require<profile-summary>
@@ -230,6 +236,7 @@
; MIPS-MFIX4300-NEXT: safe-stack
; MIPS-MFIX4300-NEXT: stack-protector
; MIPS-MFIX4300-NEXT: verify
+; MIPS-MFIX4300-NEXT: mips-asm-printer-begin
; MIPS-MFIX4300-NEXT: function
; MIPS-MFIX4300-NEXT: machine-function
; MIPS-MFIX4300-NEXT: mips-16-isel
@@ -290,4 +297,6 @@
; MIPS-MFIX4300-NEXT: machine-sanmd
; MIPS-MFIX4300-NEXT: stack-frame-layout
; MIPS-MFIX4300-NEXT: verify
+; MIPS-MFIX4300-NEXT: mips-asm-printer
; MIPS-MFIX4300-NEXT: free-machine-function
+; MIPS-MFIX4300-NEXT: mips-asm-printer-end
``````````
</details>
https://github.com/llvm/llvm-project/pull/237470
More information about the llvm-branch-commits
mailing list