[AMDGPU][NPM] Port AMDGPUSetWavePriority to NPM #130064

optimisan · 2025-03-06T10:58:37Z

No description provided.

optimisan · 2025-03-06T10:59:00Z

This stack of pull requests is managed by Graphite. Learn more about stacking.

optimisan · 2025-03-10T05:15:01Z

llvm/test/CodeGen/AMDGPU/set-wave-priority.ll

+; RUN: llc -mtriple=amdgcn -stop-after=si-late-branch-lowering -o - %s | \
+; RUN:   llc -x mir -mtriple=amdgcn -passes=amdgpu-set-wave-priority -o - | \
+; RUN:   llc -x mir -mtriple=amdgcn -start-after=si-late-branch-lowering -o - | \
+; RUN:   FileCheck %s


such cut-pasting for tests is liable to get damaged if legacy pipeline changes but will be replaced very soon (once whole NPM pipeline is in place)

llvmbot · 2025-03-10T05:15:49Z

@llvm/pr-subscribers-backend-amdgpu

Author: Akshat Oke (optimisan)

Changes

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

5 Files Affected:

(modified) llvm/lib/Target/AMDGPU/AMDGPU.h (+8-1)
(modified) llvm/lib/Target/AMDGPU/AMDGPUPassRegistry.def (+1-1)
(modified) llvm/lib/Target/AMDGPU/AMDGPUSetWavePriority.cpp (+32-12)
(modified) llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp (+2-3)
(modified) llvm/test/CodeGen/AMDGPU/set-wave-priority.ll (+5)

diff --git a/llvm/lib/Target/AMDGPU/AMDGPU.h b/llvm/lib/Target/AMDGPU/AMDGPU.h
index d1dc62e9cc526..27ae6d42ec21d 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPU.h
+++ b/llvm/lib/Target/AMDGPU/AMDGPU.h
@@ -392,6 +392,13 @@ class SILateBranchLoweringPass
   static bool isRequired() { return true; }
 };
 
+class AMDGPUSetWavePriorityPass
+    : public PassInfoMixin<AMDGPUSetWavePriorityPass> {
+public:
+  PreservedAnalyses run(MachineFunction &MF,
+                        MachineFunctionAnalysisManager &MFAM);
+};
+
 FunctionPass *createAMDGPUAnnotateUniformValuesLegacy();
 
 ModulePass *createAMDGPUPrintfRuntimeBinding();
@@ -504,7 +511,7 @@ void initializeGCNPreRAOptimizationsLegacyPass(PassRegistry &);
 extern char &GCNPreRAOptimizationsID;
 
 FunctionPass *createAMDGPUSetWavePriorityPass();
-void initializeAMDGPUSetWavePriorityPass(PassRegistry &);
+void initializeAMDGPUSetWavePriorityLegacyPass(PassRegistry &);
 
 void initializeGCNRewritePartialRegUsesLegacyPass(llvm::PassRegistry &);
 extern char &GCNRewritePartialRegUsesID;
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUPassRegistry.def b/llvm/lib/Target/AMDGPU/AMDGPUPassRegistry.def
index 318aad5590cda..4956897d22fde 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUPassRegistry.def
+++ b/llvm/lib/Target/AMDGPU/AMDGPUPassRegistry.def
@@ -100,6 +100,7 @@ MACHINE_FUNCTION_PASS("amdgpu-insert-delay-alu", AMDGPUInsertDelayAluPass())
 MACHINE_FUNCTION_PASS("amdgpu-isel", AMDGPUISelDAGToDAGPass(*this))
 MACHINE_FUNCTION_PASS("amdgpu-pre-ra-long-branch-reg", GCNPreRALongBranchRegPass())
 MACHINE_FUNCTION_PASS("amdgpu-rewrite-partial-reg-uses", GCNRewritePartialRegUsesPass())
