[llvm-branch-commits] [Sparc] Port InsertNOPLoad to NewPM (PR #237654)
via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Sat Oct 31 16:41:49 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. Also note we preserve the CFG in the
LegacyPM.
---
Full diff: https://github.com/llvm/llvm-project/pull/237654.diff
7 Files Affected:
- (modified) llvm/lib/Target/Sparc/LeonPasses.cpp (+19-3)
- (modified) llvm/lib/Target/Sparc/LeonPasses.h (+9-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 5e7086cc0832e..9a70369b4375b 100644
--- a/llvm/lib/Target/Sparc/LeonPasses.cpp
+++ b/llvm/lib/Target/Sparc/LeonPasses.cpp
@@ -10,11 +10,15 @@
//===----------------------------------------------------------------------===//
#include "LeonPasses.h"
+#include "Sparc.h"
#include "SparcSubtarget.h"
#include "llvm/CodeGen/MachineBasicBlock.h"
#include "llvm/CodeGen/MachineFunction.h"
+#include "llvm/CodeGen/MachineFunctionAnalysisManager.h"
#include "llvm/CodeGen/MachineInstr.h"
#include "llvm/CodeGen/MachineInstrBuilder.h"
+#include "llvm/CodeGen/MachinePassManager.h"
+#include "llvm/IR/Analysis.h"
#include "llvm/Support/raw_ostream.h"
using namespace llvm;
@@ -329,11 +333,12 @@ bool ErrataWorkaround::runOnMachineFunction(MachineFunction &MF) {
//
// This pass inserts a NOP after any LD or LDF instruction.
//
-char InsertNOPLoad::ID = 0;
+char SparcInsertNOPLoadLegacy::ID = 0;
-InsertNOPLoad::InsertNOPLoad() : MachineFunctionPass(ID) {}
+SparcInsertNOPLoadLegacy::SparcInsertNOPLoadLegacy()
+ : MachineFunctionPass(ID) {}
-bool InsertNOPLoad::runOnMachineFunction(MachineFunction &MF) {
+static bool insertNOPLoadInMachineFunction(MachineFunction &MF) {
const SparcSubtarget *Subtarget = &MF.getSubtarget<SparcSubtarget>();
if (!Subtarget->insertNOPLoad())
return false;
@@ -357,7 +362,18 @@ bool InsertNOPLoad::runOnMachineFunction(MachineFunction &MF) {
return Modified;
}
+bool SparcInsertNOPLoadLegacy::runOnMachineFunction(MachineFunction &MF) {
+ return insertNOPLoadInMachineFunction(MF);
+}
+PreservedAnalyses
+SparcInsertNOPLoadPass::run(MachineFunction &MF,
+ MachineFunctionAnalysisManager &MFAM) {
+ return insertNOPLoadInMachineFunction(MF)
+ ? getMachineFunctionPassPreservedAnalyses()
+ .preserveSet<CFGAnalyses>()
+ : PreservedAnalyses::all();
+}
//*****************************************************************************
//**** DetectRoundChange pass
diff --git a/llvm/lib/Target/Sparc/LeonPasses.h b/llvm/lib/Target/Sparc/LeonPasses.h
index 6b077d16bde13..df724a1f2d941 100644
--- a/llvm/lib/Target/Sparc/LeonPasses.h
+++ b/llvm/lib/Target/Sparc/LeonPasses.h
@@ -13,6 +13,7 @@
#define LLVM_LIB_TARGET_SPARC_LEON_PASSES_H
#include "llvm/CodeGen/MachineFunctionPass.h"
+#include "llvm/Pass.h"
namespace llvm {
class SparcSubtarget;
@@ -45,11 +46,12 @@ class LLVM_LIBRARY_VISIBILITY ErrataWorkaround : public MachineFunctionPass {
StringRef getPassName() const override { return "Errata workaround pass"; };
};
-class LLVM_LIBRARY_VISIBILITY InsertNOPLoad : public MachineFunctionPass {
+class LLVM_LIBRARY_VISIBILITY SparcInsertNOPLoadLegacy
+ : public MachineFunctionPass {
public:
static char ID;
- InsertNOPLoad();
+ SparcInsertNOPLoadLegacy();
bool runOnMachineFunction(MachineFunction &MF) override;
StringRef getPassName() const override {
@@ -57,6 +59,11 @@ class LLVM_LIBRARY_VISIBILITY InsertNOPLoad : public MachineFunctionPass {
"every single-cycle load instruction when the next instruction is "
"another load/store instruction";
}
+
+ void getAnalysisUsage(AnalysisUsage &AU) const override {
+ AU.setPreservesCFG();
+ MachineFunctionPass::getAnalysisUsage(AU);
+ }
};
class LLVM_LIBRARY_VISIBILITY DetectRoundChange : public MachineFunctionPass {
diff --git a/llvm/lib/Target/Sparc/Sparc.h b/llvm/lib/Target/Sparc/Sparc.h
index 7c19224100038..798f8df164a11 100644
--- a/llvm/lib/Target/Sparc/Sparc.h
+++ b/llvm/lib/Target/Sparc/Sparc.h
@@ -51,6 +51,13 @@ class SparcDelaySlotFillerPass
FunctionPass *createSparcDelaySlotFillerLegacyPass();
+class SparcInsertNOPLoadPass
+ : public RequiredPassInfoMixin<SparcInsertNOPLoadPass> {
+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 2cfd37afcea81..6f7666c60be18 100644
--- a/llvm/lib/Target/Sparc/SparcCodeGenPassBuilder.cpp
+++ b/llvm/lib/Target/Sparc/SparcCodeGenPassBuilder.cpp
@@ -56,7 +56,7 @@ void SparcCodeGenPassBuilder::addPreEmitPass(PassManagerWrapper &PMW) {
addMachineFunctionPass(BranchRelaxationPass(), PMW);
addMachineFunctionPass(SparcDelaySlotFillerPass(), PMW);
- // TODO(boomanaiden154): Add SparcInsertNOPLoadPass
+ addMachineFunctionPass(SparcInsertNOPLoadPass(), PMW);
// TODO(boomanaiden154): Add SparcDetectRoundChangePass
// TODO(boomanaiden154): Add SparcFixAllFDIVSQRTPass
// TODO(boomanaiden154): Add SparcErrataWorkaroundPass
diff --git a/llvm/lib/Target/Sparc/SparcPassRegistry.def b/llvm/lib/Target/Sparc/SparcPassRegistry.def
index 41255e9073017..51bbc6544661b 100644
--- a/llvm/lib/Target/Sparc/SparcPassRegistry.def
+++ b/llvm/lib/Target/Sparc/SparcPassRegistry.def
@@ -17,5 +17,6 @@
#define MACHINE_FUNCTION_PASS(NAME, CREATE_PASS)
#endif
MACHINE_FUNCTION_PASS("sparc-delay-slot-filler", SparcDelaySlotFillerPass())
+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 4ddbe0662a987..3839d1d212ef6 100644
--- a/llvm/lib/Target/Sparc/SparcTargetMachine.cpp
+++ b/llvm/lib/Target/Sparc/SparcTargetMachine.cpp
@@ -166,7 +166,7 @@ void SparcPassConfig::addPreEmitPass(){
addPass(&BranchRelaxationPassID);
addPass(createSparcDelaySlotFillerLegacyPass());
- addPass(new InsertNOPLoad());
+ addPass(new SparcInsertNOPLoadLegacy());
addPass(new DetectRoundChange());
addPass(new FixAllFDIVSQRT());
addPass(new ErrataWorkaround());
diff --git a/llvm/test/CodeGen/SPARC/newpm-pipeline.ll b/llvm/test/CodeGen/SPARC/newpm-pipeline.ll
index 1c24a77d1f3e0..e20116a88fedb 100644
--- a/llvm/test/CodeGen/SPARC/newpm-pipeline.ll
+++ b/llvm/test/CodeGen/SPARC/newpm-pipeline.ll
@@ -82,6 +82,7 @@
; SPARC-NEXT: patchable-function
; SPARC-BR-RELAX-NEXT: branch-relaxation
; SPARC-NEXT: sparc-delay-slot-filler
+; SPARC-NEXT: sparc-insert-nop-load
; SPARC-NEXT: funclet-layout
; SPARC-NEXT: remove-loads-into-fake-uses
; SPARC-NEXT: StackMapLivenessPass
``````````
</details>
https://github.com/llvm/llvm-project/pull/237654
More information about the llvm-branch-commits
mailing list