[llvm] [NVPTX] Add NewPM boilerplate to NVPTXAtomicLower (PR #215322)

Alex MacLean via llvm-commits llvm-commits at lists.llvm.org
Tue Aug 11 08:49:01 PDT 2026


https://github.com/AlexMaclean updated https://github.com/llvm/llvm-project/pull/215322

>From c8d6c299ffd07847f702e2eb2fe836f31bab6ec9 Mon Sep 17 00:00:00 2001
From: Alex MacLean <amaclean at nvidia.com>
Date: Mon, 10 Aug 2026 20:25:48 -0700
Subject: [PATCH 1/2] [NVPTX] Add NewPM boilerplate to NVPTXAtomicLower

---
 llvm/lib/Target/NVPTX/NVPTX.h                |  8 ++-
 llvm/lib/Target/NVPTX/NVPTXAtomicLower.cpp   | 51 +++++++++++---------
 llvm/lib/Target/NVPTX/NVPTXAtomicLower.h     |  2 +-
 llvm/lib/Target/NVPTX/NVPTXPassRegistry.def  |  1 +
 llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp |  4 +-
 5 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/llvm/lib/Target/NVPTX/NVPTX.h b/llvm/lib/Target/NVPTX/NVPTX.h
index bce87ec312eee..4b378042fd3f9 100644
--- a/llvm/lib/Target/NVPTX/NVPTX.h
+++ b/llvm/lib/Target/NVPTX/NVPTX.h
@@ -69,7 +69,7 @@ void initializeGenericToNVVMLegacyPassPass(PassRegistry &);
 void initializeNVPTXAllocaHoistingPass(PassRegistry &);
 void initializeNVPTXAsmPrinterPass(PassRegistry &);
 void initializeNVPTXAssignValidGlobalNamesLegacyPassPass(PassRegistry &);
-void initializeNVPTXAtomicLowerPass(PassRegistry &);
+void initializeNVPTXAtomicLowerLegacyPassPass(PassRegistry &);
 void initializeNVPTXCtorDtorLoweringLegacyPass(PassRegistry &);
 void initializeNVPTXLowerAggrCopiesPass(PassRegistry &);
 void initializeNVPTXLowerAllocaLegacyPassPass(PassRegistry &);
@@ -106,6 +106,12 @@ struct NVVMReflectPass : OptionalPassInfoMixin<NVVMReflectPass> {
   unsigned SmVersion;
 };
 
+class NVPTXAtomicLowerPass
+    : public RequiredPassInfoMixin<NVPTXAtomicLowerPass> {
+public:
+  PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM);
+};
+
 struct GenericToNVVMPass : OptionalPassInfoMixin<GenericToNVVMPass> {
   PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
 };
diff --git a/llvm/lib/Target/NVPTX/NVPTXAtomicLower.cpp b/llvm/lib/Target/NVPTX/NVPTXAtomicLower.cpp
index 918daf6c04ecd..d9ee468e75e42 100644
--- a/llvm/lib/Target/NVPTX/NVPTXAtomicLower.cpp
+++ b/llvm/lib/Target/NVPTX/NVPTXAtomicLower.cpp
@@ -21,13 +21,24 @@
 #include "MCTargetDesc/NVPTXBaseInfo.h"
 using namespace llvm;
 
