Author: Joseph Huber Date: 2023-10-05T17:10:03-05:00 New Revision: 1d959f932752b39cd535cb22f043333e348a4b01
URL: https://github.com/llvm/llvm-project/commit/1d959f932752b39cd535cb22f043333e348a4b01 DIFF: https://github.com/llvm/llvm-project/commit/1d959f932752b39cd535cb22f043333e348a4b01.diff LOG: [OpenMP] Prevent AMDGPU from overriding visibility on DT_nohost variables (#68264) Summary: There's some logic in the AMDGPU target that manually resets the requested visibility of certain variables. This was triggering when we set a constant variable in OpenMP. However, we shouldn't do this for OpenMP when the variable has the `nohost` type. That implies that the variable is not visible to the host and therefore does not need to be visible, so we should respect the original value of it. Added: Modified: clang/lib/CodeGen/CodeGenModule.cpp clang/lib/CodeGen/Targets/AMDGPU.cpp clang/test/OpenMP/declare_target_codegen.cpp clang/test/OpenMP/declare_target_constexpr_codegen.cpp clang/test/OpenMP/target_visibility.cpp Removed: ################################################################################ diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index f078a68231448ae..cae9dd93bc55921 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -1390,6 +1390,19 @@ void CodeGenModule::setGlobalVisibility(llvm::GlobalValue *GV, } if (!D) return; + + // OpenMP declare target variables must be visible to the host so they can + // be registered. We require protected visibility unless the variable has + // the DT_nohost modifier and does not need to be registered. + if (Context.getLangOpts().OpenMP && + Context.getLangOpts().OpenMPIsTargetDevice && isa<VarDecl>(D) && + D->hasAttr<OMPDeclareTargetDeclAttr>() && + D->getAttr<OMPDeclareTargetDeclAttr>()->getDevType() != + OMPDeclareTargetDeclAttr::DT_NoHost) { + GV->setVisibility(llvm::GlobalValue::ProtectedVisibility); + return; + } + // Set visibility for definitions, and for declarations if requested globally // or set explicitly. LinkageInfo LV = D->getLinkageAndVisibility(); diff --git a/clang/lib/CodeGen/Targets/AMDGPU.cpp b/clang/lib/CodeGen/Targets/AMDGPU.cpp index dc628b7345f59fd..f6a614b3e4d54dd 100644 --- a/clang/lib/CodeGen/Targets/AMDGPU.cpp +++ b/clang/lib/CodeGen/Targets/AMDGPU.cpp @@ -308,12 +308,13 @@ static bool requiresAMDGPUProtectedVisibility(const Decl *D, if (GV->getVisibility() != llvm::GlobalValue::HiddenVisibility) return false; - return D->hasAttr<OpenCLKernelAttr>() || - (isa<FunctionDecl>(D) && D->hasAttr<CUDAGlobalAttr>()) || - (isa<VarDecl>(D) && - (D->hasAttr<CUDADeviceAttr>() || D->hasAttr<CUDAConstantAttr>() || - cast<VarDecl>(D)->getType()->isCUDADeviceBuiltinSurfaceType() || - cast<VarDecl>(D)->getType()->isCUDADeviceBuiltinTextureType())); + return !D->hasAttr<OMPDeclareTargetDeclAttr>() && + (D->hasAttr<OpenCLKernelAttr>() || + (isa<FunctionDecl>(D) && D->hasAttr<CUDAGlobalAttr>()) || + (isa<VarDecl>(D) && + (D->hasAttr<CUDADeviceAttr>() || D->hasAttr<CUDAConstantAttr>() || + cast<VarDecl>(D)->getType()->isCUDADeviceBuiltinSurfaceType() || + cast<VarDecl>(D)->getType()->isCUDADeviceBuiltinTextureType()))); } void AMDGPUTargetCodeGenInfo::setFunctionDeclAttributes( diff --git a/clang/test/OpenMP/declare_target_codegen.cpp b/clang/test/OpenMP/declare_target_codegen.cpp index 71c742198af6bff..225695feae95151 100644 --- a/clang/test/OpenMP/declare_target_codegen.cpp +++ b/clang/test/OpenMP/declare_target_codegen.cpp @@ -31,7 +31,7 @@ // CHECK-DAG: @dy = {{protected | }}global i32 0, // CHECK-DAG: @bbb = {{protected | }}global i32 0, // CHECK-DAG: weak constant %struct.__tgt_offload_entry { ptr @bbb, -// CHECK-DAG: @ccc = external global i32, +// CHECK-DAG: @ccc = external {{protected | }}global i32, // CHECK-DAG: @ddd = {{protected | }}global i32 0, // CHECK-DAG: @hhh_decl_tgt_ref_ptr = weak global ptr null // CHECK-DAG: @ggg_decl_tgt_ref_ptr = weak global ptr null diff --git a/clang/test/OpenMP/declare_target_constexpr_codegen.cpp b/clang/test/OpenMP/declare_target_constexpr_codegen.cpp index 0acd98129394b8a..2b256cd6a4c7f09 100644 --- a/clang/test/OpenMP/declare_target_constexpr_codegen.cpp +++ b/clang/test/OpenMP/declare_target_constexpr_codegen.cpp @@ -16,7 +16,7 @@ class A { public: static constexpr double pi = 3.141592653589793116; //. -// CHECK: @_ZN1A2piE = linkonce_odr constant double 0x400921FB54442D18, comdat, align 8 +// CHECK: @_ZN1A2piE = linkonce_odr protected constant double 0x400921FB54442D18, comdat, align 8 // CHECK: @_ZL9anotherPi = internal constant double 3.140000e+00, align 8 // CHECK: @llvm.compiler.used = appending global [2 x ptr] [ptr @"__ZN1A2piE$ref", ptr @"__ZL9anotherPi$ref"], section "llvm.metadata" //. diff --git a/clang/test/OpenMP/target_visibility.cpp b/clang/test/OpenMP/target_visibility.cpp index 938d164df89bffb..2554f653170b94f 100644 --- a/clang/test/OpenMP/target_visibility.cpp +++ b/clang/test/OpenMP/target_visibility.cpp @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -debug-info-kind=limited -verify -fopenmp -x c++ -triple nvptx64-unknown-unknown -fopenmp-targets=nvptx64-nvidia-cuda -emit-llvm %s -fopenmp-is-target-device -o - | FileCheck %s -// RUN: %clang_cc1 -debug-info-kind=limited -verify -fopenmp -x c++ -triple nvptx-unknown-unknown -fopenmp-targets=nvptx-nvidia-cuda -emit-llvm %s -fopenmp-is-target-device -o - | FileCheck %s +// RUN: %clang_cc1 -debug-info-kind=limited -verify -fopenmp -x c++ -triple amdgcn-amd-amdhsa -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device -o - | FileCheck %s // expected-no-diagnostics @@ -21,6 +21,14 @@ void B::bar() { A a; a.foo(); } void B::sbar() { A::sfoo(); } #pragma omp declare target to(B::bar, B::sbar) +[[gnu::visibility("hidden")]] extern const int x = 0; +#pragma omp declare target to(x) device_type(nohost) + +[[gnu::visibility("hidden")]] int y = 0; +#pragma omp declare target to(y) + +// CHECK-DAG: @x = hidden{{.*}} constant i32 0 +// CHECK-DAG: @y = protected{{.*}} i32 0 // CHECK-DAG: define hidden void @_ZN1B4sbarEv() // CHECK-DAG: define linkonce_odr hidden void @_ZN1A4sfooEv() // CHECK-DAG: define hidden void @_ZN1B3barEv( _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
