From a4f74a9c2c728521f305700e32a602d0bf1892fa Mon Sep 17 00:00:00 2001 From: Wenju He Date: Mon, 7 Oct 2024 11:26:12 +0000 Subject: [PATCH] [SYCL][E2E][Bindless] Use REQUIRES: aspect-ext_oneapi_bindless_images (#15211) Basic SYCL bindless image e2e tests can now pass on DG2/BMG/MTL/LNL. Adjust REQUIRES check for supported GPUs other than DG2. UR PR: https://github.com/oneapi-src/unified-runtime/pull/2018 --------- Co-authored-by: Kenneth Benzie (Benie) --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 14 +++++++------- .../array/read_write_unsampled_array.cpp | 2 +- .../dx12_interop/read_write_unsampled.cpp | 2 +- sycl/test-e2e/bindless_images/read_1D.cpp | 2 +- sycl/test-e2e/bindless_images/read_2D.cpp | 2 +- sycl/test-e2e/bindless_images/read_2D_dynamic.cpp | 2 +- sycl/test-e2e/bindless_images/read_3D.cpp | 2 +- sycl/test-e2e/bindless_images/read_norm_types.cpp | 2 +- sycl/test-e2e/bindless_images/read_write_1D.cpp | 2 +- .../bindless_images/read_write_1D_subregion.cpp | 2 +- sycl/test-e2e/bindless_images/read_write_2D.cpp | 2 +- .../bindless_images/read_write_2D_subregion.cpp | 2 +- sycl/test-e2e/bindless_images/read_write_3D.cpp | 2 +- .../bindless_images/read_write_3D_subregion.cpp | 2 +- .../bindless_images/read_write_unsampled.cpp | 2 +- sycl/test-e2e/bindless_images/sampling_1D.cpp | 2 +- sycl/test-e2e/bindless_images/sampling_2D.cpp | 2 +- sycl/test-e2e/bindless_images/sampling_2D_half.cpp | 2 +- sycl/test-e2e/bindless_images/sampling_3D.cpp | 2 +- .../vulkan_interop/sampled_images.cpp | 2 +- .../vulkan_interop/unsampled_images.cpp | 2 +- 21 files changed, 27 insertions(+), 27 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index b32c7db69947..64ffe1dee722 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -117,13 +117,13 @@ if(SYCL_UR_USE_FETCH_CONTENT) endfunction() set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") - # commit 7907998a442b381a6669d2ae5ab957f8ddda5d03 - # Merge: 7e9d9d47 ae7f58e3 - # Author: aarongreig - # Date: Fri Oct 4 11:35:10 2024 +0100 - # Merge pull request #2121 from nrspruit/error_after_free_syclos - # [L0] Refcnt Parent Buffer on Sub Buffer Create and die on use of buffer after free - set(UNIFIED_RUNTIME_TAG 7907998a442b381a6669d2ae5ab957f8ddda5d03) + # commit b79ebe4e98789144bcdf3832088eb6e6b5ae6967 + # Merge: 7b4bc761 fbb6e862 + # Author: Kenneth Benzie (Benie) + # Date: Fri Oct 4 16:39:59 2024 +0100 + # Merge pull request #2018 from wenju-he/L0-bindless-image-device-query + # [L0] Fix device query of bindless image support + set(UNIFIED_RUNTIME_TAG b79ebe4e98789144bcdf3832088eb6e6b5ae6967) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") # Due to the use of dependentloadflag and no installer for UMF and hwloc we need diff --git a/sycl/test-e2e/bindless_images/array/read_write_unsampled_array.cpp b/sycl/test-e2e/bindless_images/array/read_write_unsampled_array.cpp index c87d6585fd18..ffc6a34db202 100644 --- a/sycl/test-e2e/bindless_images/array/read_write_unsampled_array.cpp +++ b/sycl/test-e2e/bindless_images/array/read_write_unsampled_array.cpp @@ -1,5 +1,5 @@ // REQUIRES: linux -// REQUIRES: cuda || (level_zero && gpu-intel-dg2) +// REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out // RUN: %{run} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out diff --git a/sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled.cpp b/sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled.cpp index 5f3876d90a3b..8abfd5a4e81f 100644 --- a/sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled.cpp +++ b/sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda || (level_zero && gpu-intel-dg2) +// REQUIRES: aspect-ext_oneapi_bindless_images // REQUIRES: windows // RUN: %{build} -l d3d12 -l dxgi -l dxguid -o %t.out diff --git a/sycl/test-e2e/bindless_images/read_1D.cpp b/sycl/test-e2e/bindless_images/read_1D.cpp index 2c850e83e38e..57e9f8874b42 100644 --- a/sycl/test-e2e/bindless_images/read_1D.cpp +++ b/sycl/test-e2e/bindless_images/read_1D.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda || (level_zero && gpu-intel-dg2) +// REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out // RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out diff --git a/sycl/test-e2e/bindless_images/read_2D.cpp b/sycl/test-e2e/bindless_images/read_2D.cpp index e4fc6800dec6..218a9269914a 100644 --- a/sycl/test-e2e/bindless_images/read_2D.cpp +++ b/sycl/test-e2e/bindless_images/read_2D.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda || (level_zero && gpu-intel-dg2) +// REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out // RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out diff --git a/sycl/test-e2e/bindless_images/read_2D_dynamic.cpp b/sycl/test-e2e/bindless_images/read_2D_dynamic.cpp index 71b5c447b609..a96941ee4c53 100644 --- a/sycl/test-e2e/bindless_images/read_2D_dynamic.cpp +++ b/sycl/test-e2e/bindless_images/read_2D_dynamic.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda || (level_zero && gpu-intel-dg2) +// REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out // RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out diff --git a/sycl/test-e2e/bindless_images/read_3D.cpp b/sycl/test-e2e/bindless_images/read_3D.cpp index 1baac18ef7fe..d99a53072465 100644 --- a/sycl/test-e2e/bindless_images/read_3D.cpp +++ b/sycl/test-e2e/bindless_images/read_3D.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda || (level_zero && gpu-intel-dg2) +// REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out // RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out diff --git a/sycl/test-e2e/bindless_images/read_norm_types.cpp b/sycl/test-e2e/bindless_images/read_norm_types.cpp index ddc185b71d72..e0fc16f049d2 100644 --- a/sycl/test-e2e/bindless_images/read_norm_types.cpp +++ b/sycl/test-e2e/bindless_images/read_norm_types.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda || (level_zero && gpu-intel-dg2) +// REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out // RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out diff --git a/sycl/test-e2e/bindless_images/read_write_1D.cpp b/sycl/test-e2e/bindless_images/read_write_1D.cpp index fca0901bdd8d..aa9c03d4aa76 100644 --- a/sycl/test-e2e/bindless_images/read_write_1D.cpp +++ b/sycl/test-e2e/bindless_images/read_write_1D.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda || (level_zero && gpu-intel-dg2) +// REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out // RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out diff --git a/sycl/test-e2e/bindless_images/read_write_1D_subregion.cpp b/sycl/test-e2e/bindless_images/read_write_1D_subregion.cpp index edb33c0780dc..0c0b150de0e0 100644 --- a/sycl/test-e2e/bindless_images/read_write_1D_subregion.cpp +++ b/sycl/test-e2e/bindless_images/read_write_1D_subregion.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda || (level_zero && gpu-intel-dg2) +// REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out // RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out diff --git a/sycl/test-e2e/bindless_images/read_write_2D.cpp b/sycl/test-e2e/bindless_images/read_write_2D.cpp index abde9816f542..dcf9dddcddf9 100644 --- a/sycl/test-e2e/bindless_images/read_write_2D.cpp +++ b/sycl/test-e2e/bindless_images/read_write_2D.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda || (level_zero && gpu-intel-dg2) +// REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out // RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out diff --git a/sycl/test-e2e/bindless_images/read_write_2D_subregion.cpp b/sycl/test-e2e/bindless_images/read_write_2D_subregion.cpp index 464a173a1d1b..636406a5e015 100644 --- a/sycl/test-e2e/bindless_images/read_write_2D_subregion.cpp +++ b/sycl/test-e2e/bindless_images/read_write_2D_subregion.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda || (level_zero && gpu-intel-dg2) +// REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out // RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out diff --git a/sycl/test-e2e/bindless_images/read_write_3D.cpp b/sycl/test-e2e/bindless_images/read_write_3D.cpp index e310e9347b4a..0bbb071a11d9 100644 --- a/sycl/test-e2e/bindless_images/read_write_3D.cpp +++ b/sycl/test-e2e/bindless_images/read_write_3D.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda || (level_zero && gpu-intel-dg2) +// REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out // RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out diff --git a/sycl/test-e2e/bindless_images/read_write_3D_subregion.cpp b/sycl/test-e2e/bindless_images/read_write_3D_subregion.cpp index 9910ef0989b6..0987d0870bf7 100644 --- a/sycl/test-e2e/bindless_images/read_write_3D_subregion.cpp +++ b/sycl/test-e2e/bindless_images/read_write_3D_subregion.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda || (level_zero && gpu-intel-dg2) +// REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out // RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out diff --git a/sycl/test-e2e/bindless_images/read_write_unsampled.cpp b/sycl/test-e2e/bindless_images/read_write_unsampled.cpp index e4881cd9903a..09d9818e5eb0 100644 --- a/sycl/test-e2e/bindless_images/read_write_unsampled.cpp +++ b/sycl/test-e2e/bindless_images/read_write_unsampled.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda || (level_zero && gpu-intel-dg2) +// REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out // RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out diff --git a/sycl/test-e2e/bindless_images/sampling_1D.cpp b/sycl/test-e2e/bindless_images/sampling_1D.cpp index 3342e4ae2215..e50a90b1cb72 100644 --- a/sycl/test-e2e/bindless_images/sampling_1D.cpp +++ b/sycl/test-e2e/bindless_images/sampling_1D.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda || (level_zero && gpu-intel-dg2) +// REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out // RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out diff --git a/sycl/test-e2e/bindless_images/sampling_2D.cpp b/sycl/test-e2e/bindless_images/sampling_2D.cpp index 30ccf696fbc2..2342763aabae 100644 --- a/sycl/test-e2e/bindless_images/sampling_2D.cpp +++ b/sycl/test-e2e/bindless_images/sampling_2D.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda || (level_zero && gpu-intel-dg2) +// REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out // RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out diff --git a/sycl/test-e2e/bindless_images/sampling_2D_half.cpp b/sycl/test-e2e/bindless_images/sampling_2D_half.cpp index 247b9589ba9d..45a2a09d7947 100644 --- a/sycl/test-e2e/bindless_images/sampling_2D_half.cpp +++ b/sycl/test-e2e/bindless_images/sampling_2D_half.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda || (level_zero && gpu-intel-dg2) +// REQUIRES: aspect-ext_oneapi_bindless_images // REQUIRES: aspect-fp16 // RUN: %{build} -o %t.out diff --git a/sycl/test-e2e/bindless_images/sampling_3D.cpp b/sycl/test-e2e/bindless_images/sampling_3D.cpp index 16b06e6964ed..5785dd0b55c2 100644 --- a/sycl/test-e2e/bindless_images/sampling_3D.cpp +++ b/sycl/test-e2e/bindless_images/sampling_3D.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda || (level_zero && gpu-intel-dg2) +// REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out // RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out diff --git a/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images.cpp b/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images.cpp index 077d42e4641c..1417a237f0c0 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda || (windows && level_zero && gpu-intel-dg2) +// REQUIRES: cuda || (windows && level_zero && aspect-ext_oneapi_bindless_images) // REQUIRES: vulkan // RUN: %{build} %link-vulkan -o %t.out %if any-device-is-level_zero %{ -Wno-ignored-attributes -DENABLE_LINEAR_TILING -DTEST_L0_SUPPORTED_VK_FORMAT %} diff --git a/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp b/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp index e0d4d15ddb63..043fba15297a 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda || (windows && level_zero && gpu-intel-dg2) +// REQUIRES: cuda || (windows && level_zero && aspect-ext_oneapi_bindless_images) // REQUIRES: vulkan // RUN: %{build} %link-vulkan -o %t.out %if any-device-is-level_zero %{ -Wno-ignored-attributes -DTEST_L0_SUPPORTED_VK_FORMAT %}