[HIP] Changes for device_globals and enable tests (intel#12165)

Enable `device_global` for AMDGPU. Related to oneapi-src/unified-runtime#1186 . In order for `hipModuleGetGlobal` to see a global symbol we need to not make the visibility of the symbol hidden. Perhaps changing this as a default is not always a good idea. Could also do this in the SYCL headers using an attribute to specify the visibility of the `device_global` var
tahonermann · Jan 16, 2024 · d377464 · d377464
1 parent 1237051
commit d377464
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 34 deletions.
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
@@ -10306,7 +10306,7 @@ void SYCLPostLink::ConstructJob(Compilation &C, const JobAction &JA,
   if (!(T.isAMDGCN()))
     addArgs(CmdArgs, TCArgs, {"-emit-param-info"});
   // Enable PI program metadata
-  if (T.isNVPTX())
+  if (T.isNVPTX() || T.isAMDGCN())
     addArgs(CmdArgs, TCArgs, {"-emit-program-metadata"});
   if (SYCLPostLink->getTrueType() == types::TY_LLVM_BC) {
     // single file output requested - this means only perform necessary IR

diff --git a/clang/lib/Driver/ToolChains/HIPAMD.cpp b/clang/lib/Driver/ToolChains/HIPAMD.cpp
@@ -269,7 +269,8 @@ void HIPAMDToolChain::addClangTargetOptions(
   // supported for the foreseeable future.
   if (!DriverArgs.hasArg(options::OPT_fvisibility_EQ,
                          options::OPT_fvisibility_ms_compat)) {
-    CC1Args.append({"-fvisibility=hidden"});
+    if (DeviceOffloadingKind != Action::OFK_SYCL)
+      CC1Args.append({"-fvisibility=hidden"});
     CC1Args.push_back("-fapply-global-visibility-to-externs");
   }
 

diff --git a/clang/test/Driver/sycl-hip-driver-args.cpp b/clang/test/Driver/sycl-hip-driver-args.cpp
@@ -0,0 +1,8 @@
+// Test that driver has the correct flags for SYCL HIP compilation
+
+// RUN: %clangxx -### %s -fsycl -fsycl-targets=amdgcn-amd-amdhsa -Xsycl-target-backend=amdgcn-amd-amdhsa --offload-arch=gfx1031 -fno-sycl-libspirv -nogpulib --sysroot=%S/Inputs/SYCL %s 2>&1 \
+// RUN: | FileCheck %s
+
+// CHECK: sycl-post-link{{.*}} "-emit-program-metadata" {{.*}}
+// CHECK-NOT: "-cc1"{{.*}}"-fvisibility=hidden"
+
diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt
@@ -57,14 +57,13 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT)
   include(FetchContent)
 
   set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
-  # commit d06ba9d9c539dc712444c6db95dfe1629bd5f7d8
-  # Merge:  e1414e1 35b6a5e
-  # Author: Kenneth Benzie (Benie) <[email protected]>
-  # Date:   Thu Jan 11 15:09:01 2024 +0000
-  #     Merge pull request #1035 from Bensuo/cmd-buffer-profiling-l0
-  #     [EXP][CMDBUF] Add support for recovering CommandBuffer profiling
-  #     information
-  set(UNIFIED_RUNTIME_TAG d06ba9d9c539dc712444c6db95dfe1629bd5f7d8)
+  # commit 79c28d0f0713f58358d5080653d95803fd131749
+  # Merge: 25e0b603 45d76b78
+  # Author: aarongreig <[email protected]>
+  # Date: Fri Jan 12 16:14:44 2024 +0000
+  #     Merge pull request #1186 from hdelan/device-global-hip
+  #     [HIP] Add support for global variable read write
+  set(UNIFIED_RUNTIME_TAG 79c28d0f0713f58358d5080653d95803fd131749)
 
   if(SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO)
     set(UNIFIED_RUNTIME_REPO "${SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO}")

diff --git a/sycl/test-e2e/DeviceGlobal/device_global_arrow.cpp b/sycl/test-e2e/DeviceGlobal/device_global_arrow.cpp
@@ -1,9 +1,9 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 //
-// The HIP and OpenCL GPU backends do not currently support device_global
-// backend calls.
-// UNSUPPORTED: hip || (opencl && gpu)
+// The OpenCL GPU backends do not currently support device_global backend
+// calls.
+// UNSUPPORTED: opencl && gpu
 //
 // Tests operator-> on device_global.
 

diff --git a/sycl/test-e2e/DeviceGlobal/device_global_arrow_dis.cpp b/sycl/test-e2e/DeviceGlobal/device_global_arrow_dis.cpp
@@ -1,9 +1,9 @@
 // RUN: %{build} -fsycl-device-code-split=per_source -DUSE_DEVICE_IMAGE_SCOPE -o %t.out
 // RUN: %{run} %t.out
 //
-// The HIP and OpenCL GPU backends do not currently support device_global
-// backend calls.
-// UNSUPPORTED: hip || (opencl && gpu)
+// The OpenCL GPU backends do not currently support device_global backend
+// calls.
+// UNSUPPORTED: opencl && gpu
 //
 // Tests operator-> on device_global with device_image_scope.
 // NOTE: USE_DEVICE_IMAGE_SCOPE needs both kernels to be in the same image so

diff --git a/sycl/test-e2e/DeviceGlobal/device_global_device_only.cpp b/sycl/test-e2e/DeviceGlobal/device_global_device_only.cpp
@@ -1,9 +1,9 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 //
-// The HIP and OpenCL GPU backends do not currently support device_global
-// backend calls.
-// UNSUPPORTED: hip || (opencl && gpu)
+// The OpenCL GPU backends do not currently support device_global backend
+// calls.
+// UNSUPPORTED: opencl && gpu
 //
 // Tests basic device_global access through device kernels.
 

diff --git a/sycl/test-e2e/DeviceGlobal/device_global_device_only_dis.cpp b/sycl/test-e2e/DeviceGlobal/device_global_device_only_dis.cpp
@@ -1,9 +1,9 @@
 // RUN: %{build} -fsycl-device-code-split=per_source -DUSE_DEVICE_IMAGE_SCOPE -o %t.out
 // RUN: %{run} %t.out
 //
-// The HIP and OpenCL GPU backends do not currently support device_global
-// backend calls.
-// UNSUPPORTED: hip || (opencl && gpu)
+// The OpenCL GPU backends do not currently support device_global backend
+// calls.
+// UNSUPPORTED: opencl && gpu
 //
 // Tests basic device_global with device_image_scope access through device
 // kernels.

diff --git a/sycl/test-e2e/DeviceGlobal/device_global_operator_passthrough.cpp b/sycl/test-e2e/DeviceGlobal/device_global_operator_passthrough.cpp
@@ -1,9 +1,9 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 //
-// The HIP and OpenCL GPU backends do not currently support device_global
-// backend calls.
-// UNSUPPORTED: hip || (opencl && gpu)
+// The OpenCL GPU backends do not currently support device_global backend
+// calls.
+// UNSUPPORTED: opencl && gpu
 //
 // Tests the passthrough of operators on device_global.
 

diff --git a/sycl/test-e2e/DeviceGlobal/device_global_operator_passthrough_dis.cpp b/sycl/test-e2e/DeviceGlobal/device_global_operator_passthrough_dis.cpp
@@ -1,9 +1,9 @@
 // RUN: %{build} -fsycl-device-code-split=per_source -DUSE_DEVICE_IMAGE_SCOPE -o %t.out
 // RUN: %{run} %t.out
 //
-// The HIP and OpenCL GPU backends do not currently support device_global
-// backend calls.
-// UNSUPPORTED: hip || (opencl && gpu)
+// The OpenCL GPU backends do not currently support device_global backend
+// calls.
+// UNSUPPORTED: opencl && gpu
 //
 // Tests the passthrough of operators on device_global with device_image_scope.
 // NOTE: USE_DEVICE_IMAGE_SCOPE needs both kernels to be in the same image so

diff --git a/sycl/test-e2e/DeviceGlobal/device_global_subscript.cpp b/sycl/test-e2e/DeviceGlobal/device_global_subscript.cpp
@@ -1,9 +1,9 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 //
-// The HIP and OpenCL GPU backends do not currently support device_global
-// backend calls.
-// UNSUPPORTED: hip || (opencl && gpu)
+// The OpenCL GPU backends do not currently support device_global backend
+// calls.
+// UNSUPPORTED: opencl && gpu
 //
 // Tests operator[] on device_global.
 

diff --git a/sycl/test-e2e/DeviceGlobal/device_global_subscript_dis.cpp b/sycl/test-e2e/DeviceGlobal/device_global_subscript_dis.cpp
@@ -1,9 +1,9 @@
 // RUN: %{build} -fsycl-device-code-split=per_source -DUSE_DEVICE_IMAGE_SCOPE -o %t.out
 // RUN: %{run} %t.out
 //
-// The HIP and OpenCL GPU backends do not currently support device_global
-// backend calls.
-// UNSUPPORTED: hip || (opencl && gpu)
+// The OpenCL GPU backends do not currently support device_global backend
+// calls.
+// UNSUPPORTED: opencl && gpu
 //
 // Tests operator[] on device_global with device_image_scope.
 // NOTE: USE_DEVICE_IMAGE_SCOPE needs both kernels to be in the same image so