[PATCH] D156955: [OpenMP] Fix the linkage for kernel environment global variable

[Shilei Tian via Phabricator via llvm-commits]

tianshilei1992 updated this revision to Diff 547000.
tianshilei1992 added a comment.
Herald added subscribers: gysit, Dinistro, bviyer, Moerafaat, zero9178, bzcheeseman, awarzynski, sdasgup3, wenzhicui, wrengr, cota, teijeong, rdzhabarov, tatianashp, msifontes, jurahul, Kayjukh, grosul1, Joonsoo, stephenneuendorffer, liufengdb, aartbik, mgester, arpith-jacob, nicolasvasilache, antiagainst, shauheen, rriddle, mehdi_amini.
Herald added a reviewer: ftynse.
Herald added a project: MLIR.

rebase and fix test issue


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D156955/new/

https://reviews.llvm.org/D156955

Files:
  llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
  mlir/test/Target/LLVMIR/omptarget-region-device-llvm.mlir


Index: mlir/test/Target/LLVMIR/omptarget-region-device-llvm.mlir
===================================================================
--- mlir/test/Target/LLVMIR/omptarget-region-device-llvm.mlir
+++ mlir/test/Target/LLVMIR/omptarget-region-device-llvm.mlir
@@ -25,8 +25,8 @@
 
 // CHECK:      @[[SRC_LOC:.*]] = private unnamed_addr constant [23 x i8] c"{{[^"]*}}", align 1
 // CHECK:      @[[IDENT:.*]] = private unnamed_addr constant %struct.ident_t { i32 0, i32 2, i32 0, i32 22, ptr @[[SRC_LOC]] }, align 8
-// CHECK:      @[[DYNA_ENV:.*]] = internal global %struct.DynamicEnvironmentTy zeroinitializer
-// CHECK:      @[[KERNEL_ENV:.*]] = constant %struct.KernelEnvironmentTy { %struct.ConfigurationEnvironmentTy { i8 1, i8 1, i8 1 }, ptr @[[IDENT]], ptr @[[DYNA_ENV]] }
+// CHECK:      @[[DYNA_ENV:.*]] = weak_odr global %struct.DynamicEnvironmentTy zeroinitializer
+// CHECK:      @[[KERNEL_ENV:.*]] = weak_odr constant %struct.KernelEnvironmentTy { %struct.ConfigurationEnvironmentTy { i8 1, i8 1, i8 1 }, ptr @[[IDENT]], ptr @[[DYNA_ENV]] }
 // CHECK:      define weak_odr protected void @__omp_offloading_{{[^_]+}}_{{[^_]+}}_omp_target_region__l{{[0-9]+}}(ptr %[[ADDR_A:.*]], ptr %[[ADDR_B:.*]], ptr %[[ADDR_C:.*]])
 // CHECK:        %[[INIT:.*]] = call i32 @__kmpc_target_init(ptr @[[KERNEL_ENV]])
 // CHECK-NEXT:   %[[CMP:.*]] = icmp eq i32 %3, -1
Index: llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
===================================================================
--- llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
+++ llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
@@ -4040,7 +4040,7 @@
       ConstantStruct::get(DynamicEnvironment, {DebugIndentionLevelVal});
   Constant *DynamicEnvironmentGV = new GlobalVariable(
       M, DynamicEnvironment, /* IsConstant */ false,
-      GlobalValue::InternalLinkage, DynamicEnvironmentInitializer,
+      GlobalValue::WeakODRLinkage, DynamicEnvironmentInitializer,
       DynamicEnvironmentName,
       /* InsertBefore */ nullptr, llvm::GlobalValue::NotThreadLocal,
       DL.getDefaultGlobalsAddressSpace());
@@ -4062,7 +4062,7 @@
                          });
   Twine KernelEnvironmentName = KernelName + "_kernel_environment";
   Constant *KernelEnvironmentGV = new GlobalVariable(
-      M, KernelEnvironment, /* IsConstant */ true, GlobalValue::ExternalLinkage,
+      M, KernelEnvironment, /* IsConstant */ true, GlobalValue::WeakODRLinkage,
       KernelEnvironmentInitializer, KernelEnvironmentName,
       /* InsertBefore */ nullptr, llvm::GlobalValue::NotThreadLocal,
       DL.getDefaultGlobalsAddressSpace());


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D156955.547000.patch
Type: text/x-patch
Size: 2567 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230803/470dc1d7/attachment.bin>