[llvm-branch-commits] [Sparc] Port FixAllFDIVSQRT to NewPM (PR #237659)

via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Sat Oct 31 17:05:18 PDT 2026


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/237659.diff


7 Files Affected:

- (modified) llvm/lib/Target/Sparc/LeonPasses.cpp (+17-3) 
- (modified) llvm/lib/Target/Sparc/LeonPasses.h (+8-2) 
- (modified) llvm/lib/Target/Sparc/Sparc.h (+7) 
- (modified) llvm/lib/Target/Sparc/SparcCodeGenPassBuilder.cpp (+1-1) 
- (modified) llvm/lib/Target/Sparc/SparcPassRegistry.def (+1) 
- (modified) llvm/lib/Target/Sparc/SparcTargetMachine.cpp (+1-1) 
- (modified) llvm/test/CodeGen/SPARC/newpm-pipeline.ll (+1) 


``````````diff
diff --git a/llvm/lib/Target/Sparc/LeonPasses.cpp b/llvm/lib/Target/Sparc/LeonPasses.cpp
index 0b3f84cffee32..67d4a7f2d29a5 100644
--- a/llvm/lib/Target/Sparc/LeonPasses.cpp
+++ b/llvm/lib/Target/Sparc/LeonPasses.cpp
@@ -446,11 +446,12 @@ SparcDetectRoundChangePass::run(MachineFunction &MF,
 // with the changes that still need implementing for the "double" versions
 // of these instructions.
 //
-char FixAllFDIVSQRT::ID = 0;
+char SparcFixAllFDIVSQRTLegacy::ID = 0;
 
-FixAllFDIVSQRT::FixAllFDIVSQRT() : MachineFunctionPass(ID) {}
+SparcFixAllFDIVSQRTLegacy::SparcFixAllFDIVSQRTLegacy()
+    : MachineFunctionPass(ID) {}
 
-bool FixAllFDIVSQRT::runOnMachineFunction(MachineFunction &MF) {
+static bool fixAllFDIVSQRTInMachineFunction(MachineFunction &MF) {
   const SparcSubtarget *Subtarget = &MF.getSubtarget<SparcSubtarget>();
   if (!Subtarget->fixAllFDIVSQRT())
     return false;
@@ -483,3 +484,16 @@ bool FixAllFDIVSQRT::runOnMachineFunction(MachineFunction &MF) {
 
   return Modified;
 }
+
+bool SparcFixAllFDIVSQRTLegacy::runOnMachineFunction(MachineFunction &MF) {
+  return fixAllFDIVSQRTInMachineFunction(MF);
+}
+
+PreservedAnalyses
+SparcFixAllFDIVSQRTPass::run(MachineFunction &MF,
+                             MachineFunctionAnalysisManager &MFAM) {
+  return fixAllFDIVSQRTInMachineFunction(MF)
+             ? getMachineFunctionPassPreservedAnalyses()
+                   .preserveSet<CFGAnalyses>()
+             : PreservedAnalyses::all();
+}
diff --git a/llvm/lib/Target/Sparc/LeonPasses.h b/llvm/lib/Target/Sparc/LeonPasses.h
index cace7766096f0..b8b08c35afd5a 100644
--- a/llvm/lib/Target/Sparc/LeonPasses.h
+++ b/llvm/lib/Target/Sparc/LeonPasses.h
@@ -85,17 +85,23 @@ class LLVM_LIBRARY_VISIBILITY SparcDetectRoundChangeLegacy
   }
 };
 
-class LLVM_LIBRARY_VISIBILITY FixAllFDIVSQRT : public MachineFunctionPass {
+class LLVM_LIBRARY_VISIBILITY SparcFixAllFDIVSQRTLegacy
+    : public MachineFunctionPass {
 public:
   static char ID;
 
-  FixAllFDIVSQRT();
+  SparcFixAllFDIVSQRTLegacy();
   bool runOnMachineFunction(MachineFunction &MF) override;
 
   StringRef getPassName() const override {
     return "FixAllFDIVSQRT: Erratum Fix LBR34: fix FDIVS/FDIVD/FSQRTS/FSQRTD "
            "instructions with NOPs and floating-point store";
   }
+
+  void getAnalysisUsage(AnalysisUsage &AU) const override {
+    AU.setPreservesCFG();
+    MachineFunctionPass::getAnalysisUsage(AU);
+  }
 };
 } // namespace llvm
 
diff --git a/llvm/lib/Target/Sparc/Sparc.h b/llvm/lib/Target/Sparc/Sparc.h
index c926012eb16d5..ce88cd42bed94 100644
--- a/llvm/lib/Target/Sparc/Sparc.h
+++ b/llvm/lib/Target/Sparc/Sparc.h
@@ -65,6 +65,13 @@ class SparcDetectRoundChangePass
                         MachineFunctionAnalysisManager &MFAM);
 };
 
