Author: scott.linder Date: Tue Feb 12 10:30:38 2019 New Revision: 353870 URL: http://llvm.org/viewvc/llvm-project?rev=353870&view=rev Log: [AMDGPU] Require at least protected visibility for certain symbols
This allows the global visibility controls to be restrictive while still populating the dynamic symbol table where required. Differential Revision: https://reviews.llvm.org/D56871 Added: cfe/trunk/test/CodeGenOpenCL/visibility.cl Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp cfe/trunk/lib/CodeGen/TargetInfo.cpp Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=353870&r1=353869&r2=353870&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original) +++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Tue Feb 12 10:30:38 2019 @@ -3212,6 +3212,9 @@ CodeGenModule::GetOrCreateLLVMGlobal(Str return getTargetCodeGenInfo().performAddrSpaceCast(*this, GV, AddrSpace, ExpectedAS, Ty); + if (GV->isDeclaration()) + getTargetCodeGenInfo().setTargetAttributes(D, GV, *this); + return GV; } Modified: cfe/trunk/lib/CodeGen/TargetInfo.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/TargetInfo.cpp?rev=353870&r1=353869&r2=353870&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/TargetInfo.cpp (original) +++ cfe/trunk/lib/CodeGen/TargetInfo.cpp Tue Feb 12 10:30:38 2019 @@ -7763,8 +7763,23 @@ public: }; } +static bool requiresAMDGPUProtectedVisibility(const Decl *D, + llvm::GlobalValue *GV) { + if (GV->getVisibility() != llvm::GlobalValue::HiddenVisibility) + return false; + + return D->hasAttr<OpenCLKernelAttr>() || + (isa<FunctionDecl>(D) && D->hasAttr<CUDAGlobalAttr>()) || + (isa<VarDecl>(D) && D->hasAttr<CUDADeviceAttr>()); +} + void AMDGPUTargetCodeGenInfo::setTargetAttributes( const Decl *D, llvm::GlobalValue *GV, CodeGen::CodeGenModule &M) const { + if (requiresAMDGPUProtectedVisibility(D, GV)) { + GV->setVisibility(llvm::GlobalValue::ProtectedVisibility); + GV->setDSOLocal(true); + } + if (GV->isDeclaration()) return; const FunctionDecl *FD = dyn_cast_or_null<FunctionDecl>(D); Added: cfe/trunk/test/CodeGenOpenCL/visibility.cl URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCL/visibility.cl?rev=353870&view=auto ============================================================================== --- cfe/trunk/test/CodeGenOpenCL/visibility.cl (added) +++ cfe/trunk/test/CodeGenOpenCL/visibility.cl Tue Feb 12 10:30:38 2019 @@ -0,0 +1,77 @@ +// RUN: %clang_cc1 -std=cl2.0 -fapply-global-visibility-to-externs -fvisibility default -triple amdgcn-unknown-unknown -S -emit-llvm -o - %s | FileCheck --check-prefix=FVIS-DEFAULT %s +// RUN: %clang_cc1 -std=cl2.0 -fapply-global-visibility-to-externs -fvisibility protected -triple amdgcn-unknown-unknown -S -emit-llvm -o - %s | FileCheck --check-prefix=FVIS-PROTECTED %s +// RUN: %clang_cc1 -std=cl2.0 -fapply-global-visibility-to-externs -fvisibility hidden -triple amdgcn-unknown-unknown -S -emit-llvm -o - %s | FileCheck --check-prefix=FVIS-HIDDEN %s + +// REQUIRES: amdgpu-registered-target + +// FVIS-DEFAULT: @glob = local_unnamed_addr +// FVIS-PROTECTED: @glob = protected local_unnamed_addr +// FVIS-HIDDEN: @glob = hidden local_unnamed_addr +int glob = 0; +// FVIS-DEFAULT: @glob_hidden = hidden local_unnamed_addr +// FVIS-PROTECTED: @glob_hidden = hidden local_unnamed_addr +// FVIS-HIDDEN: @glob_hidden = hidden local_unnamed_addr +__attribute__((visibility("hidden"))) int glob_hidden = 0; +// FVIS-DEFAULT: @glob_protected = protected local_unnamed_addr +// FVIS-PROTECTED: @glob_protected = protected local_unnamed_addr +// FVIS-HIDDEN: @glob_protected = protected local_unnamed_addr +__attribute__((visibility("protected"))) int glob_protected = 0; +// FVIS-DEFAULT: @glob_default = local_unnamed_addr +// FVIS-PROTECTED: @glob_default = local_unnamed_addr +// FVIS-HIDDEN: @glob_default = local_unnamed_addr +__attribute__((visibility("default"))) int glob_default = 0; + +// FVIS-DEFAULT: @ext = external local_unnamed_addr +// FVIS-PROTECTED: @ext = external protected local_unnamed_addr +// FVIS-HIDDEN: @ext = external hidden local_unnamed_addr +extern int ext; +// FVIS-DEFAULT: @ext_hidden = external hidden local_unnamed_addr +// FVIS-PROTECTED: @ext_hidden = external hidden local_unnamed_addr +// FVIS-HIDDEN: @ext_hidden = external hidden local_unnamed_addr +__attribute__((visibility("hidden"))) extern int ext_hidden; +// FVIS-DEFAULT: @ext_protected = external protected local_unnamed_addr +// FVIS-PROTECTED: @ext_protected = external protected local_unnamed_addr +// FVIS-HIDDEN: @ext_protected = external protected local_unnamed_addr +__attribute__((visibility("protected"))) extern int ext_protected; +// FVIS-DEFAULT: @ext_default = external local_unnamed_addr +// FVIS-PROTECTED: @ext_default = external local_unnamed_addr +// FVIS-HIDDEN: @ext_default = external local_unnamed_addr +__attribute__((visibility("default"))) extern int ext_default; + +// FVIS-DEFAULT: define amdgpu_kernel void @kern() +// FVIS-PROTECTED: define protected amdgpu_kernel void @kern() +// FVIS-HIDDEN: define protected amdgpu_kernel void @kern() +kernel void kern() {} +// FVIS-DEFAULT: define protected amdgpu_kernel void @kern_hidden() +// FVIS-PROTECTED: define protected amdgpu_kernel void @kern_hidden() +// FVIS-HIDDEN: define protected amdgpu_kernel void @kern_hidden() +__attribute__((visibility("hidden"))) kernel void kern_hidden() {} +// FVIS-DEFAULT: define protected amdgpu_kernel void @kern_protected() +// FVIS-PROTECTED: define protected amdgpu_kernel void @kern_protected() +// FVIS-HIDDEN: define protected amdgpu_kernel void @kern_protected() +__attribute__((visibility("protected"))) kernel void kern_protected() {} +// FVIS-DEFAULT: define amdgpu_kernel void @kern_default() +// FVIS-PROTECTED: define amdgpu_kernel void @kern_default() +// FVIS-HIDDEN: define amdgpu_kernel void @kern_default() +__attribute__((visibility("default"))) kernel void kern_default() {} + +// FVIS-DEFAULT: define void @func() +// FVIS-PROTECTED: define protected void @func() +// FVIS-HIDDEN: define hidden void @func() +void func() {} +// FVIS-DEFAULT: define hidden void @func_hidden() +// FVIS-PROTECTED: define hidden void @func_hidden() +// FVIS-HIDDEN: define hidden void @func_hidden() +__attribute__((visibility("hidden"))) void func_hidden() {} +// FVIS-DEFAULT: define protected void @func_protected() +// FVIS-PROTECTED: define protected void @func_protected() +// FVIS-HIDDEN: define protected void @func_protected() +__attribute__((visibility("protected"))) void func_protected() {} +// FVIS-DEFAULT: define void @func_default() +// FVIS-PROTECTED: define void @func_default() +// FVIS-HIDDEN: define void @func_default() +__attribute__((visibility("default"))) void func_default() {} + +void use() { + glob = ext + ext_hidden + ext_protected + ext_default; +} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