+static bool lowerLocalMemoryAtomics(Function &F) {
+  SmallVector<AtomicRMWInst *> LocalMemoryAtomics;
+  for (Instruction &I : instructions(F))
+    if (AtomicRMWInst *RMWI = dyn_cast<AtomicRMWInst>(&I))
+      if (RMWI->getPointerAddressSpace() == ADDRESS_SPACE_LOCAL)
+        LocalMemoryAtomics.push_back(RMWI);
+
+  bool Changed = false;
+  for (AtomicRMWInst *RMWI : LocalMemoryAtomics)
+    Changed |= lowerAtomicRMWInst(RMWI);
+  return Changed;
+}
+
 namespace {
-// Hoisting the alloca instructions in the non-entry blocks to the entry
-// block.
-class NVPTXAtomicLower : public FunctionPass {
+class NVPTXAtomicLowerLegacyPass : public FunctionPass {
 public:
   static char ID; // Pass ID
-  NVPTXAtomicLower() : FunctionPass(ID) {}
+  NVPTXAtomicLowerLegacyPass() : FunctionPass(ID) {}
 
   void getAnalysisUsage(AnalysisUsage &AU) const override {
     AU.setPreservesCFG();
@@ -37,29 +48,25 @@ class NVPTXAtomicLower : public FunctionPass {
     return "NVPTX lower atomics of local memory";
   }
 
-  bool runOnFunction(Function &F) override;
+  bool runOnFunction(Function &F) override {
+    return lowerLocalMemoryAtomics(F);
+  }
 };
 } // namespace
 
-bool NVPTXAtomicLower::runOnFunction(Function &F) {
-  SmallVector<AtomicRMWInst *> LocalMemoryAtomics;
-  for (Instruction &I : instructions(F))
-    if (AtomicRMWInst *RMWI = dyn_cast<AtomicRMWInst>(&I))
-      if (RMWI->getPointerAddressSpace() == ADDRESS_SPACE_LOCAL)
-        LocalMemoryAtomics.push_back(RMWI);
+char NVPTXAtomicLowerLegacyPass::ID = 0;
 
-  bool Changed = false;
-  for (AtomicRMWInst *RMWI : LocalMemoryAtomics)
-    Changed |= lowerAtomicRMWInst(RMWI);
-  return Changed;
-}
-
-char NVPTXAtomicLower::ID = 0;
-
-INITIALIZE_PASS(NVPTXAtomicLower, "nvptx-atomic-lower",
+INITIALIZE_PASS(NVPTXAtomicLowerLegacyPass, "nvptx-atomic-lower",
                 "Lower atomics of local memory to simple load/stores", false,
                 false)
 
-FunctionPass *llvm::createNVPTXAtomicLowerPass() {
-  return new NVPTXAtomicLower();
+FunctionPass *llvm::createNVPTXAtomicLowerLegacyPass() {
+  return new NVPTXAtomicLowerLegacyPass();
+}
+
+PreservedAnalyses NVPTXAtomicLowerPass::run(Function &F,
+                                            FunctionAnalysisManager &FAM) {
+  if (!lowerLocalMemoryAtomics(F))
+    return PreservedAnalyses::all();
+  return PreservedAnalyses::none().preserveSet<CFGAnalyses>();
 }
diff --git a/llvm/lib/Target/NVPTX/NVPTXAtomicLower.h b/llvm/lib/Target/NVPTX/NVPTXAtomicLower.h
index faf5765a7d3df..bf0e1179ac22c 100644
--- a/llvm/lib/Target/NVPTX/NVPTXAtomicLower.h
+++ b/llvm/lib/Target/NVPTX/NVPTXAtomicLower.h
@@ -16,7 +16,7 @@
 namespace llvm {
 class FunctionPass;
 
-extern FunctionPass *createNVPTXAtomicLowerPass();
+extern FunctionPass *createNVPTXAtomicLowerLegacyPass();
 } // end namespace llvm
 
 #endif
diff --git a/llvm/lib/Target/NVPTX/NVPTXPassRegistry.def b/llvm/lib/Target/NVPTX/NVPTXPassRegistry.def
index a8e6c27ece6f6..ea1c92202b04e 100644
--- a/llvm/lib/Target/NVPTX/NVPTXPassRegistry.def
+++ b/llvm/lib/Target/NVPTX/NVPTXPassRegistry.def
@@ -41,6 +41,7 @@ FUNCTION_ALIAS_ANALYSIS("nvptx-aa", NVPTXAA())
 #endif
 FUNCTION_PASS("nvvm-intr-range", NVVMIntrRangePass())
 FUNCTION_PASS("nvptx-copy-byval-args", NVPTXCopyByValArgsPass())
+FUNCTION_PASS("nvptx-atomic-lower", NVPTXAtomicLowerPass())
 FUNCTION_PASS("nvptx-mark-kernel-ptrs-global", NVPTXMarkKernelPtrsGlobalPass())
 FUNCTION_PASS("nvptx-tag-invariant-loads", NVPTXTagInvariantLoadsPass())
 FUNCTION_PASS("nvptx-ir-peephole", NVPTXIRPeepholePass())
diff --git a/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp b/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp
index 79b1bd80d4fdc..aa71592844c92 100644
--- a/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp
+++ b/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp
@@ -104,7 +104,7 @@ extern "C" LLVM_ABI LLVM_EXTERNAL_VISIBILITY void LLVMInitializeNVPTXTarget() {
   initializeNVPTXAllocaHoistingPass(PR);
   initializeNVPTXAsmPrinterPass(PR);
   initializeNVPTXAssignValidGlobalNamesLegacyPassPass(PR);
-  initializeNVPTXAtomicLowerPass(PR);
+  initializeNVPTXAtomicLowerLegacyPassPass(PR);
   initializeNVPTXLowerArgsLegacyPassPass(PR);
   initializeNVPTXPromoteParamAlignLegacyPassPass(PR);
   initializeNVPTXMarkKernelPtrsGlobalLegacyPassPass(PR);
@@ -286,7 +286,7 @@ void NVPTXPassConfig::addAddressSpaceInferencePasses() {
   // TODO: Consider running InferAddressSpaces during opt, earlier in the
   // compilation flow.
   addPass(createInferAddressSpacesPass());
-  addPass(createNVPTXAtomicLowerPass());
+  addPass(createNVPTXAtomicLowerLegacyPass());
 }
 
 void NVPTXPassConfig::addStraightLineScalarOptimizationPasses() {

>From 2b377da60e139185613f8f72a402ca259a79098b Mon Sep 17 00:00:00 2001
From: Alex MacLean <amaclean at nvidia.com>
Date: Mon, 10 Aug 2026 20:32:06 -0700
Subject: [PATCH 2/2] address comments

---
 llvm/lib/Target/NVPTX/NVPTX.h                |  1 +
 llvm/lib/Target/NVPTX/NVPTXAtomicLower.cpp   |  1 -
 llvm/lib/Target/NVPTX/NVPTXAtomicLower.h     | 22 --------------------
 llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp |  1 -
 4 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 llvm/lib/Target/NVPTX/NVPTXAtomicLower.h

diff --git a/llvm/lib/Target/NVPTX/NVPTX.h b/llvm/lib/Target/NVPTX/NVPTX.h
index 4b378042fd3f9..d2ce38efc20b5 100644
--- a/llvm/lib/Target/NVPTX/NVPTX.h
+++ b/llvm/lib/Target/NVPTX/NVPTX.h
@@ -46,6 +46,7 @@ FunctionPass *createNVPTXISelDag(NVPTXTargetMachine &TM,
 ModulePass *createNVPTXAssignValidGlobalNamesLegacyPass();
 ModulePass *createGenericToNVVMLegacyPass();
 ModulePass *createNVPTXCtorDtorLoweringLegacyPass();
+FunctionPass *createNVPTXAtomicLowerLegacyPass();
 FunctionPass *createNVVMIntrRangePass();
 ModulePass *createNVVMReflectPass(unsigned int SmVersion);
 MachineFunctionPass *createNVPTXPrologEpilogPass();
diff --git a/llvm/lib/Target/NVPTX/NVPTXAtomicLower.cpp b/llvm/lib/Target/NVPTX/NVPTXAtomicLower.cpp
index d9ee468e75e42..93495865e3368 100644
--- a/llvm/lib/Target/NVPTX/NVPTXAtomicLower.cpp
+++ b/llvm/lib/Target/NVPTX/NVPTXAtomicLower.cpp
@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "NVPTXAtomicLower.h"
 #include "NVPTX.h"
 #include "llvm/CodeGen/StackProtector.h"
 #include "llvm/IR/Function.h"
diff --git a/llvm/lib/Target/NVPTX/NVPTXAtomicLower.h b/llvm/lib/Target/NVPTX/NVPTXAtomicLower.h
deleted file mode 100644
index bf0e1179ac22c..0000000000000
--- a/llvm/lib/Target/NVPTX/NVPTXAtomicLower.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//===-- NVPTXAtomicLower.h - Lower atomics of local memory ------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-//  Lower atomics of local memory to simple load/stores
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TARGET_NVPTX_NVPTXATOMICLOWER_H
-#define LLVM_LIB_TARGET_NVPTX_NVPTXATOMICLOWER_H
-
-namespace llvm {
-class FunctionPass;
-
-extern FunctionPass *createNVPTXAtomicLowerLegacyPass();
-} // end namespace llvm
-
-#endif
diff --git a/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp b/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp
index aa71592844c92..ca097d987baa0 100644
--- a/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp
+++ b/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp
@@ -15,7 +15,6 @@
 #include "NVPTXAliasAnalysis.h"
 #include "NVPTXAllocaHoisting.h"
 #include "NVPTXAsmPrinter.h"
-#include "NVPTXAtomicLower.h"
 #include "NVPTXCtorDtorLowering.h"
 #include "NVPTXLowerAggrCopies.h"
 #include "NVPTXMachineFunctionInfo.h"



More information about the llvm-commits mailing list