[llvm-branch-commits] [Mips] Port MulMulBugFixPass to NewPM (PR #237140)

via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Fri Oct 30 01:19:43 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/237140.diff


6 Files Affected:

- (modified) llvm/lib/Target/Mips/Mips.h (+10-2) 
- (modified) llvm/lib/Target/Mips/MipsCodeGenPassBuilder.cpp (+2-3) 
- (modified) llvm/lib/Target/Mips/MipsMulMulBugPass.cpp (+42-23) 
- (modified) llvm/lib/Target/Mips/MipsPassRegistry.def (+1) 
- (modified) llvm/lib/Target/Mips/MipsTargetMachine.cpp (+2-2) 
- (modified) llvm/test/CodeGen/Mips/newpm-pipeline.ll (+1) 


``````````diff
diff --git a/llvm/lib/Target/Mips/Mips.h b/llvm/lib/Target/Mips/Mips.h
index 939e97a6dad35..d0febd6220fa4 100644
--- a/llvm/lib/Target/Mips/Mips.h
+++ b/llvm/lib/Target/Mips/Mips.h
@@ -122,7 +122,15 @@ class MipsExpandPseudoPass
 FunctionPass *createMipsExpandPseudoLegacyPass();
 FunctionPass *createMipsPreLegalizeCombiner();
 FunctionPass *createMipsPostLegalizeCombiner(bool IsOptNone);
-FunctionPass *createMipsMulMulBugPass();
+
+class MipsMulMulBugFixPass
+    : public RequiredPassInfoMixin<MipsMulMulBugFixPass> {
+public:
+  PreservedAnalyses run(MachineFunction &MF,
+                        MachineFunctionAnalysisManager &MFAM);
+};
+
+FunctionPass *createMipsMulMulBugFixLegacyPass();
 
 InstructionSelector *
 createMipsInstructionSelector(const MipsTargetMachine &, const MipsSubtarget &,
@@ -133,7 +141,7 @@ void initializeMipsAsmPrinterPass(PassRegistry &);
 void initializeMipsBranchExpansionPass(PassRegistry &);
 void initializeMipsDAGToDAGISelLegacyPass(PassRegistry &);
 void initializeMipsDelaySlotFillerPass(PassRegistry &);
-void initializeMipsMulMulBugFixPass(PassRegistry &);
+void initializeMipsMulMulBugFixLegacyPass(PassRegistry &);
 void initializeMipsPostLegalizerCombinerPass(PassRegistry &);
 void initializeMipsPreLegalizerCombinerPass(PassRegistry &);
 } // namespace llvm
diff --git a/llvm/lib/Target/Mips/MipsCodeGenPassBuilder.cpp b/llvm/lib/Target/Mips/MipsCodeGenPassBuilder.cpp
index 1962b782dcf4e..a0ad8ecf5be50 100644
--- a/llvm/lib/Target/Mips/MipsCodeGenPassBuilder.cpp
+++ b/llvm/lib/Target/Mips/MipsCodeGenPassBuilder.cpp
@@ -70,9 +70,8 @@ void MipsCodeGenPassBuilder::addPreEmitPass(PassManagerWrapper &PMW) {
 
   // This pass inserts a nop instruction between two back-to-back multiplication
   // instructions when the "mfix4300" flag is passed.
-  if (getTM().getCLOpts().mfix4300) {
-    // TODO(boomanaiden154): Add MipsMulMulBugPass
-  }
+  if (getTM().getCLOpts().mfix4300)
+    addMachineFunctionPass(MipsMulMulBugFixPass(), PMW);
 
   // The delay slot filler pass can potientially create forbidden slot hazards
   // for MIPSR6 and therefore it should go before MipsBranchExpansion pass.
diff --git a/llvm/lib/Target/Mips/MipsMulMulBugPass.cpp b/llvm/lib/Target/Mips/MipsMulMulBugPass.cpp
index 8ca6d07def596..0556b9fe3bbb8 100644
--- a/llvm/lib/Target/Mips/MipsMulMulBugPass.cpp
+++ b/llvm/lib/Target/Mips/MipsMulMulBugPass.cpp
@@ -23,19 +23,23 @@
 #include "MipsSubtarget.h"
 #include "llvm/CodeGen/MachineBasicBlock.h"
 #include "llvm/CodeGen/MachineFunction.h"
+#include "llvm/CodeGen/MachineFunctionAnalysisManager.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
+#include "llvm/CodeGen/MachinePassManager.h"
+#include "llvm/IR/Analysis.h"
+#include "llvm/Pass.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Target/TargetMachine.h"
 
-#define DEBUG_TYPE "mips-vr4300-mulmul-fix"
+#define DEBUG_TYPE "mips-mulmul-bug-fix"
 
 using namespace llvm;
 
 namespace {
 
-class MipsMulMulBugFix : public MachineFunctionPass {
+class MipsMulMulBugFixLegacy : public MachineFunctionPass {
 public:
-  MipsMulMulBugFix() : MachineFunctionPass(ID) {}
+  MipsMulMulBugFixLegacy() : MachineFunctionPass(ID) {}
 
   StringRef getPassName() const override { return "Mips VR4300 mulmul bugfix"; }
 
@@ -45,30 +49,20 @@ class MipsMulMulBugFix : public MachineFunctionPass {
 
   bool runOnMachineFunction(MachineFunction &MF) override;
 
-  static char ID;
+  void getAnalysisUsage(AnalysisUsage &AU) const override {
+    AU.setPreservesCFG();
+    MachineFunctionPass::getAnalysisUsage(AU);
+  }
 
-private:
-  bool fixMulMulBB(MachineBasicBlock &MBB, const MipsInstrInfo &MipsII);
+  static char ID;
 };
 
 } // namespace
 
-INITIALIZE_PASS(MipsMulMulBugFix, "mips-vr4300-mulmul-fix",
+INITIALIZE_PASS(MipsMulMulBugFixLegacy, "mips-mulmul-bug-fix",
                 "Mips VR4300 mulmul bugfix", false, false)
 
-char MipsMulMulBugFix::ID = 0;
-
-bool MipsMulMulBugFix::runOnMachineFunction(MachineFunction &MF) {
-  const MipsInstrInfo &MipsII =
-      *static_cast<const MipsInstrInfo *>(MF.getSubtarget().getInstrInfo());
-
-  bool Modified = false;
-
-  for (auto &MBB : MF)
-    Modified |= fixMulMulBB(MBB, MipsII);
-
-  return Modified;
-}
+char MipsMulMulBugFixLegacy::ID = 0;
 
 static bool isFirstMul(const MachineInstr &MI) {
   switch (MI.getOpcode()) {
@@ -102,8 +96,7 @@ static bool isSecondMulOrBranch(const MachineInstr &MI) {
   }
 }
 
-bool MipsMulMulBugFix::fixMulMulBB(MachineBasicBlock &MBB,
-                                   const MipsInstrInfo &MipsII) {
+static bool fixMulMulBB(MachineBasicBlock &MBB, const MipsInstrInfo &MipsII) {
   bool Modified = false;
 
   MachineBasicBlock::instr_iterator NextMII;
@@ -129,4 +122,30 @@ bool MipsMulMulBugFix::fixMulMulBB(MachineBasicBlock &MBB,
   return Modified;
 }
 
-FunctionPass *llvm::createMipsMulMulBugPass() { return new MipsMulMulBugFix(); }
+static bool fixMulMulBugInMF(MachineFunction &MF) {
+  const MipsInstrInfo &MipsII =
+      *static_cast<const MipsInstrInfo *>(MF.getSubtarget().getInstrInfo());
+
+  bool Modified = false;
+
+  for (auto &MBB : MF)
+    Modified |= fixMulMulBB(MBB, MipsII);
+
+  return Modified;
+}
+
+FunctionPass *llvm::createMipsMulMulBugFixLegacyPass() {
+  return new MipsMulMulBugFixLegacy();
+}
+
+bool MipsMulMulBugFixLegacy::runOnMachineFunction(MachineFunction &MF) {
+  return fixMulMulBugInMF(MF);
+}
+
+PreservedAnalyses
+MipsMulMulBugFixPass::run(MachineFunction &MF,
+                          MachineFunctionAnalysisManager &MFAM) {
+  return fixMulMulBugInMF(MF) ? getMachineFunctionPassPreservedAnalyses()
+                                    .preserveSet<CFGAnalyses>()
+                              : PreservedAnalyses::all();
+}
diff --git a/llvm/lib/Target/Mips/MipsPassRegistry.def b/llvm/lib/Target/Mips/MipsPassRegistry.def
index 89c63bd6bc924..6bf75c13657e7 100644
--- a/llvm/lib/Target/Mips/MipsPassRegistry.def
+++ b/llvm/lib/Target/Mips/MipsPassRegistry.def
@@ -26,6 +26,7 @@ MODULE_PASS("mips-os16", MipsOs16Pass())
 MACHINE_FUNCTION_PASS("mips-16-isel", Mips16ISelDAGPass(*this, getOptLevel()))
 MACHINE_FUNCTION_PASS("mips-expand-pseudo", MipsExpandPseudoPass())
 MACHINE_FUNCTION_PASS("mips-micro-size-reduce", MipsMicroSizeReducePass())
+MACHINE_FUNCTION_PASS("mips-mul-mul-bug-fix", MipsMulMulBugFixPass())
 MACHINE_FUNCTION_PASS("mips-optimize-pic-call", MipsOptimizePICCallPass())
 MACHINE_FUNCTION_PASS("mips-se-isel", MipsSEISelDAGPass(*this, getOptLevel()))
 #undef MACHINE_FUNCTION_PASS
diff --git a/llvm/lib/Target/Mips/MipsTargetMachine.cpp b/llvm/lib/Target/Mips/MipsTargetMachine.cpp
index 78ed22f89d960..dee9d7770f2e9 100644
--- a/llvm/lib/Target/Mips/MipsTargetMachine.cpp
+++ b/llvm/lib/Target/Mips/MipsTargetMachine.cpp
@@ -65,7 +65,7 @@ extern "C" LLVM_ABI LLVM_EXTERNAL_VISIBILITY void LLVMInitializeMipsTarget() {
   initializeMipsMicroSizeReduceLegacyPass(*PR);
   initializeMipsPreLegalizerCombinerPass(*PR);
   initializeMipsPostLegalizerCombinerPass(*PR);
-  initializeMipsMulMulBugFixPass(*PR);
+  initializeMipsMulMulBugFixLegacyPass(*PR);
   initializeMipsDAGToDAGISelLegacyPass(*PR);
 }
 
@@ -257,7 +257,7 @@ void MipsPassConfig::addPreEmitPass() {
   // This pass inserts a nop instruction between two back-to-back multiplication
   // instructions when the "mfix4300" flag is passed.
   if (getMipsTargetMachine().getCLOpts().mfix4300)
-    addPass(createMipsMulMulBugPass());
+    addPass(createMipsMulMulBugFixLegacyPass());
 
   // The delay slot filler pass can potientially create forbidden slot hazards
   // for MIPSR6 and therefore it should go before MipsBranchExpansion pass.
diff --git a/llvm/test/CodeGen/Mips/newpm-pipeline.ll b/llvm/test/CodeGen/Mips/newpm-pipeline.ll
index eef99917050b7..9542421ae9e7f 100644
--- a/llvm/test/CodeGen/Mips/newpm-pipeline.ll
+++ b/llvm/test/CodeGen/Mips/newpm-pipeline.ll
@@ -273,6 +273,7 @@
 ; MIPS-MFIX4300-NEXT:     patchable-function
 ; MIPS-MFIX4300-NEXT:     mips-expand-pseudo
 ; MIPS-MFIX4300-NEXT:     mips-micro-size-reduce
+; MIPS-MFIX4300-NEXT:     mips-mul-mul-bug-fix
 ; MIPS-MFIX4300-NEXT:     funclet-layout
 ; MIPS-MFIX4300-NEXT:     remove-loads-into-fake-uses
 ; MIPS-MFIX4300-NEXT:     StackMapLivenessPass

``````````

</details>


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


More information about the llvm-branch-commits mailing list