Skip to content

[SYCL][E2E][Bindless] Use REQUIRES: aspect-ext_oneapi_bindless_images #15211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 7, 2024
Merged

[SYCL][E2E][Bindless] Use REQUIRES: aspect-ext_oneapi_bindless_images #15211

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bda610
[SYCL][E2E][Bindless] Use REQUIRES: aspect-ext_oneapi_bindless_images
wenju-he Aug 28, 2024
8315ec6
[UR] Bump main tag to b79ebe4e
kbenzie Oct 4, 2024
7ee641f
Merge remote-tracking branch 'origin/sycl' into sycl-bindless-e2e-asp…
kbenzie Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions sycl/cmake/modules/FetchUnifiedRuntime.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,13 @@ if(SYCL_UR_USE_FETCH_CONTENT)
CACHE PATH "Path to external '${name}' adapter source dir" FORCE)
endfunction()

set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
# commit b766009add8dc41ad03e2a63be9f6ed40eea4c55 (HEAD, origin/main, origin/HEAD)
# Merge: 608e9184 c3c57284
# Author: Omar Ahmed <[email protected]>
# Date: Tue Aug 27 16:30:04 2024 +0100
# Merge pull request #2011 from nrspruit/fix_opencl_usm_align_check
# [OpenCL] Fix USM alignment error check to occur always and return nulllptr
set(UNIFIED_RUNTIME_TAG b766009add8dc41ad03e2a63be9f6ed40eea4c55)
set(UNIFIED_RUNTIME_REPO "https://github.com/wenju-he/unified-runtime.git")
# commit 024a0f2b4b20f7c6ffb6cc81561685f2b1d12d2c (HEAD -> L0-bindless-image-device-query, wenju/L0-bindless-image-device-query)
# Author: Wenju He <[email protected]>
# Date: Tue Aug 27 18:47:11 2024 -0700
# [L0] Fix device query of bindless image support
# Bindless image support is only supported on intel DG2 or newer GPU.
set(UNIFIED_RUNTIME_TAG 024a0f2b4b20f7c6ffb6cc81561685f2b1d12d2c)

set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES")
# Due to the use of dependentloadflag and no installer for UMF and hwloc we need
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/bindless_images/array/read_write_unsampled_array.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/bindless_images/read_1D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/bindless_images/read_2D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/bindless_images/read_2D_dynamic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/bindless_images/read_3D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/bindless_images/read_norm_types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/bindless_images/read_write_1D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/bindless_images/read_write_1D_subregion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/bindless_images/read_write_2D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/bindless_images/read_write_2D_subregion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/bindless_images/read_write_3D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/bindless_images/read_write_3D_subregion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/bindless_images/read_write_unsampled.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/bindless_images/sampling_1D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/bindless_images/sampling_2D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/bindless_images/sampling_2D_half.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/bindless_images/sampling_3D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/bindless_images/vulkan_interop/sampled_images.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 %}
Expand Down