[llvm] [AMDGPU] Fix AMDGPULowerKernelAttributes not invalidating analysis (PR #175256)

Joseph Huber via llvm-commits llvm-commits at lists.llvm.org
Fri Jan 9 14:36:15 PST 2026


https://github.com/jhuber6 updated https://github.com/llvm/llvm-project/pull/175256

>From f5bf729c6d82c5f90406945a1ddd3186a388db90 Mon Sep 17 00:00:00 2001
From: Joseph Huber <huberjn at outlook.com>
Date: Fri, 9 Jan 2026 16:09:27 -0600
Subject: [PATCH 1/4] [AMDGPU] Fix AMDGPULowerKernelAttributes not invalidating
 analysis

Summary:
The new PM wasn't using the changed result.
---
 llvm/lib/Target/AMDGPU/AMDGPULowerKernelAttributes.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/llvm/lib/Target/AMDGPU/AMDGPULowerKernelAttributes.cpp b/llvm/lib/Target/AMDGPU/AMDGPULowerKernelAttributes.cpp
index 0c6bf27e9a1c2..34447c78c0dca 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPULowerKernelAttributes.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPULowerKernelAttributes.cpp
@@ -430,12 +430,13 @@ AMDGPULowerKernelAttributesPass::run(Function &F, FunctionAnalysisManager &AM) {
   if (!BasePtr) // ImplicitArgPtr/DispatchPtr not used.
     return PreservedAnalyses::all();
 
+  bool Changed = false;
   for (Instruction &I : instructions(F)) {
     if (CallInst *CI = dyn_cast<CallInst>(&I)) {
       if (CI->getCalledFunction() == BasePtr)
-        processUse(CI, IsV5OrAbove);
+        Changed |= processUse(CI, IsV5OrAbove);
     }
   }
 
-  return PreservedAnalyses::all();
+  return !Changed ? PreservedAnalyses::all() : PreservedAnalyses::none();
 }

>From 0330cfe4faa949b782578c3b3c133b417218b0d7 Mon Sep 17 00:00:00 2001
From: Joseph Huber <huberjn at outlook.com>
Date: Fri, 9 Jan 2026 16:22:03 -0600
Subject: [PATCH 2/4] commnets

---
 .../lib/Target/AMDGPU/AMDGPULowerKernelAttributes.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/llvm/lib/Target/AMDGPU/AMDGPULowerKernelAttributes.cpp b/llvm/lib/Target/AMDGPU/AMDGPULowerKernelAttributes.cpp
index 34447c78c0dca..8ed7a48e38537 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPULowerKernelAttributes.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPULowerKernelAttributes.cpp
@@ -15,6 +15,7 @@
 #include "AMDGPU.h"
 #include "Utils/AMDGPUBaseInfo.h"
 #include "llvm/Analysis/ConstantFolding.h"
+#include "llvm/Analysis/LazyCallGraph.h"
 #include "llvm/Analysis/ValueTracking.h"
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/IR/Constants.h"
@@ -438,5 +439,13 @@ AMDGPULowerKernelAttributesPass::run(Function &F, FunctionAnalysisManager &AM) {
     }
   }
 
-  return !Changed ? PreservedAnalyses::all() : PreservedAnalyses::none();
+  PreservedAnalyses PA = PreservedAnalyses::all();
+  if (Changed) {
+    // The call graph is unchanged after this pass.
+    PA = PreservedAnalyses::none();
+    PA.preserveSet<AllAnalysesOn<LazyCallGraph::SCC>>();
+    PA.preserve<LazyCallGraphAnalysis>();
+    PA.preserve<FunctionAnalysisManagerModuleProxy>();
+  }
+  return PA;
 }

>From 2d92ea44dfb426cffe3a0ec3be05ed00e71cadc5 Mon Sep 17 00:00:00 2001
From: Joseph Huber <huberjn at outlook.com>
Date: Fri, 9 Jan 2026 16:33:01 -0600
Subject: [PATCH 3/4] CFG

---
 llvm/lib/Target/AMDGPU/AMDGPULowerKernelAttributes.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/llvm/lib/Target/AMDGPU/AMDGPULowerKernelAttributes.cpp b/llvm/lib/Target/AMDGPU/AMDGPULowerKernelAttributes.cpp
index 8ed7a48e38537..51613ce121ea9 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPULowerKernelAttributes.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPULowerKernelAttributes.cpp
@@ -15,7 +15,6 @@
 #include "AMDGPU.h"
 #include "Utils/AMDGPUBaseInfo.h"
 #include "llvm/Analysis/ConstantFolding.h"
-#include "llvm/Analysis/LazyCallGraph.h"
 #include "llvm/Analysis/ValueTracking.h"
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/IR/Constants.h"
@@ -443,9 +442,7 @@ AMDGPULowerKernelAttributesPass::run(Function &F, FunctionAnalysisManager &AM) {
   if (Changed) {
     // The call graph is unchanged after this pass.
     PA = PreservedAnalyses::none();
-    PA.preserveSet<AllAnalysesOn<LazyCallGraph::SCC>>();
-    PA.preserve<LazyCallGraphAnalysis>();
-    PA.preserve<FunctionAnalysisManagerModuleProxy>();
+    PA.preserveSet<CFGAnalyses>();
   }
   return PA;
 }

>From 063e05b40604d040607d33bce6b0adf9d99b2d0b Mon Sep 17 00:00:00 2001
From: Joseph Huber <huberjn at outlook.com>
Date: Fri, 9 Jan 2026 16:36:03 -0600
Subject: [PATCH 4/4] cleanup

---
 llvm/lib/Target/AMDGPU/AMDGPULowerKernelAttributes.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/llvm/lib/Target/AMDGPU/AMDGPULowerKernelAttributes.cpp b/llvm/lib/Target/AMDGPU/AMDGPULowerKernelAttributes.cpp
index 51613ce121ea9..fbfb71059b6b1 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPULowerKernelAttributes.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPULowerKernelAttributes.cpp
@@ -438,11 +438,6 @@ AMDGPULowerKernelAttributesPass::run(Function &F, FunctionAnalysisManager &AM) {
     }
   }
 
-  PreservedAnalyses PA = PreservedAnalyses::all();
-  if (Changed) {
-    // The call graph is unchanged after this pass.
-    PA = PreservedAnalyses::none();
-    PA.preserveSet<CFGAnalyses>();
-  }
-  return PA;
+  return !Changed ? PreservedAnalyses::all()
+                  : PreservedAnalyses::none().preserveSet<CFGAnalyses>();
 }



More information about the llvm-commits mailing list