[llvm-branch-commits] [Mips] Port Os16 to NewPM (PR #237075)

via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Thu Oct 29 21:06:31 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. Also note we preserve the CFG in the
LegacyPM.


---
Full diff: https://github.com/llvm/llvm-project/pull/237075.diff


6 Files Affected:

- (modified) llvm/lib/Target/Mips/Mips.h (+9-1) 
- (modified) llvm/lib/Target/Mips/MipsCodeGenPassBuilder.cpp (+2-1) 
- (modified) llvm/lib/Target/Mips/MipsOs16.cpp (+26-12) 
- (modified) llvm/lib/Target/Mips/MipsPassRegistry.def (+6) 
- (modified) llvm/lib/Target/Mips/MipsTargetMachine.cpp (+1-1) 
- (modified) llvm/test/CodeGen/Mips/newpm-pipeline.ll (+2) 


``````````diff
diff --git a/llvm/lib/Target/Mips/Mips.h b/llvm/lib/Target/Mips/Mips.h
index f8a2ac0557a5b..6826ac4492956 100644
--- a/llvm/lib/Target/Mips/Mips.h
+++ b/llvm/lib/Target/Mips/Mips.h
@@ -16,6 +16,8 @@
 
 #include "MCTargetDesc/MipsMCTargetDesc.h"
 #include "llvm/CodeGen/SelectionDAGISel.h"
+#include "llvm/IR/Analysis.h"
+#include "llvm/IR/PassManager.h"
 #include "llvm/Support/CodeGen.h"
 #include "llvm/Target/TargetMachine.h"
 
@@ -54,7 +56,13 @@ class Mips16ISelDAGPass : public SelectionDAGISelPass {
 
 FunctionPass *createMips16ISelDAGLegacyPass(MipsTargetMachine &TM,
                                             CodeGenOptLevel OptLevel);
-ModulePass *createMipsOs16Pass();
+
+class MipsOs16Pass : public RequiredPassInfoMixin<MipsOs16Pass> {
+public:
+  PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM);
+};
+
+ModulePass *createMipsOs16LegacyPass();
 ModulePass *createMips16HardFloatPass();
 
 class MipsSEISelDAGPass : public SelectionDAGISelPass {
diff --git a/llvm/lib/Target/Mips/MipsCodeGenPassBuilder.cpp b/llvm/lib/Target/Mips/MipsCodeGenPassBuilder.cpp
index 2dde1a8bf0c25..b0b8e29a8d57d 100644
--- a/llvm/lib/Target/Mips/MipsCodeGenPassBuilder.cpp
+++ b/llvm/lib/Target/Mips/MipsCodeGenPassBuilder.cpp
@@ -44,7 +44,8 @@ void MipsCodeGenPassBuilder::addIRPasses(PassManagerWrapper &PMW) {
   Base::addIRPasses(PMW);
   addFunctionPass(AtomicExpandPass(getTM()), PMW);
   if (getTM().getCLOpts().os16) {
-    // TODO(boomanaiden154): Add MipsOps16Pass
+    flushFPMsToMPM(PMW);
+    addModulePass(MipsOs16Pass(), PMW);
   }
   // TODO(boomanaiden154): Add Mips16HardFloatPass
 }
diff --git a/llvm/lib/Target/Mips/MipsOs16.cpp b/llvm/lib/Target/Mips/MipsOs16.cpp
index 147f4393f2464..a7cae59ce212a 100644
--- a/llvm/lib/Target/Mips/MipsOs16.cpp
+++ b/llvm/lib/Target/Mips/MipsOs16.cpp
@@ -12,8 +12,10 @@
 
 #include "Mips.h"
 #include "MipsSubtarget.h"
+#include "llvm/IR/Analysis.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/Module.h"
+#include "llvm/IR/PassManager.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
@@ -23,19 +25,24 @@ using namespace llvm;
 #define DEBUG_TYPE "mips-os16"
 
 namespace {
-  class MipsOs16 : public ModulePass {
-  public:
-    static char ID;
+class MipsOs16Legacy : public ModulePass {
+public:
+  static char ID;
 
-    MipsOs16() : ModulePass(ID) {}
+  MipsOs16Legacy() : ModulePass(ID) {}
 
-    StringRef getPassName() const override { return "MIPS Os16 Optimization"; }
+  StringRef getPassName() const override { return "MIPS Os16 Optimization"; }
 
-    bool runOnModule(Module &M) override;
-  };
+  bool runOnModule(Module &M) override;
 
-  char MipsOs16::ID = 0;
-}
+  void getAnalysisUsage(AnalysisUsage &AU) const override {
+    AU.setPreservesCFG();
+    ModulePass::getAnalysisUsage(AU);
+  }
+};
+
+char MipsOs16Legacy::ID = 0;
+} // namespace
 
 // Figure out if we need float point based on the function signature.
 // We need to move variables in and/or out of floating point
@@ -100,8 +107,7 @@ static bool needsFP(Function &F) {
   return false;
 }
 
-
-bool MipsOs16::runOnModule(Module &M) {
+static bool runOs16OnModule(Module &M) {
   const MipsOptions &Opts =
       M.getContext().getLibraryOptions().get<MipsOptions>();
   StringRef Mips32FunctionMask = Opts.mips32_function_mask;
@@ -154,4 +160,12 @@ bool MipsOs16::runOnModule(Module &M) {
   return modified;
 }
 
-ModulePass *llvm::createMipsOs16Pass() { return new MipsOs16(); }
+ModulePass *llvm::createMipsOs16LegacyPass() { return new MipsOs16Legacy(); }
+
+bool MipsOs16Legacy::runOnModule(Module &M) { return runOs16OnModule(M); }
+
+PreservedAnalyses MipsOs16Pass::run(Module &M, ModuleAnalysisManager &MAM) {
+  return runOs16OnModule(M)
+             ? PreservedAnalyses::none().preserveSet<CFGAnalyses>()
+             : PreservedAnalyses::all();
+}
diff --git a/llvm/lib/Target/Mips/MipsPassRegistry.def b/llvm/lib/Target/Mips/MipsPassRegistry.def
index c24da79f85c51..c6ab2779b12f7 100644
--- a/llvm/lib/Target/Mips/MipsPassRegistry.def
+++ b/llvm/lib/Target/Mips/MipsPassRegistry.def
@@ -13,6 +13,12 @@
 
 // NOTE: NO INCLUDE GUARD DESIRED!
 
+#ifndef MODULE_PASS
+#define MODULE_PASS(NAME, CREATE_PASS)
+#endif
+MODULE_PASS("mips-os16", MipsOs16Pass())
+#undef MODULE_PASS
+
 #ifndef MACHINE_FUNCTION_PASS
 #define MACHINE_FUNCTION_PASS(NAME, CREATE_PASS)
 #endif
diff --git a/llvm/lib/Target/Mips/MipsTargetMachine.cpp b/llvm/lib/Target/Mips/MipsTargetMachine.cpp
index 61b059d5a2423..7fe6d31262aef 100644
--- a/llvm/lib/Target/Mips/MipsTargetMachine.cpp
+++ b/llvm/lib/Target/Mips/MipsTargetMachine.cpp
@@ -217,7 +217,7 @@ void MipsPassConfig::addIRPasses() {
   TargetPassConfig::addIRPasses();
   addPass(createAtomicExpandLegacyPass());
   if (getMipsTargetMachine().getCLOpts().os16)
-    addPass(createMipsOs16Pass());
+    addPass(createMipsOs16LegacyPass());
   addPass(createMips16HardFloatPass());
 }
 // Install an instruction selector pass using
diff --git a/llvm/test/CodeGen/Mips/newpm-pipeline.ll b/llvm/test/CodeGen/Mips/newpm-pipeline.ll
index c48f4ee74c569..f91eaea837b1d 100644
--- a/llvm/test/CodeGen/Mips/newpm-pipeline.ll
+++ b/llvm/test/CodeGen/Mips/newpm-pipeline.ll
@@ -117,6 +117,8 @@
 ; MIPS-OS16-NEXT:   scalarize-masked-mem-intrin
 ; MIPS-OS16-NEXT:   expand-reductions
 ; MIPS-OS16-NEXT:   atomic-expand
+; MIPS-OS16-NEXT: mips-os16
+; MIPS-OS16-NEXT: function
 ; MIPS-OS16-NEXT:   codegenprepare
 ; MIPS-OS16-NEXT:   sjlj-eh-prepare
 ; MIPS-OS16-NEXT:   dwarf-eh-prepare

``````````

</details>


https://github.com/llvm/llvm-project/pull/237075


More information about the llvm-branch-commits mailing list