Skip to content

Commit 6d963d9

Browse files
npmillermartygrant
authored andcommitted
[SYCL][CUDA][HIP] Update images enable variable
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.
1 parent ede906c commit 6d963d9

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

sycl/test-e2e/format.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,10 @@ def get_extra_env(sycl_devices):
212212
)
213213

214214
if "cuda:gpu" in sycl_devices:
215-
extra_env.append("SYCL_PI_CUDA_ENABLE_IMAGE_SUPPORT=1")
215+
extra_env.append("UR_CUDA_ENABLE_IMAGE_SUPPORT=1")
216+
217+
if "hip:gpu" in sycl_devices:
218+
extra_env.append("UR_HIP_ENABLE_IMAGE_SUPPORT=1")
216219

217220
return extra_env
218221

sycl/test-e2e/lit.cfg.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,9 @@ def open_check_file(file_name):
663663
env = copy.copy(llvm_config.config.environment)
664664
env["ONEAPI_DEVICE_SELECTOR"] = sycl_device
665665
if sycl_device.startswith("cuda:"):
666-
env["SYCL_PI_CUDA_ENABLE_IMAGE_SUPPORT"] = "1"
666+
env["UR_CUDA_ENABLE_IMAGE_SUPPORT"] = "1"
667+
if sycl_device.startswith("hip:"):
668+
env["UR_HIP_ENABLE_IMAGE_SUPPORT"] = "1"
667669
# When using the ONEAPI_DEVICE_SELECTOR environment variable, sycl-ls
668670
# prints warnings that might derail a user thinking something is wrong
669671
# with their test run. It's just us filtering here, so silence them unless

0 commit comments

Comments
 (0)