diff options
| author | Nikolay Haustov <Nikolay.Haustov@amd.com> | 2016-05-06 14:59:04 +0000 |
|---|---|---|
| committer | Nikolay Haustov <Nikolay.Haustov@amd.com> | 2016-05-06 14:59:04 +0000 |
| commit | 6eb050ea4ea1634c02c5996889a1384e335c05f4 (patch) | |
| tree | 656dabc9f6466733aacca409897cadf61208190f /llvm/lib/Target/AMDGPU | |
| parent | 5122c64fd8f00ec71242560ed1b5f94236023965 (diff) | |
| download | bcm5719-llvm-6eb050ea4ea1634c02c5996889a1384e335c05f4.tar.gz bcm5719-llvm-6eb050ea4ea1634c02c5996889a1384e335c05f4.zip | |
Revert "AMDGPU/SI: Add amdgpu_kernel calling convention. Part 2."
This reverts commit 47486d52454d60cdf6becc0b2efe533c73794380.
It broke calling OpenCL kernel from another kernel.
llvm-svn: 268739
Diffstat (limited to 'llvm/lib/Target/AMDGPU')
| -rw-r--r-- | llvm/lib/Target/AMDGPU/AMDGPUMachineFunction.cpp | 9 | ||||
| -rw-r--r-- | llvm/lib/Target/AMDGPU/AMDGPUMachineFunction.h | 5 |
2 files changed, 5 insertions, 9 deletions
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUMachineFunction.cpp b/llvm/lib/Target/AMDGPU/AMDGPUMachineFunction.cpp index 2f86e0d66fd..c824ab83ad8 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPUMachineFunction.cpp +++ b/llvm/lib/Target/AMDGPU/AMDGPUMachineFunction.cpp @@ -13,12 +13,5 @@ AMDGPUMachineFunction::AMDGPUMachineFunction(const MachineFunction &MF) : LDSSize(0), ABIArgOffset(0), ScratchSize(0), - IsKernel(MF.getFunction()->getCallingConv() == llvm::CallingConv::AMDGPU_KERNEL || - MF.getFunction()->getCallingConv() == llvm::CallingConv::SPIR_KERNEL) -{ -} - -bool AMDGPUMachineFunction::isKernel() const -{ - return IsKernel; + IsKernel(true) { } diff --git a/llvm/lib/Target/AMDGPU/AMDGPUMachineFunction.h b/llvm/lib/Target/AMDGPU/AMDGPUMachineFunction.h index 247837a71f4..2ef3bf5f2fb 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPUMachineFunction.h +++ b/llvm/lib/Target/AMDGPU/AMDGPUMachineFunction.h @@ -29,7 +29,10 @@ public: /// Start of implicit kernel args unsigned ABIArgOffset; - bool isKernel() const; + bool isKernel() const { + // FIXME: Assume everything is a kernel until function calls are supported. + return true; + } unsigned ScratchSize; bool IsKernel; |
