[SYCL][CUDA][HIP] Update images enable variable (intel#16147)

This patch adds a variable to enable image support for HIP, and updates the one for CUDA to use the UR naming. SYCL images support is similar for CUDA and HIP, so it makes sense to treat them the same, and any future work on this will focus on bindless images rather than SYCL images. UR side PR: oneapi-src/unified-runtime#2356 --------- Co-authored-by: Martin Morrison-Grant <[email protected]>
martygrant · Dec 12, 2024 · fe88f1d · fe88f1d
1 parent 1587ea5
commit fe88f1d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/sycl/cmake/modules/UnifiedRuntimeTag.cmake b/sycl/cmake/modules/UnifiedRuntimeTag.cmake
@@ -1,7 +1,7 @@
-# commit 098deca1f9f3b9f3f0563ee823ac424d8db30668
-# Merge: 58e4d76c2ace 73ba29bfe9df
+# commit 06f48f674445532d8c04be431474901b82c3c449
+# Merge: 098deca1f9f3 1b373f83c71e
 # Author: Martin Grant <[email protected]>
-# Date:   Wed Dec 11 17:23:43 2024 +0000
-#     Merge pull request #2299 from cppchedy/chedy/fix-mipmap-leak
-#     [CUDA][Bindless] Fix memory leak in interop mapping
-set(UNIFIED_RUNTIME_TAG 098deca1f9f3b9f3f0563ee823ac424d8db30668)
+# Date:   Thu Dec 12 11:04:15 2024 +0000
+#     Merge pull request #2356 from npmiller/hip-images
+#     [HIP] Disable SYCL images by default
+set(UNIFIED_RUNTIME_TAG 06f48f674445532d8c04be431474901b82c3c449)
diff --git a/sycl/test-e2e/format.py b/sycl/test-e2e/format.py
@@ -212,7 +212,10 @@ def get_extra_env(sycl_devices):
                 )
 
             if "cuda:gpu" in sycl_devices:
-                extra_env.append("SYCL_PI_CUDA_ENABLE_IMAGE_SUPPORT=1")
+                extra_env.append("UR_CUDA_ENABLE_IMAGE_SUPPORT=1")
+
+            if "hip:gpu" in sycl_devices:
+                extra_env.append("UR_HIP_ENABLE_IMAGE_SUPPORT=1")
 
             return extra_env
 

diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py
@@ -666,7 +666,9 @@ def open_check_file(file_name):
     env = copy.copy(llvm_config.config.environment)
     env["ONEAPI_DEVICE_SELECTOR"] = sycl_device
     if sycl_device.startswith("cuda:"):
-        env["SYCL_PI_CUDA_ENABLE_IMAGE_SUPPORT"] = "1"
+        env["UR_CUDA_ENABLE_IMAGE_SUPPORT"] = "1"
+    if sycl_device.startswith("hip:"):
+        env["UR_HIP_ENABLE_IMAGE_SUPPORT"] = "1"
     # When using the ONEAPI_DEVICE_SELECTOR environment variable, sycl-ls
     # prints warnings that might derail a user thinking something is wrong
     # with their test run. It's just us filtering here, so silence them unless