+MACHINE_FUNCTION_PASS("amdgpu-set-wave-priority", AMDGPUSetWavePriorityPass())
 MACHINE_FUNCTION_PASS("amdgpu-pre-ra-optimizations", GCNPreRAOptimizationsPass())
 MACHINE_FUNCTION_PASS("amdgpu-nsa-reassign", GCNNSAReassignPass())
 MACHINE_FUNCTION_PASS("gcn-dpp-combine", GCNDPPCombinePass())
@@ -131,7 +132,6 @@ MACHINE_FUNCTION_PASS("si-wqm", SIWholeQuadModePass())
 #define DUMMY_MACHINE_FUNCTION_PASS(NAME, CREATE_PASS)
 DUMMY_MACHINE_FUNCTION_PASS("amdgpu-pre-ra-optimizations", GCNPreRAOptimizationsPass())
 DUMMY_MACHINE_FUNCTION_PASS("amdgpu-rewrite-partial-reg-uses", GCNRewritePartialRegUsesPass())
-DUMMY_MACHINE_FUNCTION_PASS("amdgpu-set-wave-priority", AMDGPUSetWavePriorityPass())
 
 DUMMY_MACHINE_FUNCTION_PASS("si-pre-emit-peephole", SIPreEmitPeepholePass())
 // TODO: Move amdgpu-preload-kern-arg-prolog to MACHINE_FUNCTION_PASS since it
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUSetWavePriority.cpp b/llvm/lib/Target/AMDGPU/AMDGPUSetWavePriority.cpp
index c16d33f1453c0..29aecda82bc4b 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUSetWavePriority.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUSetWavePriority.cpp
@@ -19,6 +19,7 @@
 #include "SIInstrInfo.h"
 #include "llvm/ADT/PostOrderIterator.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
+#include "llvm/CodeGen/MachinePassManager.h"
 
 using namespace llvm;
 
