diff --git a/sycl/cmake/modules/UnifiedRuntimeTag.cmake b/sycl/cmake/modules/UnifiedRuntimeTag.cmake index ed4da536baf31..5a6980c6f219b 100644 --- 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 -# 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 index e6d0da2c39b7b..cb4ac86008db2 100644 --- 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 index 76a70bea76f6e..63f165a9609f8 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -663,7 +663,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