[llvm-branch-commits] [LoongArch] Port OptWInstrs to NewPM (PR #244973)

via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Sat Nov 21 16:25:26 PST 2026


llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-backend-loongarch

Author: Aiden Grossman (boomanaiden154)

<details>
<summary>Changes</summary>

Standard NewPM pass porting.


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


6 Files Affected:

- (modified) llvm/lib/Target/LoongArch/LoongArch.h (+14-2) 
- (modified) llvm/lib/Target/LoongArch/LoongArchCodeGenPassBuilder.cpp (+2-3) 
- (modified) llvm/lib/Target/LoongArch/LoongArchOptWInstrs.cpp (+37-32) 
- (modified) llvm/lib/Target/LoongArch/LoongArchPassRegistry.def (+1) 
- (modified) llvm/lib/Target/LoongArch/LoongArchTargetMachine.cpp (+2-2) 
- (modified) llvm/test/CodeGen/LoongArch/newpm-pipeline.ll (+2-1) 


``````````diff
diff --git a/llvm/lib/Target/LoongArch/LoongArch.h b/llvm/lib/Target/LoongArch/LoongArch.h
index 652bda2fb2eb1..5c901ae62fe6f 100644
--- a/llvm/lib/Target/LoongArch/LoongArch.h
+++ b/llvm/lib/Target/LoongArch/LoongArch.h
@@ -15,7 +15,11 @@
 #define LLVM_LIB_TARGET_LOONGARCH_LOONGARCH_H
 
 #include "MCTargetDesc/LoongArchBaseInfo.h"
+#include "llvm/CodeGen/MachineFunction.h"
+#include "llvm/CodeGen/MachineFunctionAnalysisManager.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"
 
@@ -48,7 +52,15 @@ FunctionPass *createLoongArchISelDagLegacyPass(LoongArchTargetMachine &TM,
                                                CodeGenOptLevel OptLevel);
 FunctionPass *createLoongArchMemoryBarrierOptPass();
 FunctionPass *createLoongArchMergeBaseOffsetOptPass();
-FunctionPass *createLoongArchOptWInstrsPass();
+
+class LoongArchOptWInstrsPass
+    : public OptionalPassInfoMixin<LoongArchOptWInstrsPass> {
+public:
+  PreservedAnalyses run(MachineFunction &MF,
+                        MachineFunctionAnalysisManager &MFAM);
+};
+
+FunctionPass *createLoongArchOptWInstrsLegacyPass();
 FunctionPass *createLoongArchPreRAExpandPseudoPass();
 FunctionPass *createLoongArchExpandPseudoPass();
 FunctionPass *createLoongArchLateBranchOptPass();
@@ -58,7 +70,7 @@ void initializeLoongArchDeadRegisterDefinitionsPass(PassRegistry &);
 void initializeLoongArchExpandAtomicPseudoPass(PassRegistry &);
 void initializeLoongArchMemoryBarrierOptPass(PassRegistry &);
 void initializeLoongArchMergeBaseOffsetOptPass(PassRegistry &);
-void initializeLoongArchOptWInstrsPass(PassRegistry &);
+void initializeLoongArchOptWInstrsLegacyPass(PassRegistry &);
 void initializeLoongArchPreRAExpandPseudoPass(PassRegistry &);
 void initializeLoongArchExpandPseudoPass(PassRegistry &);
 void initializeLoongArchLateBranchOptPass(PassRegistry &);
diff --git a/llvm/lib/Target/LoongArch/LoongArchCodeGenPassBuilder.cpp b/llvm/lib/Target/LoongArch/LoongArchCodeGenPassBuilder.cpp
index 2a8b3f09fa4a7..c579493ee3af3 100644
--- a/llvm/lib/Target/LoongArch/LoongArchCodeGenPassBuilder.cpp
+++ b/llvm/lib/Target/LoongArch/LoongArchCodeGenPassBuilder.cpp
@@ -90,9 +90,8 @@ void LoongArchCodeGenPassBuilder::addMachineSSAOptimization(
     PassManagerWrapper &PMW) {
   Base::addMachineSSAOptimization(PMW);
 
-  if (getTM().getTargetTriple().isLoongArch64()) {
-    // TODO(boomanaiden154): Add LoongArchOptWInstrsPass
-  }
+  if (getTM().getTargetTriple().isLoongArch64())
+    addMachineFunctionPass(LoongArchOptWInstrsPass(), PMW);
 }
 
 void LoongArchCodeGenPassBuilder::addILPOpts(PassManagerWrapper &PMW) {
diff --git a/llvm/lib/Target/LoongArch/LoongArchOptWInstrs.cpp b/llvm/lib/Target/LoongArch/LoongArchOptWInstrs.cpp
index 2fc05afcd0b80..e7bf977ea9532 100644
--- a/llvm/lib/Target/LoongArch/LoongArchOptWInstrs.cpp
+++ b/llvm/lib/Target/LoongArch/LoongArchOptWInstrs.cpp
@@ -34,8 +34,11 @@
 #include "LoongArchSubtarget.h"
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/Statistic.h"
+#include "llvm/CodeGen/MachineFunctionAnalysisManager.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
+#include "llvm/CodeGen/MachinePassManager.h"
 #include "llvm/CodeGen/TargetInstrInfo.h"
+#include "llvm/IR/Analysis.h"
 
 using namespace llvm;
 
@@ -57,22 +60,13 @@ static cl::opt<bool>
 
 namespace {
 
-class LoongArchOptWInstrs : public MachineFunctionPass {
+class LoongArchOptWInstrsLegacy : public MachineFunctionPass {
 public:
   static char ID;
 
-  LoongArchOptWInstrs() : MachineFunctionPass(ID) {}
+  LoongArchOptWInstrsLegacy() : MachineFunctionPass(ID) {}
 
   bool runOnMachineFunction(MachineFunction &MF) override;
-  bool removeSExtWInstrs(MachineFunction &MF, const LoongArchInstrInfo &TII,
-                         const LoongArchSubtarget &ST,
-                         MachineRegisterInfo &MRI);
-  bool convertToDSuffixes(MachineFunction &MF, const LoongArchInstrInfo &TII,
-                          const LoongArchSubtarget &ST,
-                          MachineRegisterInfo &MRI);
-  bool convertToWSuffixes(MachineFunction &MF, const LoongArchInstrInfo &TII,
-                          const LoongArchSubtarget &ST,
-                          MachineRegisterInfo &MRI);
 
   void getAnalysisUsage(AnalysisUsage &AU) const override {
     AU.setPreservesCFG();
@@ -84,12 +78,12 @@ class LoongArchOptWInstrs : public MachineFunctionPass {
 
 } // end anonymous namespace
 
-char LoongArchOptWInstrs::ID = 0;
-INITIALIZE_PASS(LoongArchOptWInstrs, DEBUG_TYPE, LOONGARCH_OPT_W_INSTRS_NAME,
-                false, false)
+char LoongArchOptWInstrsLegacy::ID = 0;
+INITIALIZE_PASS(LoongArchOptWInstrsLegacy, DEBUG_TYPE,
+                LOONGARCH_OPT_W_INSTRS_NAME, false, false)
 
-FunctionPass *llvm::createLoongArchOptWInstrsPass() {
-  return new LoongArchOptWInstrs();
+FunctionPass *llvm::createLoongArchOptWInstrsLegacyPass() {
+  return new LoongArchOptWInstrsLegacy();
 }
 
 // Checks if all users only demand the lower \p OrigBits of the original
@@ -711,10 +705,10 @@ static unsigned getWOp(unsigned Opcode) {
   }
 }
 
-bool LoongArchOptWInstrs::removeSExtWInstrs(MachineFunction &MF,
-                                            const LoongArchInstrInfo &TII,
-                                            const LoongArchSubtarget &ST,
-                                            MachineRegisterInfo &MRI) {
+static bool removeSExtWInstrs(MachineFunction &MF,
+                              const LoongArchInstrInfo &TII,
+                              const LoongArchSubtarget &ST,
+                              MachineRegisterInfo &MRI) {
   if (DisableSExtWRemoval)
     return false;
 
@@ -763,10 +757,10 @@ bool LoongArchOptWInstrs::removeSExtWInstrs(MachineFunction &MF,
   return MadeChange;
 }
 
-bool LoongArchOptWInstrs::convertToDSuffixes(MachineFunction &MF,
-                                             const LoongArchInstrInfo &TII,
-                                             const LoongArchSubtarget &ST,
-                                             MachineRegisterInfo &MRI) {
+static bool convertToDSuffixes(MachineFunction &MF,
+                               const LoongArchInstrInfo &TII,
+                               const LoongArchSubtarget &ST,
+                               MachineRegisterInfo &MRI) {
   bool MadeChange = false;
   for (MachineBasicBlock &MBB : MF) {
     for (MachineInstr &MI : MBB) {
@@ -789,10 +783,10 @@ bool LoongArchOptWInstrs::convertToDSuffixes(MachineFunction &MF,
   return MadeChange;
 }
 
-bool LoongArchOptWInstrs::convertToWSuffixes(MachineFunction &MF,
-                                             const LoongArchInstrInfo &TII,
-                                             const LoongArchSubtarget &ST,
-                                             MachineRegisterInfo &MRI) {
+static bool convertToWSuffixes(MachineFunction &MF,
+                               const LoongArchInstrInfo &TII,
+                               const LoongArchSubtarget &ST,
+                               MachineRegisterInfo &MRI) {
   bool MadeChange = false;
   for (MachineBasicBlock &MBB : MF) {
     for (MachineInstr &MI : MBB) {
@@ -841,10 +835,7 @@ bool LoongArchOptWInstrs::convertToWSuffixes(MachineFunction &MF,
   return MadeChange;
 }
 
-bool LoongArchOptWInstrs::runOnMachineFunction(MachineFunction &MF) {
-  if (skipFunction(MF.getFunction()))
-    return false;
-
+static bool optWInstrsInMF(MachineFunction &MF) {
   MachineRegisterInfo &MRI = MF.getRegInfo();
   const LoongArchSubtarget &ST = MF.getSubtarget<LoongArchSubtarget>();
   const LoongArchInstrInfo &TII = *ST.getInstrInfo();
@@ -863,3 +854,17 @@ bool LoongArchOptWInstrs::runOnMachineFunction(MachineFunction &MF) {
 
   return MadeChange;
 }
+
+bool LoongArchOptWInstrsLegacy::runOnMachineFunction(MachineFunction &MF) {
+  if (skipFunction(MF.getFunction()))
+    return false;
+  return optWInstrsInMF(MF);
+}
+
+PreservedAnalyses
+LoongArchOptWInstrsPass::run(MachineFunction &MF,
+                             MachineFunctionAnalysisManager &MFAM) {
+  return optWInstrsInMF(MF) ? getMachineFunctionPassPreservedAnalyses()
+                                  .preserveSet<CFGAnalyses>()
+                            : PreservedAnalyses::all();
+}
diff --git a/llvm/lib/Target/LoongArch/LoongArchPassRegistry.def b/llvm/lib/Target/LoongArch/LoongArchPassRegistry.def
index 20bd9e1411659..5626cf07d2528 100644
--- a/llvm/lib/Target/LoongArch/LoongArchPassRegistry.def
+++ b/llvm/lib/Target/LoongArch/LoongArchPassRegistry.def
@@ -18,4 +18,5 @@
 #endif
 MACHINE_FUNCTION_PASS("loongarch-isel",
                       LoongArchISelDAGToDAGPass(*this, getOptLevel()))
+MACHINE_FUNCTION_PASS("loongarch-opt-w-instrs", LoongArchOptWInstrsPass())
 #undef MACHINE_FUNCTION_PASS
diff --git a/llvm/lib/Target/LoongArch/LoongArchTargetMachine.cpp b/llvm/lib/Target/LoongArch/LoongArchTargetMachine.cpp
index 989e86f6868b6..352f9d23c57cf 100644
--- a/llvm/lib/Target/LoongArch/LoongArchTargetMachine.cpp
+++ b/llvm/lib/Target/LoongArch/LoongArchTargetMachine.cpp
@@ -39,7 +39,7 @@ LLVMInitializeLoongArchTarget() {
   initializeLoongArchDeadRegisterDefinitionsPass(*PR);
   initializeLoongArchMemoryBarrierOptPass(*PR);
   initializeLoongArchMergeBaseOffsetOptPass(*PR);
-  initializeLoongArchOptWInstrsPass(*PR);
+  initializeLoongArchOptWInstrsLegacyPass(*PR);
   initializeLoongArchPreRAExpandPseudoPass(*PR);
   initializeLoongArchExpandPseudoPass(*PR);
   initializeLoongArchDAGToDAGISelLegacyPass(*PR);
@@ -218,7 +218,7 @@ void LoongArchPassConfig::addMachineSSAOptimization() {
   TargetPassConfig::addMachineSSAOptimization();
 
   if (TM->getTargetTriple().isLoongArch64()) {
-    addPass(createLoongArchOptWInstrsPass());
+    addPass(createLoongArchOptWInstrsLegacyPass());
   }
 }
 
diff --git a/llvm/test/CodeGen/LoongArch/newpm-pipeline.ll b/llvm/test/CodeGen/LoongArch/newpm-pipeline.ll
index 35b05630b1467..20c9371d223e4 100644
--- a/llvm/test/CodeGen/LoongArch/newpm-pipeline.ll
+++ b/llvm/test/CodeGen/LoongArch/newpm-pipeline.ll
@@ -3,7 +3,7 @@
 ; RUN: llc -enable-new-pm -mtriple=loongarch32 -print-pipeline-passes=tree < %s 2>&1 \
 ; RUN:   | FileCheck %s --check-prefix=O2
 ; RUN: llc -enable-new-pm -mtriple=loongarch64 -print-pipeline-passes=tree < %s 2>&1 \
-; RUN:   | FileCheck %s --check-prefix=O2
+; RUN:   | FileCheck %s --check-prefix=O2,O2-64
 
 ; O0: require<MachineModuleAnalysis>
 ; O0-NEXT: require<profile-summary>
@@ -101,6 +101,7 @@
 ; O2-NEXT:     machine-sink
 ; O2-NEXT:     peephole-opt
 ; O2-NEXT:     dead-mi-elimination
+; O2-64-NEXT:  loongarch-opt-w-instrs
 ; O2-NEXT:     detect-dead-lanes
 ; O2-NEXT:     init-undef
 ; O2-NEXT:     process-implicit-defs

``````````

</details>


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


More information about the llvm-branch-commits mailing list