@@ -40,15 +41,11 @@ struct MBBInfo {
 
 using MBBInfoSet = DenseMap<const MachineBasicBlock *, MBBInfo>;
 
-class AMDGPUSetWavePriority : public MachineFunctionPass {
+class AMDGPUSetWavePriority {
 public:
   static char ID;
 
-  AMDGPUSetWavePriority() : MachineFunctionPass(ID) {}
-
-  StringRef getPassName() const override { return "Set wave priority"; }
-
-  bool runOnMachineFunction(MachineFunction &MF) override;
+  bool run(MachineFunction &MF);
 
 private:
   MachineInstr *BuildSetprioMI(MachineBasicBlock &MBB,
@@ -58,15 +55,30 @@ class AMDGPUSetWavePriority : public MachineFunctionPass {
   const SIInstrInfo *TII;
 };
 
+class AMDGPUSetWavePriorityLegacy : public MachineFunctionPass {
+public:
+  static char ID;
+
+  AMDGPUSetWavePriorityLegacy() : MachineFunctionPass(ID) {}
+
+  StringRef getPassName() const override { return "Set wave priority"; }
+
+  bool runOnMachineFunction(MachineFunction &MF) override {
+    if (skipFunction(MF.getFunction()))
+      return false;
+    return AMDGPUSetWavePriority().run(MF);
+  }
+};
+
 } // End anonymous namespace.
 
-INITIALIZE_PASS(AMDGPUSetWavePriority, DEBUG_TYPE, "Set wave priority", false,
-                false)
+INITIALIZE_PASS(AMDGPUSetWavePriorityLegacy, DEBUG_TYPE, "Set wave priority",
+                false, false)
 
-char AMDGPUSetWavePriority::ID = 0;
+char AMDGPUSetWavePriorityLegacy::ID = 0;
 
 FunctionPass *llvm::createAMDGPUSetWavePriorityPass() {
-  return new AMDGPUSetWavePriority();
+  return new AMDGPUSetWavePriorityLegacy();
 }
 
 MachineInstr *
@@ -96,12 +108,20 @@ static bool isVMEMLoad(const MachineInstr &MI) {
   return SIInstrInfo::isVMEM(MI) && MI.mayLoad();
 }
 
-bool AMDGPUSetWavePriority::runOnMachineFunction(MachineFunction &MF) {
+PreservedAnalyses
+llvm::AMDGPUSetWavePriorityPass::run(MachineFunction &MF,
+                                     MachineFunctionAnalysisManager &MFAM) {
+  if (!AMDGPUSetWavePriority().run(MF))
+    return PreservedAnalyses::all();
+  return getMachineFunctionPassPreservedAnalyses();
+}
+
+bool AMDGPUSetWavePriority::run(MachineFunction &MF) {
   const unsigned HighPriority = 3;
   const unsigned LowPriority = 0;
 
   Function &F = MF.getFunction();
-  if (skipFunction(F) || !AMDGPU::isEntryFunctionCC(F.getCallingConv()))
+  if (!AMDGPU::isEntryFunctionCC(F.getCallingConv()))
     return false;
 
   const GCNSubtarget &ST = MF.getSubtarget<GCNSubtarget>();
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
index b9d62cc9e4b63..857af30b348cb 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
@@ -2163,9 +2163,8 @@ void AMDGPUCodeGenPassBuilder::addPreEmitPass(AddMachinePass &addPass) const {
 
   addPass(SILateBranchLoweringPass());
 
-  if (isPassEnabled(EnableSetWavePriority, CodeGenOptLevel::Less)) {
-    // TODO: addPass(AMDGPUSetWavePriorityPass());
-  }
+  if (isPassEnabled(EnableSetWavePriority, CodeGenOptLevel::Less))
+    addPass(AMDGPUSetWavePriorityPass());
 
   if (TM.getOptLevel() > CodeGenOptLevel::None) {
     // TODO: addPass(SIPreEmitPeepholePass());
diff --git a/llvm/test/CodeGen/AMDGPU/set-wave-priority.ll b/llvm/test/CodeGen/AMDGPU/set-wave-priority.ll
index ab6877ac4e6d1..a27d1217031ca 100644
--- a/llvm/test/CodeGen/AMDGPU/set-wave-priority.ll
+++ b/llvm/test/CodeGen/AMDGPU/set-wave-priority.ll
@@ -1,6 +1,11 @@
 ; RUN: llc -mtriple=amdgcn -amdgpu-set-wave-priority=true -o - %s | \
 ; RUN:   FileCheck %s
 
+; RUN: llc -mtriple=amdgcn -stop-after=si-late-branch-lowering -o - %s | \
+; RUN:   llc -x mir -mtriple=amdgcn -passes=amdgpu-set-wave-priority -o - | \
+; RUN:   llc -x mir -mtriple=amdgcn -start-after=si-late-branch-lowering -o - | \
+; RUN:   FileCheck %s
+
 ; CHECK-LABEL: no_setprio:
 ; CHECK-NOT:       s_setprio
 ; CHECK:           ; return to shader part epilog

llvm/lib/Target/AMDGPU/AMDGPUSetWavePriority.cpp

optimisan · 2025-04-02T11:19:00Z

fixed in 7c4009f

Fixes a13a51b (#130064)

optimisan force-pushed the users/optimisan/preemit/port-si-late-branch-lowering branch from 5f050b8 to 33a5201 Compare March 7, 2025 10:12

optimisan force-pushed the users/optimisan/preemit/port-amdgpu-set-wave-priority branch from f7988c3 to 147e7af Compare March 7, 2025 10:12

optimisan force-pushed the users/optimisan/preemit/port-si-late-branch-lowering branch from 33a5201 to 70a3b58 Compare March 10, 2025 04:44

optimisan force-pushed the users/optimisan/preemit/port-amdgpu-set-wave-priority branch from 147e7af to 192871b Compare March 10, 2025 04:44

optimisan mentioned this pull request Mar 10, 2025

[AMDGPU][NFC] Format GCNCreateVOPD.cpp #130548

Merged

optimisan commented Mar 10, 2025

View reviewed changes

optimisan marked this pull request as ready for review March 10, 2025 05:15

optimisan requested review from arsenm and vikramRH March 10, 2025 05:15

llvmbot added the backend:AMDGPU label Mar 10, 2025

optimisan requested a review from cdevadas March 10, 2025 05:15

optimisan force-pushed the users/optimisan/preemit/port-si-late-branch-lowering branch from 70a3b58 to 03b1e8e Compare March 10, 2025 05:22

optimisan force-pushed the users/optimisan/preemit/port-amdgpu-set-wave-priority branch from 192871b to 031fd29 Compare March 10, 2025 05:22

arsenm approved these changes Mar 10, 2025

View reviewed changes

cdevadas approved these changes Mar 10, 2025

View reviewed changes

llvm/lib/Target/AMDGPU/AMDGPUSetWavePriority.cpp Outdated Show resolved Hide resolved

llvm/lib/Target/AMDGPU/AMDGPUSetWavePriority.cpp Outdated Show resolved Hide resolved

optimisan force-pushed the users/optimisan/preemit/port-si-late-branch-lowering branch from 03b1e8e to f095da2 Compare March 11, 2025 09:39

optimisan force-pushed the users/optimisan/preemit/port-amdgpu-set-wave-priority branch from 031fd29 to 46ced15 Compare March 11, 2025 09:42

optimisan force-pushed the users/optimisan/preemit/port-si-late-branch-lowering branch from f095da2 to 0d5f939 Compare March 26, 2025 08:13

optimisan force-pushed the users/optimisan/preemit/port-amdgpu-set-wave-priority branch from 46ced15 to 75e1e52 Compare March 26, 2025 08:14

arsenm approved these changes Mar 26, 2025

View reviewed changes

Base automatically changed from users/optimisan/preemit/port-si-late-branch-lowering to main March 26, 2025 13:58

optimisan added 2 commits April 2, 2025 05:13

[AMDGPU][NPM] Port AMDGPUSetWavePriority to NPM

b0fce9e

AS

15a6c1f

optimisan force-pushed the users/optimisan/preemit/port-amdgpu-set-wave-priority branch from 75e1e52 to 15a6c1f Compare April 2, 2025 09:55

arsenm approved these changes Apr 2, 2025

View reviewed changes

optimisan merged commit a13a51b into main Apr 2, 2025
9 of 11 checks passed

optimisan deleted the users/optimisan/preemit/port-amdgpu-set-wave-priority branch April 2, 2025 10:58

optimisan added a commit that referenced this pull request Apr 2, 2025

[AMDGPU] AMDGPUSetWavePriority: Remove unused variable NFC (#134069)

7c4009f

Fixes a13a51b (#130064)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[AMDGPU][NPM] Port AMDGPUSetWavePriority to NPM #130064

[AMDGPU][NPM] Port AMDGPUSetWavePriority to NPM #130064

Uh oh!

optimisan commented Mar 6, 2025

Uh oh!

optimisan commented Mar 6, 2025 •

edited

Loading

Uh oh!

optimisan Mar 10, 2025

Uh oh!

llvmbot commented Mar 10, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

optimisan commented Apr 2, 2025 •

edited

Loading

Uh oh!

Uh oh!

[AMDGPU][NPM] Port AMDGPUSetWavePriority to NPM #130064

[AMDGPU][NPM] Port AMDGPUSetWavePriority to NPM #130064

Uh oh!

Conversation

optimisan commented Mar 6, 2025

Uh oh!

optimisan commented Mar 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

optimisan Mar 10, 2025

Choose a reason for hiding this comment

Uh oh!

llvmbot commented Mar 10, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

optimisan commented Apr 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

optimisan commented Mar 6, 2025 •

edited

Loading

optimisan commented Apr 2, 2025 •

edited

Loading