+class SparcFixAllFDIVSQRTPass
+    : public RequiredPassInfoMixin<SparcFixAllFDIVSQRTPass> {
+public:
+  PreservedAnalyses run(MachineFunction &MF,
+                        MachineFunctionAnalysisManager &MFAM);
+};
+
 void initializeSparcAsmPrinterPass(PassRegistry &);
 void initializeSparcDAGToDAGISelLegacyPass(PassRegistry &);
 void initializeErrataWorkaroundPass(PassRegistry &);
diff --git a/llvm/lib/Target/Sparc/SparcCodeGenPassBuilder.cpp b/llvm/lib/Target/Sparc/SparcCodeGenPassBuilder.cpp
index dd6fc3738dac6..387cbc85c172c 100644
--- a/llvm/lib/Target/Sparc/SparcCodeGenPassBuilder.cpp
+++ b/llvm/lib/Target/Sparc/SparcCodeGenPassBuilder.cpp
@@ -58,7 +58,7 @@ void SparcCodeGenPassBuilder::addPreEmitPass(PassManagerWrapper &PMW) {
   addMachineFunctionPass(SparcDelaySlotFillerPass(), PMW);
   addMachineFunctionPass(SparcInsertNOPLoadPass(), PMW);
   addMachineFunctionPass(SparcDetectRoundChangePass(), PMW);
-  // TODO(boomanaiden154): Add SparcFixAllFDIVSQRTPass
+  addMachineFunctionPass(SparcFixAllFDIVSQRTPass(), PMW);
   // TODO(boomanaiden154): Add SparcErrataWorkaroundPass
 }
 
diff --git a/llvm/lib/Target/Sparc/SparcPassRegistry.def b/llvm/lib/Target/Sparc/SparcPassRegistry.def
index c8f45088c6481..b8519b01464aa 100644
--- a/llvm/lib/Target/Sparc/SparcPassRegistry.def
+++ b/llvm/lib/Target/Sparc/SparcPassRegistry.def
@@ -18,6 +18,7 @@
 #endif
 MACHINE_FUNCTION_PASS("sparc-delay-slot-filler", SparcDelaySlotFillerPass())
 MACHINE_FUNCTION_PASS("sparc-detect-round-change", SparcDetectRoundChangePass())
+MACHINE_FUNCTION_PASS("sparc-fix-all-fdivsqrt", SparcFixAllFDIVSQRTPass())
 MACHINE_FUNCTION_PASS("sparc-insert-nop-load", SparcInsertNOPLoadPass())
 MACHINE_FUNCTION_PASS("sparc-isel", SparcDAGToDAGISelPass(*this, getOptLevel()))
 #undef MACHINE_FUNCTION_PASS
diff --git a/llvm/lib/Target/Sparc/SparcTargetMachine.cpp b/llvm/lib/Target/Sparc/SparcTargetMachine.cpp
index 0c4b4de8aff3c..d710b585f6bcf 100644
--- a/llvm/lib/Target/Sparc/SparcTargetMachine.cpp
+++ b/llvm/lib/Target/Sparc/SparcTargetMachine.cpp
@@ -168,7 +168,7 @@ void SparcPassConfig::addPreEmitPass(){
   addPass(createSparcDelaySlotFillerLegacyPass());
   addPass(new SparcInsertNOPLoadLegacy());
   addPass(new SparcDetectRoundChangeLegacy());
-  addPass(new FixAllFDIVSQRT());
+  addPass(new SparcFixAllFDIVSQRTLegacy());
   addPass(new ErrataWorkaround());
 }
 
diff --git a/llvm/test/CodeGen/SPARC/newpm-pipeline.ll b/llvm/test/CodeGen/SPARC/newpm-pipeline.ll
index 470f8b4a55307..4a256a55aa59d 100644
--- a/llvm/test/CodeGen/SPARC/newpm-pipeline.ll
+++ b/llvm/test/CodeGen/SPARC/newpm-pipeline.ll
@@ -84,6 +84,7 @@
 ; SPARC-NEXT:     sparc-delay-slot-filler
 ; SPARC-NEXT:     sparc-insert-nop-load
 ; SPARC-NEXT:     sparc-detect-round-change
+; SPARC-NEXT:     sparc-fix-all-fdivsqrt
 ; SPARC-NEXT:     funclet-layout
 ; SPARC-NEXT:     remove-loads-into-fake-uses
 ; SPARC-NEXT:     StackMapLivenessPass

``````````

</details>


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


More information about the llvm-branch-commits mailing list