From a8ec170e01dd0d0cbf8c059aa7addaaf3d886876 Mon Sep 17 00:00:00 2001 From: Joseph Huber Date: Wed, 5 Oct 2022 12:08:22 -0500 Subject: [PATCH] [OpenMP] Make the exec_mode global have protected visibility We use protected visibility for almost everything with offloading. This is because it provides us with the ability to read things from the host without the expectation that it will be preempted by a shared library load, bugs related to this have happened when offloading to the host. This patch just makes the `exec_mode` global generated for each plugin have protected visibility. Reviewed By: jdoerfert Differential Revision: https://reviews.llvm.org/D135285 --- clang/lib/CodeGen/CGOpenMPRuntimeGPU.cpp | 1 + clang/test/OpenMP/nvptx_target_parallel_proc_bind_codegen.cpp | 6 +++--- clang/test/OpenMP/nvptx_target_parallel_reduction_codegen.cpp | 6 +++--- clang/test/OpenMP/nvptx_target_simd_codegen.cpp | 8 ++++---- clang/test/OpenMP/nvptx_target_teams_distribute_simd_codegen.cpp | 8 ++++---- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/clang/lib/CodeGen/CGOpenMPRuntimeGPU.cpp b/clang/lib/CodeGen/CGOpenMPRuntimeGPU.cpp index a44d454..e3ef331 100644 --- a/clang/lib/CodeGen/CGOpenMPRuntimeGPU.cpp +++ b/clang/lib/CodeGen/CGOpenMPRuntimeGPU.cpp @@ -836,6 +836,7 @@ static void setPropertyExecutionMode(CodeGenModule &CGM, StringRef Name, llvm::ConstantInt::get(CGM.Int8Ty, Mode ? OMP_TGT_EXEC_MODE_SPMD : OMP_TGT_EXEC_MODE_GENERIC), Twine(Name, "_exec_mode")); + GVMode->setVisibility(llvm::GlobalVariable::ProtectedVisibility); CGM.addCompilerUsedGlobal(GVMode); } diff --git a/clang/test/OpenMP/nvptx_target_parallel_proc_bind_codegen.cpp b/clang/test/OpenMP/nvptx_target_parallel_proc_bind_codegen.cpp index 71d8d77..0f14d68 100644 --- a/clang/test/OpenMP/nvptx_target_parallel_proc_bind_codegen.cpp +++ b/clang/test/OpenMP/nvptx_target_parallel_proc_bind_codegen.cpp @@ -16,9 +16,9 @@ #define HEADER // Check that the execution mode of all 3 target regions on the gpu is set to SPMD Mode. -// CHECK-DAG: {{@__omp_offloading_.+l29}}_exec_mode = weak constant i8 2 -// CHECK-DAG: {{@__omp_offloading_.+l33}}_exec_mode = weak constant i8 2 -// CHECK-DAG: {{@__omp_offloading_.+l38}}_exec_mode = weak constant i8 2 +// CHECK-DAG: {{@__omp_offloading_.+l29}}_exec_mode = weak protected constant i8 2 +// CHECK-DAG: {{@__omp_offloading_.+l33}}_exec_mode = weak protected constant i8 2 +// CHECK-DAG: {{@__omp_offloading_.+l38}}_exec_mode = weak protected constant i8 2 template tx ftemplate(int n) { diff --git a/clang/test/OpenMP/nvptx_target_parallel_reduction_codegen.cpp b/clang/test/OpenMP/nvptx_target_parallel_reduction_codegen.cpp index 4bcf806..b103e21 100644 --- a/clang/test/OpenMP/nvptx_target_parallel_reduction_codegen.cpp +++ b/clang/test/OpenMP/nvptx_target_parallel_reduction_codegen.cpp @@ -12,9 +12,9 @@ // CHECK-DAG: [[TRANSFER_STORAGE:@.+]] = weak addrspace([[SHARED_ADDRSPACE:[0-9]+]]) global [32 x i32] // Check that the execution mode of all 3 target regions is set to Spmd Mode. -// CHECK-DAG: {{@__omp_offloading_.+l27}}_exec_mode = weak constant i8 2 -// CHECK-DAG: {{@__omp_offloading_.+l32}}_exec_mode = weak constant i8 2 -// CHECK-DAG: {{@__omp_offloading_.+l38}}_exec_mode = weak constant i8 2 +// CHECK-DAG: {{@__omp_offloading_.+l27}}_exec_mode = weak protected constant i8 2 +// CHECK-DAG: {{@__omp_offloading_.+l32}}_exec_mode = weak protected constant i8 2 +// CHECK-DAG: {{@__omp_offloading_.+l38}}_exec_mode = weak protected constant i8 2 template tx ftemplate(int n) { diff --git a/clang/test/OpenMP/nvptx_target_simd_codegen.cpp b/clang/test/OpenMP/nvptx_target_simd_codegen.cpp index fadfa7f..435ff7b 100644 --- a/clang/test/OpenMP/nvptx_target_simd_codegen.cpp +++ b/clang/test/OpenMP/nvptx_target_simd_codegen.cpp @@ -16,10 +16,10 @@ #define HEADER // Check that the execution mode of all 2 target regions on the gpu is set to NonSPMD Mode. -// CHECK-DAG: {{@__omp_offloading_.+l32}}_exec_mode = weak constant i8 2 -// CHECK-DAG: {{@__omp_offloading_.+l37}}_exec_mode = weak constant i8 2 -// CHECK-DAG: {{@__omp_offloading_.+l42}}_exec_mode = weak constant i8 2 -// CHECK-DAG: {{@__omp_offloading_.+l47}}_exec_mode = weak constant i8 2 +// CHECK-DAG: {{@__omp_offloading_.+l32}}_exec_mode = weak protected constant i8 2 +// CHECK-DAG: {{@__omp_offloading_.+l37}}_exec_mode = weak protected constant i8 2 +// CHECK-DAG: {{@__omp_offloading_.+l42}}_exec_mode = weak protected constant i8 2 +// CHECK-DAG: {{@__omp_offloading_.+l47}}_exec_mode = weak protected constant i8 2 #define N 1000 diff --git a/clang/test/OpenMP/nvptx_target_teams_distribute_simd_codegen.cpp b/clang/test/OpenMP/nvptx_target_teams_distribute_simd_codegen.cpp index fed8226..cb177df 100644 --- a/clang/test/OpenMP/nvptx_target_teams_distribute_simd_codegen.cpp +++ b/clang/test/OpenMP/nvptx_target_teams_distribute_simd_codegen.cpp @@ -16,10 +16,10 @@ #define HEADER // Check that the execution mode of all 2 target regions on the gpu is set to NonSPMD Mode. -// CHECK-DAG: {{@__omp_offloading_.+l37}}_exec_mode = weak constant i8 2 -// CHECK-DAG: {{@__omp_offloading_.+l43}}_exec_mode = weak constant i8 2 -// CHECK-DAG: {{@__omp_offloading_.+l48}}_exec_mode = weak constant i8 2 -// CHECK-DAG: {{@__omp_offloading_.+l53}}_exec_mode = weak constant i8 2 +// CHECK-DAG: {{@__omp_offloading_.+l37}}_exec_mode = weak protected constant i8 2 +// CHECK-DAG: {{@__omp_offloading_.+l43}}_exec_mode = weak protected constant i8 2 +// CHECK-DAG: {{@__omp_offloading_.+l48}}_exec_mode = weak protected constant i8 2 +// CHECK-DAG: {{@__omp_offloading_.+l53}}_exec_mode = weak protected constant i8 2 #define N 1000 #define M 10 -- 2.7.4