[llvm] 47d8608 - [NVPTX] Alphabetize NewPM pass classes and macros (NFC) (#216168)
via llvm-commits
llvm-commits at lists.llvm.org
Thu Aug 13 13:48:39 PDT 2026
Author: Alex MacLean
Date: 2026-08-13T20:48:34Z
New Revision: 47d86084abba30e93cef3cdf14c936b9deb2f05a
URL: https://github.com/llvm/llvm-project/commit/47d86084abba30e93cef3cdf14c936b9deb2f05a
DIFF: https://github.com/llvm/llvm-project/commit/47d86084abba30e93cef3cdf14c936b9deb2f05a.diff
LOG: [NVPTX] Alphabetize NewPM pass classes and macros (NFC) (#216168)
Also standardize use of `class` and parameter names.
Added:
Modified:
llvm/lib/Target/NVPTX/NVPTX.h
llvm/lib/Target/NVPTX/NVPTXPassRegistry.def
Removed:
################################################################################
diff --git a/llvm/lib/Target/NVPTX/NVPTX.h b/llvm/lib/Target/NVPTX/NVPTX.h
index 42f6d657d8c18..966c629e5892c 100644
--- a/llvm/lib/Target/NVPTX/NVPTX.h
+++ b/llvm/lib/Target/NVPTX/NVPTX.h
@@ -92,27 +92,46 @@ void initializeNVPTXTagInvariantLoadLegacyPassPass(PassRegistry &);
void initializeNVPTXIRPeepholePass(PassRegistry &);
void initializeNVPTXPrologEpilogLegacyPassPass(PassRegistry &);
-struct NVVMIntrRangePass : OptionalPassInfoMixin<NVVMIntrRangePass> {
- PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
+// Module passes
+class GenericToNVVMPass : public OptionalPassInfoMixin<GenericToNVVMPass> {
+public:
+ PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM);
};
-struct NVPTXIRPeepholePass : OptionalPassInfoMixin<NVPTXIRPeepholePass> {
- PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
+class NVPTXAssignValidGlobalNamesPass
+ : public RequiredPassInfoMixin<NVPTXAssignValidGlobalNamesPass> {
+public:
+ PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM);
};
-class NVPTXPeepholePass : public OptionalPassInfoMixin<NVPTXPeepholePass> {
+class NVPTXLowerArgsPass : public OptionalPassInfoMixin<NVPTXLowerArgsPass> {
+ TargetMachine &TM;
+
public:
- PreservedAnalyses run(MachineFunction &MF,
- MachineFunctionAnalysisManager &MFAM);
+ NVPTXLowerArgsPass(TargetMachine &TM) : TM(TM) {}
+ PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM);
+};
+
+class NVPTXPromoteParamAlignPass
+ : public OptionalPassInfoMixin<NVPTXPromoteParamAlignPass> {
+public:
+ PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM);
};
-struct NVVMReflectPass : OptionalPassInfoMixin<NVVMReflectPass> {
+class NVVMReflectPass : public OptionalPassInfoMixin<NVVMReflectPass> {
+ unsigned SmVersion;
+
+public:
NVVMReflectPass() : SmVersion(0) {}
NVVMReflectPass(unsigned SmVersion) : SmVersion(SmVersion) {}
- PreservedAnalyses run(Module &F, ModuleAnalysisManager &AM);
+ PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM);
+};
-private:
- unsigned SmVersion;
+// Function passes
+class NVPTXAllocaHoistingPass
+ : public RequiredPassInfoMixin<NVPTXAllocaHoistingPass> {
+public:
+ PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM);
};
class NVPTXAtomicLowerPass
@@ -121,8 +140,10 @@ class NVPTXAtomicLowerPass
PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM);
};
-struct GenericToNVVMPass : OptionalPassInfoMixin<GenericToNVVMPass> {
- PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
+class NVPTXCopyByValArgsPass
+ : public OptionalPassInfoMixin<NVPTXCopyByValArgsPass> {
+public:
+ PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM);
};
class NVPTXImageOptimizerPass
@@ -131,8 +152,9 @@ class NVPTXImageOptimizerPass
PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM);
};
-struct NVPTXCopyByValArgsPass : OptionalPassInfoMixin<NVPTXCopyByValArgsPass> {
- PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
+class NVPTXIRPeepholePass : public OptionalPassInfoMixin<NVPTXIRPeepholePass> {
+public:
+ PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM);
};
class NVPTXLowerAggrCopiesPass
@@ -141,9 +163,10 @@ class NVPTXLowerAggrCopiesPass
PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM);
};
-struct NVPTXPromoteParamAlignPass
- : OptionalPassInfoMixin<NVPTXPromoteParamAlignPass> {
- PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
+class NVPTXLowerAllocaPass
+ : public RequiredPassInfoMixin<NVPTXLowerAllocaPass> {
+public:
+ PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM);
};
class NVPTXLowerUnreachablePass
@@ -158,41 +181,33 @@ class NVPTXLowerUnreachablePass
PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM);
};
-class NVPTXReplaceImageHandlesPass
- : public RequiredPassInfoMixin<NVPTXReplaceImageHandlesPass> {
+class NVPTXMarkKernelPtrsGlobalPass
+ : public OptionalPassInfoMixin<NVPTXMarkKernelPtrsGlobalPass> {
public:
- PreservedAnalyses run(MachineFunction &MF,
- MachineFunctionAnalysisManager &MFAM);
+ PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM);
};
-struct NVPTXLowerArgsPass : OptionalPassInfoMixin<NVPTXLowerArgsPass> {
-private:
- TargetMachine &TM;
+class NVPTXTagInvariantLoadsPass
+ : public OptionalPassInfoMixin<NVPTXTagInvariantLoadsPass> {
+public:
+ PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM);
+};
+class NVVMIntrRangePass : public OptionalPassInfoMixin<NVVMIntrRangePass> {
public:
- NVPTXLowerArgsPass(TargetMachine &TM) : TM(TM) {};
- PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
+ PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM);
};
-class NVPTXPrologEpilogPass
- : public RequiredPassInfoMixin<NVPTXPrologEpilogPass> {
+// Machine function passes
+class NVPTXAddressFolderPass
+ : public OptionalPassInfoMixin<NVPTXAddressFolderPass> {
public:
PreservedAnalyses run(MachineFunction &MF,
MachineFunctionAnalysisManager &MFAM);
};
-struct NVPTXMarkKernelPtrsGlobalPass
- : OptionalPassInfoMixin<NVPTXMarkKernelPtrsGlobalPass> {
- PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
-};
-
-struct NVPTXTagInvariantLoadsPass
- : OptionalPassInfoMixin<NVPTXTagInvariantLoadsPass> {
- PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
-};
-
-class NVPTXAddressFolderPass
- : public OptionalPassInfoMixin<NVPTXAddressFolderPass> {
+class NVPTXForwardParamsPass
+ : public RequiredPassInfoMixin<NVPTXForwardParamsPass> {
public:
PreservedAnalyses run(MachineFunction &MF,
MachineFunctionAnalysisManager &MFAM);
@@ -203,36 +218,31 @@ class NVPTXISelDAGToDAGPass : public SelectionDAGISelPass {
NVPTXISelDAGToDAGPass(NVPTXTargetMachine &TM, CodeGenOptLevel OptLevel);
};
-class NVPTXProxyRegErasurePass
- : public RequiredPassInfoMixin<NVPTXProxyRegErasurePass> {
+class NVPTXPeepholePass : public OptionalPassInfoMixin<NVPTXPeepholePass> {
public:
PreservedAnalyses run(MachineFunction &MF,
MachineFunctionAnalysisManager &MFAM);
};
-class NVPTXForwardParamsPass
- : public RequiredPassInfoMixin<NVPTXForwardParamsPass> {
+class NVPTXPrologEpilogPass
+ : public RequiredPassInfoMixin<NVPTXPrologEpilogPass> {
public:
PreservedAnalyses run(MachineFunction &MF,
MachineFunctionAnalysisManager &MFAM);
};
-class NVPTXAssignValidGlobalNamesPass
- : public RequiredPassInfoMixin<NVPTXAssignValidGlobalNamesPass> {
-public:
- PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM);
-};
-
-class NVPTXLowerAllocaPass
- : public RequiredPassInfoMixin<NVPTXLowerAllocaPass> {
+class NVPTXProxyRegErasurePass
+ : public RequiredPassInfoMixin<NVPTXProxyRegErasurePass> {
public:
- PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM);
+ PreservedAnalyses run(MachineFunction &MF,
+ MachineFunctionAnalysisManager &MFAM);
};
-class NVPTXAllocaHoistingPass
- : public RequiredPassInfoMixin<NVPTXAllocaHoistingPass> {
+class NVPTXReplaceImageHandlesPass
+ : public RequiredPassInfoMixin<NVPTXReplaceImageHandlesPass> {
public:
- PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM);
+ PreservedAnalyses run(MachineFunction &MF,
+ MachineFunctionAnalysisManager &MFAM);
};
namespace NVPTX {
diff --git a/llvm/lib/Target/NVPTX/NVPTXPassRegistry.def b/llvm/lib/Target/NVPTX/NVPTXPassRegistry.def
index 73778c0fcd344..118a34117773c 100644
--- a/llvm/lib/Target/NVPTX/NVPTXPassRegistry.def
+++ b/llvm/lib/Target/NVPTX/NVPTXPassRegistry.def
@@ -19,11 +19,11 @@
MODULE_PASS("generic-to-nvvm", GenericToNVVMPass())
MODULE_PASS("nvptx-asm-printer-begin", NVPTXAsmPrinterBeginPass())
MODULE_PASS("nvptx-asm-printer-end", NVPTXAsmPrinterEndPass())
+MODULE_PASS("nvptx-assign-valid-global-names", NVPTXAssignValidGlobalNamesPass())
MODULE_PASS("nvptx-lower-args", NVPTXLowerArgsPass(*this))
MODULE_PASS("nvptx-lower-ctor-dtor", NVPTXCtorDtorLoweringPass())
MODULE_PASS("nvptx-promote-param-align", NVPTXPromoteParamAlignPass())
MODULE_PASS("nvvm-reflect", NVVMReflectPass())
-MODULE_PASS("nvptx-assign-valid-global-names", NVPTXAssignValidGlobalNamesPass())
#undef MODULE_PASS
#ifndef FUNCTION_ANALYSIS
@@ -41,31 +41,31 @@ FUNCTION_ALIAS_ANALYSIS("nvptx-aa", NVPTXAA())
#ifndef FUNCTION_PASS
#define FUNCTION_PASS(NAME, CREATE_PASS)
#endif
-FUNCTION_PASS("nvvm-intr-range", NVVMIntrRangePass())
-FUNCTION_PASS("nvptx-image-optimizer", NVPTXImageOptimizerPass())
-FUNCTION_PASS("nvptx-copy-byval-args", NVPTXCopyByValArgsPass())
+FUNCTION_PASS("nvptx-alloca-hoisting", NVPTXAllocaHoistingPass())
FUNCTION_PASS("nvptx-atomic-lower", NVPTXAtomicLowerPass())
-FUNCTION_PASS("nvptx-mark-kernel-ptrs-global", NVPTXMarkKernelPtrsGlobalPass())
+FUNCTION_PASS("nvptx-copy-byval-args", NVPTXCopyByValArgsPass())
+FUNCTION_PASS("nvptx-image-optimizer", NVPTXImageOptimizerPass())
+FUNCTION_PASS("nvptx-ir-peephole", NVPTXIRPeepholePass())
FUNCTION_PASS("nvptx-lower-aggr-copies", NVPTXLowerAggrCopiesPass())
-FUNCTION_PASS("nvptx-tag-invariant-loads", NVPTXTagInvariantLoadsPass())
+FUNCTION_PASS("nvptx-lower-alloca", NVPTXLowerAllocaPass())
FUNCTION_PASS("nvptx-lower-unreachable",
NVPTXLowerUnreachablePass(Options.TrapUnreachable,
Options.NoTrapAfterNoreturn))
-FUNCTION_PASS("nvptx-ir-peephole", NVPTXIRPeepholePass())
-FUNCTION_PASS("nvptx-alloca-hoisting", NVPTXAllocaHoistingPass())
-FUNCTION_PASS("nvptx-lower-alloca", NVPTXLowerAllocaPass())
+FUNCTION_PASS("nvptx-mark-kernel-ptrs-global", NVPTXMarkKernelPtrsGlobalPass())
+FUNCTION_PASS("nvptx-tag-invariant-loads", NVPTXTagInvariantLoadsPass())
+FUNCTION_PASS("nvvm-intr-range", NVVMIntrRangePass())
#undef FUNCTION_PASS
#ifndef MACHINE_FUNCTION_PASS
#define MACHINE_FUNCTION_PASS(NAME, CREATE_PASS)
#endif
-MACHINE_FUNCTION_PASS("nvptx-asm-printer", NVPTXAsmPrinterPass())
-MACHINE_FUNCTION_PASS("nvptx-replace-image-handles",
- NVPTXReplaceImageHandlesPass())
-MACHINE_FUNCTION_PASS("nvptx-isel", NVPTXISelDAGToDAGPass(*this, getOptLevel()))
MACHINE_FUNCTION_PASS("nvptx-address-folder", NVPTXAddressFolderPass())
+MACHINE_FUNCTION_PASS("nvptx-asm-printer", NVPTXAsmPrinterPass())
MACHINE_FUNCTION_PASS("nvptx-forward-params", NVPTXForwardParamsPass())
-MACHINE_FUNCTION_PASS("nvptx-prolog-epilog", NVPTXPrologEpilogPass())
+MACHINE_FUNCTION_PASS("nvptx-isel", NVPTXISelDAGToDAGPass(*this, getOptLevel()))
MACHINE_FUNCTION_PASS("nvptx-peephole", NVPTXPeepholePass())
+MACHINE_FUNCTION_PASS("nvptx-prolog-epilog", NVPTXPrologEpilogPass())
MACHINE_FUNCTION_PASS("nvptx-proxyreg-erasure", NVPTXProxyRegErasurePass())
+MACHINE_FUNCTION_PASS("nvptx-replace-image-handles",
+ NVPTXReplaceImageHandlesPass())
#undef MACHINE_FUNCTION_PASS
More information about the llvm-commits
mailing list