[llvm-branch-commits] [SPIRV] Add Pass suffix to NewPM Passes (PR #218206)
via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Sat Aug 22 23:06:52 PDT 2026
llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-backend-spir-v
Author: Aiden Grossman (boomanaiden154)
<details>
<summary>Changes</summary>
To be consistent with naming in other targets and the middle-end.
---
Full diff: https://github.com/llvm/llvm-project/pull/218206.diff
13 Files Affected:
- (modified) llvm/lib/Target/SPIRV/SPIRV.h (+28-24)
- (modified) llvm/lib/Target/SPIRV/SPIRVCBufferAccess.cpp (+2-2)
- (added) llvm/lib/Target/SPIRV/SPIRVCBufferAccess.h (+23)
- (modified) llvm/lib/Target/SPIRV/SPIRVFinalizeShaderLinkage.cpp (+2-2)
- (modified) llvm/lib/Target/SPIRV/SPIRVLegalizeImplicitBinding.cpp (+2-2)
- (modified) llvm/lib/Target/SPIRV/SPIRVLegalizePointerCast.cpp (+2-2)
- (modified) llvm/lib/Target/SPIRV/SPIRVLegalizeZeroSizeArrays.cpp (+2-2)
- (modified) llvm/lib/Target/SPIRV/SPIRVMergeRegionExitTargets.cpp (+1-1)
- (modified) llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.cpp (+2-2)
- (modified) llvm/lib/Target/SPIRV/SPIRVPrepareGlobals.cpp (+2-2)
- (modified) llvm/lib/Target/SPIRV/SPIRVPushConstantAccess.cpp (+2-2)
- (modified) llvm/lib/Target/SPIRV/SPIRVRegularizer.cpp (+2-2)
- (modified) llvm/lib/Target/SPIRV/SPIRVStructurizer.cpp (+2-2)
``````````diff
diff --git a/llvm/lib/Target/SPIRV/SPIRV.h b/llvm/lib/Target/SPIRV/SPIRV.h
index 688a72151d892..24dee6790318e 100644
--- a/llvm/lib/Target/SPIRV/SPIRV.h
+++ b/llvm/lib/Target/SPIRV/SPIRV.h
@@ -20,93 +20,96 @@ class SPIRVSubtarget;
class InstructionSelector;
class RegisterBankInfo;
-class SPIRVPrepareFunctions
- : public RequiredPassInfoMixin<SPIRVPrepareFunctions> {
+class SPIRVPrepareFunctionsPass
+ : public RequiredPassInfoMixin<SPIRVPrepareFunctionsPass> {
const SPIRVTargetMachine &TM;
public:
- explicit SPIRVPrepareFunctions(const SPIRVTargetMachine &TM) : TM(TM) {}
+ explicit SPIRVPrepareFunctionsPass(const SPIRVTargetMachine &TM) : TM(TM) {}
PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
};
ModulePass *createSPIRVPrepareFunctionsPass(const SPIRVTargetMachine &TM);
-class SPIRVStructurizerWrapper
- : public RequiredPassInfoMixin<SPIRVStructurizerWrapper> {
+class SPIRVStructurizerPass
+ : public RequiredPassInfoMixin<SPIRVStructurizerPass> {
public:
PreservedAnalyses run(Function &M, FunctionAnalysisManager &AM);
};
FunctionPass *createSPIRVStructurizerPass();
-class SPIRVCBufferAccess : public RequiredPassInfoMixin<SPIRVCBufferAccess> {
+class SPIRVCBufferAccessPass
+ : public RequiredPassInfoMixin<SPIRVCBufferAccessPass> {
public:
PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
};
ModulePass *createSPIRVCBufferAccessLegacyPass();
-class SPIRVPushConstantAccess
- : public RequiredPassInfoMixin<SPIRVPushConstantAccess> {
+class SPIRVPushConstantAccessPass
+ : public RequiredPassInfoMixin<SPIRVPushConstantAccessPass> {
const SPIRVTargetMachine &TM;
public:
- SPIRVPushConstantAccess(const SPIRVTargetMachine &TM) : TM(TM) {}
+ SPIRVPushConstantAccessPass(const SPIRVTargetMachine &TM) : TM(TM) {}
PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
};
ModulePass *createSPIRVPushConstantAccessLegacyPass(SPIRVTargetMachine *TM);
-class SPIRVMergeRegionExitTargets
- : public RequiredPassInfoMixin<SPIRVMergeRegionExitTargets> {
+class SPIRVMergeRegionExitTargetsPass
+ : public RequiredPassInfoMixin<SPIRVMergeRegionExitTargetsPass> {
public:
PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
};
FunctionPass *createSPIRVMergeRegionExitTargetsPass();
-class SPIRVLegalizeImplicitBinding
- : public RequiredPassInfoMixin<SPIRVLegalizeImplicitBinding> {
+class SPIRVLegalizeImplicitBindingPass
+ : public RequiredPassInfoMixin<SPIRVLegalizeImplicitBindingPass> {
public:
PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
};
ModulePass *createSPIRVLegalizeImplicitBindingPass();
-class SPIRVLegalizeZeroSizeArrays
- : public RequiredPassInfoMixin<SPIRVLegalizeZeroSizeArrays> {
+class SPIRVLegalizeZeroSizeArraysPass
+ : public RequiredPassInfoMixin<SPIRVLegalizeZeroSizeArraysPass> {
const SPIRVTargetMachine &TM;
public:
- SPIRVLegalizeZeroSizeArrays(const SPIRVTargetMachine &TM) : TM(TM) {}
+ SPIRVLegalizeZeroSizeArraysPass(const SPIRVTargetMachine &TM) : TM(TM) {}
PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
};
ModulePass *createSPIRVLegalizeZeroSizeArraysPass(const SPIRVTargetMachine &TM);
-class SPIRVFinalizeShaderLinkage
- : public RequiredPassInfoMixin<SPIRVFinalizeShaderLinkage> {
+class SPIRVFinalizeShaderLinkagePass
+ : public RequiredPassInfoMixin<SPIRVFinalizeShaderLinkagePass> {
const SPIRVTargetMachine &TM;
public:
- SPIRVFinalizeShaderLinkage(const SPIRVTargetMachine &TM) : TM(TM) {}
+ SPIRVFinalizeShaderLinkagePass(const SPIRVTargetMachine &TM) : TM(TM) {}
PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
};
ModulePass *createSPIRVFinalizeShaderLinkagePass(const SPIRVTargetMachine &TM);
-class SPIRVLegalizePointerCast
- : public RequiredPassInfoMixin<SPIRVLegalizePointerCast> {
+class SPIRVLegalizePointerCastPass
+ : public RequiredPassInfoMixin<SPIRVLegalizePointerCastPass> {
const SPIRVTargetMachine &TM;
public:
- explicit SPIRVLegalizePointerCast(const SPIRVTargetMachine &TM) : TM(TM) {}
+ explicit SPIRVLegalizePointerCastPass(const SPIRVTargetMachine &TM)
+ : TM(TM) {}
PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
};
FunctionPass *createSPIRVLegalizePointerCastPass(SPIRVTargetMachine *TM);
-class SPIRVRegularizer : public RequiredPassInfoMixin<SPIRVRegularizer> {
+class SPIRVRegularizerPass
+ : public RequiredPassInfoMixin<SPIRVRegularizerPass> {
public:
PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
};
@@ -127,7 +130,8 @@ class SPIRVEmitIntrinsicsPass
ModulePass *createSPIRVEmitIntrinsicsPass(const SPIRVTargetMachine &TM);
-class SPIRVPrepareGlobals : public RequiredPassInfoMixin<SPIRVPrepareGlobals> {
+class SPIRVPrepareGlobalsPass
+ : public RequiredPassInfoMixin<SPIRVPrepareGlobalsPass> {
public:
PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
};
diff --git a/llvm/lib/Target/SPIRV/SPIRVCBufferAccess.cpp b/llvm/lib/Target/SPIRV/SPIRVCBufferAccess.cpp
index a47aa264ec251..bff5759f1e4da 100644
--- a/llvm/lib/Target/SPIRV/SPIRVCBufferAccess.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVCBufferAccess.cpp
@@ -134,8 +134,8 @@ static bool replaceCBufferAccesses(Module &M) {
return true;
}
-PreservedAnalyses SPIRVCBufferAccess::run(Module &M,
- ModuleAnalysisManager &AM) {
+PreservedAnalyses SPIRVCBufferAccessPass::run(Module &M,
+ ModuleAnalysisManager &AM) {
if (replaceCBufferAccesses(M)) {
return PreservedAnalyses::none();
}
diff --git a/llvm/lib/Target/SPIRV/SPIRVCBufferAccess.h b/llvm/lib/Target/SPIRV/SPIRVCBufferAccess.h
new file mode 100644
index 0000000000000..144fa479aed76
--- /dev/null
+++ b/llvm/lib/Target/SPIRV/SPIRVCBufferAccess.h
@@ -0,0 +1,23 @@
+//===- SPIRVCBufferAccess.h - Translate CBuffer Loads ----------*- 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
+//
+
+#ifndef LLVM_LIB_TARGET_SPIRV_SPIRVCBUFFERACCESS_H
+#define LLVM_LIB_TARGET_SPIRV_SPIRVCBUFFERACCESS_H
+
+#include "llvm/IR/PassManager.h"
+
+namespace llvm {
+
+class SPIRVCBufferAccessPass
+ : public RequiredPassInfoMixin<SPIRVCBufferAccessPass> {
+public:
+ PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
+};
+
+} // namespace llvm
+
+#endif // LLVM_LIB_TARGET_SPIRV_SPIRVCBUFFERACCESS_H
diff --git a/llvm/lib/Target/SPIRV/SPIRVFinalizeShaderLinkage.cpp b/llvm/lib/Target/SPIRV/SPIRVFinalizeShaderLinkage.cpp
index 3448587c8a4d5..05fbb8ed98860 100644
--- a/llvm/lib/Target/SPIRV/SPIRVFinalizeShaderLinkage.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVFinalizeShaderLinkage.cpp
@@ -75,8 +75,8 @@ class SPIRVFinalizeShaderLinkageLegacy : public ModulePass {
} // namespace
-PreservedAnalyses SPIRVFinalizeShaderLinkage::run(Module &M,
- ModuleAnalysisManager &AM) {
+PreservedAnalyses
+SPIRVFinalizeShaderLinkagePass::run(Module &M, ModuleAnalysisManager &AM) {
return finalizeShaderLinkage(TM, M) ? PreservedAnalyses::none()
: PreservedAnalyses::all();
}
diff --git a/llvm/lib/Target/SPIRV/SPIRVLegalizeImplicitBinding.cpp b/llvm/lib/Target/SPIRV/SPIRVLegalizeImplicitBinding.cpp
index 2222c87a7a1ba..ef3190dd84bb8 100644
--- a/llvm/lib/Target/SPIRV/SPIRVLegalizeImplicitBinding.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVLegalizeImplicitBinding.cpp
@@ -221,8 +221,8 @@ bool SPIRVLegalizeImplicitBindingImpl::runOnModule(Module &M) {
}
} // namespace
-PreservedAnalyses SPIRVLegalizeImplicitBinding::run(Module &M,
- ModuleAnalysisManager &AM) {
+PreservedAnalyses
+SPIRVLegalizeImplicitBindingPass::run(Module &M, ModuleAnalysisManager &AM) {
return SPIRVLegalizeImplicitBindingImpl().runOnModule(M)
? PreservedAnalyses::none()
: PreservedAnalyses::all();
diff --git a/llvm/lib/Target/SPIRV/SPIRVLegalizePointerCast.cpp b/llvm/lib/Target/SPIRV/SPIRVLegalizePointerCast.cpp
index 0e88bfea55262..5cbe2f9407e29 100644
--- a/llvm/lib/Target/SPIRV/SPIRVLegalizePointerCast.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVLegalizePointerCast.cpp
@@ -651,8 +651,8 @@ class SPIRVLegalizePointerCastLegacy : public FunctionPass {
};
} // namespace
-PreservedAnalyses SPIRVLegalizePointerCast::run(Function &F,
- FunctionAnalysisManager &AM) {
+PreservedAnalyses
+SPIRVLegalizePointerCastPass::run(Function &F, FunctionAnalysisManager &AM) {
return SPIRVLegalizePointerCastImpl(TM).run(F) ? PreservedAnalyses::none()
: PreservedAnalyses::all();
}
diff --git a/llvm/lib/Target/SPIRV/SPIRVLegalizeZeroSizeArrays.cpp b/llvm/lib/Target/SPIRV/SPIRVLegalizeZeroSizeArrays.cpp
index 264b1d5926aa2..4a6aebfc2a86c 100644
--- a/llvm/lib/Target/SPIRV/SPIRVLegalizeZeroSizeArrays.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVLegalizeZeroSizeArrays.cpp
@@ -345,8 +345,8 @@ bool SPIRVLegalizeZeroSizeArraysImpl::runOnModule(Module &M) {
} // namespace
-PreservedAnalyses SPIRVLegalizeZeroSizeArrays::run(Module &M,
- ModuleAnalysisManager &AM) {
+PreservedAnalyses
+SPIRVLegalizeZeroSizeArraysPass::run(Module &M, ModuleAnalysisManager &AM) {
SPIRVLegalizeZeroSizeArraysImpl Impl(TM);
if (Impl.runOnModule(M))
return PreservedAnalyses::none();
diff --git a/llvm/lib/Target/SPIRV/SPIRVMergeRegionExitTargets.cpp b/llvm/lib/Target/SPIRV/SPIRVMergeRegionExitTargets.cpp
index d734565a2184c..8572e4df75c5b 100644
--- a/llvm/lib/Target/SPIRV/SPIRVMergeRegionExitTargets.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVMergeRegionExitTargets.cpp
@@ -185,7 +185,7 @@ class SPIRVMergeRegionExitTargetsLegacy : public FunctionPass {
} // namespace
PreservedAnalyses
-SPIRVMergeRegionExitTargets::run(Function &F, FunctionAnalysisManager &AM) {
+SPIRVMergeRegionExitTargetsPass::run(Function &F, FunctionAnalysisManager &AM) {
auto &LI = AM.getResult<LoopAnalysis>(F);
auto &RegionInfo = AM.getResult<SPIRVConvergenceRegionAnalysis>(F);
return runImpl(F, LI, RegionInfo) ? PreservedAnalyses::none()
diff --git a/llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.cpp b/llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.cpp
index 624d8dd8c0383..a0cd00a9deef3 100644
--- a/llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.cpp
@@ -903,8 +903,8 @@ bool SPIRVPrepareFunctionsImpl::runOnModule(Module &M) {
return Changed;
}
-PreservedAnalyses SPIRVPrepareFunctions::run(Module &M,
- ModuleAnalysisManager &AM) {
+PreservedAnalyses SPIRVPrepareFunctionsPass::run(Module &M,
+ ModuleAnalysisManager &AM) {
FunctionAnalysisManager &FAM =
AM.getResult<FunctionAnalysisManagerModuleProxy>(M).getManager();
auto GetTTI = [&FAM](Function &F) -> const TargetTransformInfo & {
diff --git a/llvm/lib/Target/SPIRV/SPIRVPrepareGlobals.cpp b/llvm/lib/Target/SPIRV/SPIRVPrepareGlobals.cpp
index 46208a94f7afe..adec5db688ecb 100644
--- a/llvm/lib/Target/SPIRV/SPIRVPrepareGlobals.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVPrepareGlobals.cpp
@@ -159,8 +159,8 @@ char SPIRVPrepareGlobalsLegacy::ID = 0;
INITIALIZE_PASS(SPIRVPrepareGlobalsLegacy, "spirv-prepare-globals",
"SPIRV prepare global variables", false, false)
-PreservedAnalyses SPIRVPrepareGlobals::run(Module &M,
- ModuleAnalysisManager &AM) {
+PreservedAnalyses SPIRVPrepareGlobalsPass::run(Module &M,
+ ModuleAnalysisManager &AM) {
return SPIRVPrepareGlobalsImpl().runOnModule(M) ? PreservedAnalyses::none()
: PreservedAnalyses::all();
}
diff --git a/llvm/lib/Target/SPIRV/SPIRVPushConstantAccess.cpp b/llvm/lib/Target/SPIRV/SPIRVPushConstantAccess.cpp
index fb0bf13cbce4e..634c76574163b 100644
--- a/llvm/lib/Target/SPIRV/SPIRVPushConstantAccess.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVPushConstantAccess.cpp
@@ -64,8 +64,8 @@ static bool replacePushConstantAccesses(Module &M, SPIRVGlobalRegistry *GR) {
return Changed;
}
-PreservedAnalyses SPIRVPushConstantAccess::run(Module &M,
- ModuleAnalysisManager &AM) {
+PreservedAnalyses SPIRVPushConstantAccessPass::run(Module &M,
+ ModuleAnalysisManager &AM) {
const SPIRVSubtarget *ST = TM.getSubtargetImpl();
SPIRVGlobalRegistry *GR = ST->getSPIRVGlobalRegistry();
return replacePushConstantAccesses(M, GR) ? PreservedAnalyses::none()
diff --git a/llvm/lib/Target/SPIRV/SPIRVRegularizer.cpp b/llvm/lib/Target/SPIRV/SPIRVRegularizer.cpp
index a25db11c8b2b8..97517e4973150 100644
--- a/llvm/lib/Target/SPIRV/SPIRVRegularizer.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVRegularizer.cpp
@@ -213,8 +213,8 @@ static bool runImpl(Function &F) {
return true;
}
-PreservedAnalyses SPIRVRegularizer::run(Function &F,
- FunctionAnalysisManager &AM) {
+PreservedAnalyses SPIRVRegularizerPass::run(Function &F,
+ FunctionAnalysisManager &AM) {
return runImpl(F) ? PreservedAnalyses::none() : PreservedAnalyses::all();
}
diff --git a/llvm/lib/Target/SPIRV/SPIRVStructurizer.cpp b/llvm/lib/Target/SPIRV/SPIRVStructurizer.cpp
index 412eb0a8227f6..9ac7ac76a9a95 100644
--- a/llvm/lib/Target/SPIRV/SPIRVStructurizer.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVStructurizer.cpp
@@ -1152,8 +1152,8 @@ FunctionPass *llvm::createSPIRVStructurizerPass() {
return new SPIRVStructurizer();
}
-PreservedAnalyses SPIRVStructurizerWrapper::run(Function &F,
- FunctionAnalysisManager &AM) {
+PreservedAnalyses SPIRVStructurizerPass::run(Function &F,
+ FunctionAnalysisManager &AM) {
LoopInfo &LI = AM.getResult<LoopAnalysis>(F);
ConvergenceRegionInfo &RegionInfo =
AM.getResult<SPIRVConvergenceRegionAnalysis>(F);
``````````
</details>
https://github.com/llvm/llvm-project/pull/218206
More information about the llvm-branch-commits
mailing list