Skip to content

Commit 5311957

Browse files
committed
[AMDGPU] Remove the pass AMDGPUPromoteKernelArguments
1 parent bfda0fe commit 5311957

File tree

7 files changed

+52
-313
lines changed

7 files changed

+52
-313
lines changed

llvm/lib/Target/AMDGPU/AMDGPU.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,6 @@ FunctionPass *createAMDGPULowerKernelArgumentsPass();
113113
void initializeAMDGPULowerKernelArgumentsPass(PassRegistry &);
114114
extern char &AMDGPULowerKernelArgumentsID;
115115

116-
FunctionPass *createAMDGPUPromoteKernelArgumentsPass();
117-
void initializeAMDGPUPromoteKernelArgumentsPass(PassRegistry &);
118-
extern char &AMDGPUPromoteKernelArgumentsID;
119-
120-
struct AMDGPUPromoteKernelArgumentsPass
121-
: PassInfoMixin<AMDGPUPromoteKernelArgumentsPass> {
122-
PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
123-
};
124-
125116
ModulePass *createAMDGPULowerKernelAttributesPass();
126117
void initializeAMDGPULowerKernelAttributesPass(PassRegistry &);
127118
extern char &AMDGPULowerKernelAttributesID;

llvm/lib/Target/AMDGPU/AMDGPUPassRegistry.def

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ FUNCTION_PASS("amdgpu-lower-kernel-attributes",
5959
FUNCTION_PASS("amdgpu-promote-alloca", AMDGPUPromoteAllocaPass(*this))
6060
FUNCTION_PASS("amdgpu-promote-alloca-to-vector",
6161
AMDGPUPromoteAllocaToVectorPass(*this))
62-
FUNCTION_PASS("amdgpu-promote-kernel-arguments",
63-
AMDGPUPromoteKernelArgumentsPass())
6462
FUNCTION_PASS("amdgpu-rewrite-undef-for-phi", AMDGPURewriteUndefForPHIPass())
6563
FUNCTION_PASS("amdgpu-simplifylib", AMDGPUSimplifyLibCallsPass())
6664
FUNCTION_PASS("amdgpu-unify-divergent-exit-nodes",

llvm/lib/Target/AMDGPU/AMDGPUPromoteKernelArguments.cpp

Lines changed: 0 additions & 219 deletions
This file was deleted.

llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -435,11 +435,6 @@ static cl::opt<bool> EnablePreRAOptimizations(
435435
cl::desc("Enable Pre-RA optimizations pass"), cl::init(true),
436436
cl::Hidden);
437437

438-
static cl::opt<bool> EnablePromoteKernelArguments(
439-
"amdgpu-enable-promote-kernel-arguments",
440-
cl::desc("Enable promotion of flat kernel pointer arguments to global"),
441-
cl::Hidden, cl::init(true));
442-
443438
static cl::opt<bool> EnableImageIntrinsicOptimizer(
444439
"amdgpu-enable-image-intrinsic-optimizer",
445440
cl::desc("Enable image intrinsic optimizer pass"), cl::init(true),
@@ -520,7 +515,6 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeAMDGPUTarget() {
520515
initializeAMDGPUArgumentUsageInfoPass(*PR);
521516
initializeAMDGPUAtomicOptimizerPass(*PR);
522517
initializeAMDGPULowerKernelArgumentsPass(*PR);
523-
initializeAMDGPUPromoteKernelArgumentsPass(*PR);
524518
initializeAMDGPULowerKernelAttributesPass(*PR);
525519
initializeAMDGPUExportKernelRuntimeHandlesLegacyPass(*PR);
526520
initializeAMDGPUPostLegalizerCombinerPass(*PR);
@@ -854,13 +848,6 @@ void AMDGPUTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {
854848

855849
FunctionPassManager FPM;
856850

857-
// Add promote kernel arguments pass to the opt pipeline right before
858-
// infer address spaces which is needed to do actual address space
859-
// rewriting.
860-
if (Level.getSpeedupLevel() > OptimizationLevel::O1.getSpeedupLevel() &&
861-
EnablePromoteKernelArguments)
862-
FPM.addPass(AMDGPUPromoteKernelArgumentsPass());
863-
864851
// Add infer address spaces pass to the opt pipeline after inlining
865852
// but before SROA to increase SROA opportunities.
866853
FPM.addPass(InferAddressSpacesPass());

llvm/lib/Target/AMDGPU/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ add_llvm_target(AMDGPUCodeGen
9191
AMDGPUPreloadKernArgProlog.cpp
9292
AMDGPUPrintfRuntimeBinding.cpp
9393
AMDGPUPromoteAlloca.cpp
94-
AMDGPUPromoteKernelArguments.cpp
9594
AMDGPURegBankCombiner.cpp
9695
AMDGPURegBankLegalize.cpp
9796
AMDGPURegBankLegalizeHelper.cpp

0 commit comments

Comments
 (0)