Author: Hongyu Chen Date: 2025-12-03T16:53:25+08:00 New Revision: 4b0a9759395f3e9cbefa9c194ca331f4d88003bf
URL: https://github.com/llvm/llvm-project/commit/4b0a9759395f3e9cbefa9c194ca331f4d88003bf DIFF: https://github.com/llvm/llvm-project/commit/4b0a9759395f3e9cbefa9c194ca331f4d88003bf.diff LOG: [OpenCL][NVPTX] Don't set calling convention for OpenCL kernel (#170170) Fixes #154772 We previously set `ptx_kernel` for all kernels. But it's incorrect to add `ptx_kernel` to the stub version of kernel introduced in #115821. This patch copies the workaround of AMDGPU. Added: Modified: clang/lib/CodeGen/Targets/AMDGPU.cpp clang/lib/CodeGen/Targets/NVPTX.cpp clang/lib/CodeGen/Targets/SPIR.cpp clang/lib/Sema/SemaType.cpp clang/test/CodeGenOpenCL/ptx-calls.cl clang/test/CodeGenOpenCL/reflect.cl Removed: ################################################################################ diff --git a/clang/lib/CodeGen/Targets/AMDGPU.cpp b/clang/lib/CodeGen/Targets/AMDGPU.cpp index e4ad078dab197..0ab6c753b8bad 100644 --- a/clang/lib/CodeGen/Targets/AMDGPU.cpp +++ b/clang/lib/CodeGen/Targets/AMDGPU.cpp @@ -439,11 +439,8 @@ void AMDGPUTargetCodeGenInfo::setTargetAttributes( return; const FunctionDecl *FD = dyn_cast_or_null<FunctionDecl>(D); - if (FD) { + if (FD) setFunctionDeclAttributes(FD, F, M); - if (FD->hasAttr<DeviceKernelAttr>() && !M.getLangOpts().OpenCL) - F->setCallingConv(getDeviceKernelCallingConv()); - } if (!getABIInfo().getCodeGenOpts().EmitIEEENaNCompliantInsts) F->addFnAttr("amdgpu-ieee", "false"); } diff --git a/clang/lib/CodeGen/Targets/NVPTX.cpp b/clang/lib/CodeGen/Targets/NVPTX.cpp index f6715861d91bc..ba2acd821c704 100644 --- a/clang/lib/CodeGen/Targets/NVPTX.cpp +++ b/clang/lib/CodeGen/Targets/NVPTX.cpp @@ -276,9 +276,6 @@ void NVPTXTargetCodeGenInfo::setTargetAttributes( M.handleCUDALaunchBoundsAttr(F, Attr); } } - // Attach kernel metadata directly if compiling for NVPTX. - if (FD->hasAttr<DeviceKernelAttr>()) - F->setCallingConv(getDeviceKernelCallingConv()); } void NVPTXTargetCodeGenInfo::addNVVMMetadata(llvm::GlobalValue *GV, diff --git a/clang/lib/CodeGen/Targets/SPIR.cpp b/clang/lib/CodeGen/Targets/SPIR.cpp index 1a8c85d8871ec..ccc35a22d9938 100644 --- a/clang/lib/CodeGen/Targets/SPIR.cpp +++ b/clang/lib/CodeGen/Targets/SPIR.cpp @@ -77,8 +77,6 @@ class CommonSPIRTargetCodeGenInfo : public TargetCodeGenInfo { llvm::Constant *getNullPointer(const CodeGen::CodeGenModule &CGM, llvm::PointerType *T, QualType QT) const override; - void setTargetAttributes(const Decl *D, llvm::GlobalValue *GV, - CodeGen::CodeGenModule &M) const override; }; class SPIRVTargetCodeGenInfo : public CommonSPIRTargetCodeGenInfo { public: @@ -292,22 +290,6 @@ CommonSPIRTargetCodeGenInfo::getNullPointer(const CodeGen::CodeGenModule &CGM, llvm::ConstantPointerNull::get(NPT), PT); } -void CommonSPIRTargetCodeGenInfo::setTargetAttributes( - const Decl *D, llvm::GlobalValue *GV, CodeGen::CodeGenModule &M) const { - if (M.getLangOpts().OpenCL || GV->isDeclaration()) - return; - - const FunctionDecl *FD = dyn_cast<FunctionDecl>(D); - if (!FD) - return; - - llvm::Function *F = dyn_cast<llvm::Function>(GV); - assert(F && "Expected GlobalValue to be a Function"); - - if (FD->hasAttr<DeviceKernelAttr>()) - F->setCallingConv(getDeviceKernelCallingConv()); -} - LangAS SPIRVTargetCodeGenInfo::getGlobalVarAddressSpace(CodeGenModule &CGM, const VarDecl *D) const { @@ -342,9 +324,6 @@ void SPIRVTargetCodeGenInfo::setTargetAttributes( llvm::Function *F = dyn_cast<llvm::Function>(GV); assert(F && "Expected GlobalValue to be a Function"); - if (FD->hasAttr<DeviceKernelAttr>()) - F->setCallingConv(getDeviceKernelCallingConv()); - if (!M.getLangOpts().HIP || M.getTarget().getTriple().getVendor() != llvm::Triple::AMD) return; diff --git a/clang/lib/Sema/SemaType.cpp b/clang/lib/Sema/SemaType.cpp index 9f5aa153d1cbe..fd64d4456cbfa 100644 --- a/clang/lib/Sema/SemaType.cpp +++ b/clang/lib/Sema/SemaType.cpp @@ -3798,8 +3798,10 @@ static CallingConv getCCForDeclaratorChunk( } } } + for (const ParsedAttr &AL : llvm::concat<ParsedAttr>( - D.getDeclSpec().getAttributes(), D.getAttributes())) { + D.getDeclSpec().getAttributes(), D.getAttributes(), + D.getDeclarationAttributes())) { if (AL.getKind() == ParsedAttr::AT_DeviceKernel) { CC = CC_DeviceKernel; break; diff --git a/clang/test/CodeGenOpenCL/ptx-calls.cl b/clang/test/CodeGenOpenCL/ptx-calls.cl index ae187173b1730..17c25ee78ef45 100644 --- a/clang/test/CodeGenOpenCL/ptx-calls.cl +++ b/clang/test/CodeGenOpenCL/ptx-calls.cl @@ -1,11 +1,31 @@ +// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --include-generated-funcs --version 6 // RUN: %clang_cc1 %s -triple nvptx-unknown-unknown -emit-llvm -O0 -o - | FileCheck %s void device_function() { } -// CHECK-LABEL: define{{.*}} void @device_function() __kernel void kernel_function() { device_function(); } -// CHECK-LABEL: define{{.*}} ptx_kernel void @kernel_function() -// CHECK: call void @device_function() +// CHECK-LABEL: define dso_local void @device_function( +// CHECK-SAME: ) #[[ATTR0:[0-9]+]] { +// CHECK-NEXT: [[ENTRY:.*:]] +// CHECK-NEXT: ret void +// +// +// CHECK-LABEL: define dso_local ptx_kernel void @kernel_function( +// CHECK-SAME: ) #[[ATTR1:[0-9]+]] !kernel_arg_addr_space [[META3:![0-9]+]] !kernel_arg_access_qual [[META3]] !kernel_arg_type [[META3]] !kernel_arg_base_type [[META3]] !kernel_arg_type_qual [[META3]] { +// CHECK-NEXT: [[ENTRY:.*:]] +// CHECK-NEXT: call void @__clang_ocl_kern_imp_kernel_function() #[[ATTR2:[0-9]+]] +// CHECK-NEXT: ret void +// +// +// CHECK-LABEL: define dso_local void @__clang_ocl_kern_imp_kernel_function( +// CHECK-SAME: ) #[[ATTR0]] !kernel_arg_addr_space [[META3]] !kernel_arg_access_qual [[META3]] !kernel_arg_type [[META3]] !kernel_arg_base_type [[META3]] !kernel_arg_type_qual [[META3]] { +// CHECK-NEXT: [[ENTRY:.*:]] +// CHECK-NEXT: call void @device_function() #[[ATTR2]] +// CHECK-NEXT: ret void +// +//. +// CHECK: [[META3]] = !{} +//. diff --git a/clang/test/CodeGenOpenCL/reflect.cl b/clang/test/CodeGenOpenCL/reflect.cl index 4abb40aa3ed50..a69e338641167 100644 --- a/clang/test/CodeGenOpenCL/reflect.cl +++ b/clang/test/CodeGenOpenCL/reflect.cl @@ -26,7 +26,7 @@ __kernel void kernel_function(__global int *i) { // CHECK-NEXT: ret void // // -// CHECK-LABEL: define dso_local ptx_kernel void @__clang_ocl_kern_imp_kernel_function( +// CHECK-LABEL: define dso_local void @__clang_ocl_kern_imp_kernel_function( // CHECK-SAME: ptr addrspace(1) noundef align 4 [[I:%.*]]) #[[ATTR0]] !kernel_arg_addr_space [[META3]] !kernel_arg_access_qual [[META4]] !kernel_arg_type [[META5]] !kernel_arg_base_type [[META5]] !kernel_arg_type_qual [[META6]] { // CHECK-NEXT: entry: // CHECK-NEXT: [[I_ADDR:%.*]] = alloca ptr addrspace(1), align 4 _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
