Skip to content

Commit 4fcc54b

Browse files
author
anikelal
committed
Reverting changes from https://reviews.llvm.org/D120566 Do not allow a call to kernel
1 parent 078f02d commit 4fcc54b

9 files changed

+0
-354
lines changed

llvm/lib/Target/AMDGPU/AMDGPU.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -408,10 +408,6 @@ class AMDGPUSetWavePriorityPass
408408

409409
FunctionPass *createAMDGPUAnnotateUniformValuesLegacy();
410410

411-
ModulePass *createAMDGPULowerKernelCallsPass();
412-
void initializeAMDGPULowerKernelCallsPass(PassRegistry&);
413-
extern char &AMDGPULowerKernelCallsID;
414-
415411
ModulePass *createAMDGPUPrintfRuntimeBinding();
416412
void initializeAMDGPUPrintfRuntimeBindingPass(PassRegistry&);
417413
extern char &AMDGPUPrintfRuntimeBindingID;

llvm/lib/Target/AMDGPU/AMDGPULowerKernelCalls.cpp

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

llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,6 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeAMDGPUTarget() {
554554
initializeAMDGPUExternalAAWrapperPass(*PR);
555555
initializeAMDGPUImageIntrinsicOptimizerPass(*PR);
556556
initializeAMDGPUPrintfRuntimeBindingPass(*PR);
557-
initializeAMDGPULowerKernelCallsPass(*PR);
558557
initializeAMDGPUResourceUsageAnalysisPass(*PR);
559558
initializeGCNNSAReassignLegacyPass(*PR);
560559
initializeGCNPreRAOptimizationsLegacyPass(*PR);
@@ -1249,9 +1248,6 @@ void AMDGPUPassConfig::addIRPasses() {
12491248
if (LowerCtorDtor)
12501249
addPass(createAMDGPUCtorDtorLoweringLegacyPass());
12511250

1252-
// this pass should be performed on linked module
1253-
addPass(createAMDGPULowerKernelCallsPass());
1254-
12551251
if (isPassEnabled(EnableImageIntrinsicOptimizer))
12561252
addPass(createAMDGPUImageIntrinsicOptimizerPass(&TM));
12571253

llvm/lib/Target/AMDGPU/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ add_llvm_target(AMDGPUCodeGen
7474
AMDGPULowerBufferFatPointers.cpp
7575
AMDGPULowerKernelArguments.cpp
7676
AMDGPULowerKernelAttributes.cpp
77-
AMDGPULowerKernelCalls.cpp
7877
AMDGPULowerModuleLDSPass.cpp
7978
AMDGPUSwLowerLDS.cpp
8079
AMDGPUMachineFunction.cpp

llvm/test/CodeGen/AMDGPU/call-to-kernel-undefined.ll

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

llvm/test/CodeGen/AMDGPU/call-to-kernel.ll

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

llvm/test/CodeGen/AMDGPU/heterogeneous-debug-info_lower-kernel-calls.ll

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

llvm/test/CodeGen/AMDGPU/llc-pipeline.ll

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
; GCN-O0-NEXT: AMDGPU Remove Incompatible Functions
3333
; GCN-O0-NEXT: AMDGPU Printf lowering
3434
; GCN-O0-NEXT: Lower ctors and dtors for AMDGPU
35-
; GCN-O0-NEXT: AMDGPU Lower Kernel Calls
3635
; GCN-O0-NEXT: Expand variadic functions
3736
; GCN-O0-NEXT: AMDGPU Inline All Functions
3837
; GCN-O0-NEXT: Inliner for always_inline functions
@@ -184,7 +183,6 @@
184183
; GCN-O1-NEXT: AMDGPU Remove Incompatible Functions
185184
; GCN-O1-NEXT: AMDGPU Printf lowering
186185
; GCN-O1-NEXT: Lower ctors and dtors for AMDGPU
187-
; GCN-O1-NEXT: AMDGPU Lower Kernel Calls
188186
; GCN-O1-NEXT: Expand variadic functions
189187
; GCN-O1-NEXT: AMDGPU Inline All Functions
190188
; GCN-O1-NEXT: Inliner for always_inline functions
@@ -471,7 +469,6 @@
471469
; GCN-O1-OPTS-NEXT: AMDGPU Remove Incompatible Functions
472470
; GCN-O1-OPTS-NEXT: AMDGPU Printf lowering
473471
; GCN-O1-OPTS-NEXT: Lower ctors and dtors for AMDGPU
474-
; GCN-O1-OPTS-NEXT: AMDGPU Lower Kernel Calls
475472
; GCN-O1-OPTS-NEXT: Expand variadic functions
476473
; GCN-O1-OPTS-NEXT: AMDGPU Inline All Functions
477474
; GCN-O1-OPTS-NEXT: Inliner for always_inline functions
@@ -786,7 +783,6 @@
786783
; GCN-O2-NEXT: AMDGPU Remove Incompatible Functions
787784
; GCN-O2-NEXT: AMDGPU Printf lowering
788785
; GCN-O2-NEXT: Lower ctors and dtors for AMDGPU
789-
; GCN-O2-NEXT: AMDGPU Lower Kernel Calls
790786
; GCN-O2-NEXT: FunctionPass Manager
791787
; GCN-O2-NEXT: AMDGPU Image Intrinsic Optimizer
792788
; GCN-O2-NEXT: Expand variadic functions
@@ -1107,7 +1103,6 @@
11071103
; GCN-O3-NEXT: AMDGPU Remove Incompatible Functions
11081104
; GCN-O3-NEXT: AMDGPU Printf lowering
11091105
; GCN-O3-NEXT: Lower ctors and dtors for AMDGPU
1110-
; GCN-O3-NEXT: AMDGPU Lower Kernel Calls
11111106
; GCN-O3-NEXT: FunctionPass Manager
11121107
; GCN-O3-NEXT: AMDGPU Image Intrinsic Optimizer
11131108
; GCN-O3-NEXT: Expand variadic functions

0 commit comments

Comments
 (0)