maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "AMDGPU/SI: Use amdgpu_kernel calling convention for OpenCL kernels." 

This reverts commit f7053ec90d0fc56f0837e43c2c759e85b56c21a1.

It broke calling OpenCL kernel from another kernel.

llvm-svn: 268740
This commit is contained in:
Nikolay Haustov 2016-05-06 15:00:51 +00:00
parent 6eb050ea4e
commit 1771948d72
3 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/lib/CodeGen/TargetInfo.cpp
View File

@ -6826,14 +6826,6 @@ void AMDGPUTargetCodeGenInfo::setTargetAttributes(
if (!FD) if (!FD)
return; return;
if (M.getLangOpts().OpenCL) {
if (FD->hasAttr<OpenCLKernelAttr>()) {
// Set amdgpu_kernel calling convention for OpenCL kernels.
llvm::Function *Fn = cast<llvm::Function>(GV);
Fn->setCallingConv(llvm::CallingConv::AMDGPU_KERNEL);
}
}
if (const auto Attr = FD->getAttr<AMDGPUNumVGPRAttr>()) { if (const auto Attr = FD->getAttr<AMDGPUNumVGPRAttr>()) {
llvm::Function *F = cast<llvm::Function>(GV); llvm::Function *F = cast<llvm::Function>(GV);
uint32_t NumVGPR = Attr->getNumVGPR(); uint32_t NumVGPR = Attr->getNumVGPR();

12
clang/test/CodeGenOpenCL/amdgpu-calling-conv.cl
View File

@ -1,12 +0,0 @@
// REQUIRES: amdgpu-registered-target
// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -S -emit-llvm -o - %s | FileCheck %s
// CHECK: define amdgpu_kernel void @calling_conv_amdgpu_kernel()
kernel void calling_conv_amdgpu_kernel()
{
}
// CHECK: define void @calling_conv_none()
void calling_conv_none()
{
}

8
clang/test/CodeGenOpenCL/amdgpu-num-gpr-attr.cl
View File

@ -5,23 +5,23 @@
__attribute__((amdgpu_num_vgpr(64))) // expected-no-diagnostics __attribute__((amdgpu_num_vgpr(64))) // expected-no-diagnostics
kernel void test_num_vgpr64() { kernel void test_num_vgpr64() {
// CHECK: define amdgpu_kernel void @test_num_vgpr64() [[ATTR_VGPR64:#[0-9]+]] // CHECK: define void @test_num_vgpr64() [[ATTR_VGPR64:#[0-9]+]]
} }
__attribute__((amdgpu_num_sgpr(32))) // expected-no-diagnostics __attribute__((amdgpu_num_sgpr(32))) // expected-no-diagnostics
kernel void test_num_sgpr32() { kernel void test_num_sgpr32() {
// CHECK: define amdgpu_kernel void @test_num_sgpr32() [[ATTR_SGPR32:#[0-9]+]] // CHECK: define void @test_num_sgpr32() [[ATTR_SGPR32:#[0-9]+]]
} }
__attribute__((amdgpu_num_vgpr(64), amdgpu_num_sgpr(32))) // expected-no-diagnostics __attribute__((amdgpu_num_vgpr(64), amdgpu_num_sgpr(32))) // expected-no-diagnostics
kernel void test_num_vgpr64_sgpr32() { kernel void test_num_vgpr64_sgpr32() {
// CHECK: define amdgpu_kernel void @test_num_vgpr64_sgpr32() [[ATTR_VGPR64_SGPR32:#[0-9]+]] // CHECK: define void @test_num_vgpr64_sgpr32() [[ATTR_VGPR64_SGPR32:#[0-9]+]]
} }
__attribute__((amdgpu_num_sgpr(20), amdgpu_num_vgpr(40))) // expected-no-diagnostics __attribute__((amdgpu_num_sgpr(20), amdgpu_num_vgpr(40))) // expected-no-diagnostics
kernel void test_num_sgpr20_vgpr40() { kernel void test_num_sgpr20_vgpr40() {
// CHECK: define amdgpu_kernel void @test_num_sgpr20_vgpr40() [[ATTR_SGPR20_VGPR40:#[0-9]+]] // CHECK: define void @test_num_sgpr20_vgpr40() [[ATTR_SGPR20_VGPR40:#[0-9]+]]
} }
__attribute__((amdgpu_num_vgpr(0))) // expected-no-diagnostics __attribute__((amdgpu_num_vgpr(0))) // expected-no-diagnostics