Commit c30d7730 authored by Huber, Joseph's avatar Huber, Joseph
Browse files

[OpenMP] Change debugging symbol to weak_odr linkage 

The new device runtime uses an internal variable to set debugging. This
variable was originally privately linked because every module will have
a copy of it. This caused problems with merging the device bitcode
library because it would get renamed and there was not a way to refer to
an external, private symbol. This changes the symbol to weak_odr so it
can be defined multiply, but will not be renamed.

Reviewed By: jdoerfert

Differential Revision: https://reviews.llvm.org/D109997
parent 724a1dff

clang/test/OpenMP/target_debug_codegen.cpp

+4 −7
Original line number Diff line number Diff line 
// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --check-globals --global-value-regex "(__omp_rtl_debug_kind|llvm\.used)"

// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --check-globals --global-value-regex "__omp_rtl_debug_kind"

// Test target codegen - host bc file has to be created first.

// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=nvptx64-nvidia-cuda -emit-llvm-bc %s -o %t-ppc-host.bc

// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple nvptx64-unknown-unknown -fopenmp-targets=nvptx64-nvidia-cuda -emit-llvm %s -fopenmp-target-new-runtime -fopenmp-target-debug -fopenmp-is-device -fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s --check-prefix=CHECK
@@ -10,14 +10,11 @@ 
#define HEADER



//.

// CHECK: @__omp_rtl_debug_kind = private constant i32 1

// CHECK: @llvm.used = appending global [1 x i8*] [i8* bitcast (i32* @__omp_rtl_debug_kind to i8*)], section "llvm.metadata"

// CHECK: @__omp_rtl_debug_kind = weak_odr constant i32 1

//.

// CHECK-EQ: @__omp_rtl_debug_kind = private constant i32 111

// CHECK-EQ: @llvm.used = appending global [1 x i8*] [i8* bitcast (i32* @__omp_rtl_debug_kind to i8*)], section "llvm.metadata"

// CHECK-EQ: @__omp_rtl_debug_kind = weak_odr constant i32 111

//.

// CHECK-DEFAULT: @__omp_rtl_debug_kind = private constant i32 0

// CHECK-DEFAULT: @llvm.used = appending global [1 x i8*] [i8* bitcast (i32* @__omp_rtl_debug_kind to i8*)], section "llvm.metadata"

// CHECK-DEFAULT: @__omp_rtl_debug_kind = weak_odr constant i32 0

//.

void foo() {

#pragma omp target

llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp

+1 −3
Original line number Diff line number Diff line
@@ -249,11 +249,9 @@ GlobalValue *OpenMPIRBuilder::createDebugKind(unsigned DebugKind) { 
  IntegerType *I32Ty = Type::getInt32Ty(M.getContext());

  auto *GV = new GlobalVariable(

      M, I32Ty,

      /* isConstant = */ true, GlobalValue::PrivateLinkage,

      /* isConstant = */ true, GlobalValue::WeakODRLinkage,

      ConstantInt::get(I32Ty, DebugKind), "__omp_rtl_debug_kind");



  llvm::appendToUsed(M, {GV});



  return GV;

}