Skip to content

Commit 400fc6a

Browse files
authored
[SYCL][E2E] Remove REQUIRES: build-and-run-mode in bindless_images tests (#16789)
As of #16725 tests can properly react to features that affect compilation on build-only mode (i.e., libraries or OS), additionally we can also mark if a test should only be built for a specific triple using the `target-*` features. This pr removes the `REQUIRES: build-and-run-mode` directives from bindless_images tests. These tests will now be marked as unsupported in environments that cannot build the tests due to missing the Vulkan library, or not being on Windows. For two tests removed the `REQUIRES: build-and-run-mode` directive by changing `REQUIRES: cuda` to `REQUIRES: target-nvidia`, this way the tests will only compile for nvidia triple.
1 parent d3e825c commit 400fc6a

File tree

9 files changed

+8
-17
lines changed

9 files changed

+8
-17
lines changed

sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
// REQUIRES: cuda,aspect-ext_oneapi_cubemap
1+
// REQUIRES: target-nvidia,aspect-ext_oneapi_cubemap
22
// REQUIRES: aspect-ext_oneapi_cubemap_seamless_filtering
3-
// REQUIRES: build-and-run-mode
43

54
// RUN: %{build} -o %t.out
65
// RUN: %{run} %t.out

sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// REQUIRES: aspect-ext_oneapi_bindless_images
22
// REQUIRES: windows
3-
// REQUIRES: build-and-run-mode
43

54
// DEFINE: %{link-flags}=%if cl_options %{ /clang:-ld3d12 /clang:-ldxgi /clang:-ldxguid %} %else %{ -ld3d12 -ldxgi -ldxguid %}
65
// RUN: %{build} %{link-flags} -o %t.out %if any-device-is-level_zero %{ -DDISABLE_UNORM_TESTS %}

sycl/test-e2e/bindless_images/examples/example_5_sample_cubemap.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// REQUIRES: cuda
2-
// REQUIRES: build-and-run-mode
1+
// REQUIRES: target-nvidia
32

43
// RUN: %{build} -o %t.out
54
// RUN: %{run} %t.out

sycl/test-e2e/bindless_images/vulkan_interop/mipmaps.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
// REQUIRES: cuda
1+
// REQUIRES: target-nvidia
22
// REQUIRES: vulkan
3-
// REQUIRES: build-and-run-mode
43

54
// RUN: %{build} %link-vulkan -o %t.out
65
// RUN: %{run} %t.out

sycl/test-e2e/bindless_images/vulkan_interop/sampled_images.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
// REQUIRES: cuda || (windows && level_zero && aspect-ext_oneapi_bindless_images)
1+
// REQUIRES: target-nvidia || (windows && level_zero && aspect-ext_oneapi_bindless_images)
22
// REQUIRES: vulkan
3-
// REQUIRES: build-and-run-mode
43

54
// RUN: %{build} %link-vulkan -o %t.out %if any-device-is-level_zero %{ -Wno-ignored-attributes -DENABLE_LINEAR_TILING -DTEST_L0_SUPPORTED_VK_FORMAT %}
65
// RUN: %{run} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out

sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_USM.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
// REQUIRES: cuda
1+
// REQUIRES: target-nvidia
22
// REQUIRES: vulkan
3-
// REQUIRES: build-and-run-mode
43

54
// RUN: %{build} %link-vulkan -o %t.out
65
// RUN: %{run} %t.out

sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_semaphore.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
// REQUIRES: cuda || (windows && level_zero && aspect-ext_oneapi_bindless_images)
1+
// REQUIRES: target-nvidia || (windows && level_zero && aspect-ext_oneapi_bindless_images)
22
// REQUIRES: vulkan
3-
// REQUIRES: build-and-run-mode
43

54
// RUN: %{build} %link-vulkan -o %t.out
65
// RUN: %{run} %t.out

sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
// REQUIRES: cuda || (windows && level_zero && aspect-ext_oneapi_bindless_images)
1+
// REQUIRES: target-nvidia || (windows && level_zero && aspect-ext_oneapi_bindless_images)
22
// REQUIRES: vulkan
3-
// REQUIRES: build-and-run-mode
43

54
// RUN: %{build} %link-vulkan -o %t.out %if any-device-is-level_zero %{ -Wno-ignored-attributes -DTEST_L0_SUPPORTED_VK_FORMAT %}
65
// RUN: %{run} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out

sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images_semaphore.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
// REQUIRES: cuda
1+
// REQUIRES: target-nvidia
22
// REQUIRES: vulkan
3-
// REQUIRES: build-and-run-mode
43

54
// RUN: %{build} %link-vulkan -o %t.out
65
// RUN: %{run} %t.out

0 commit comments

Comments
 (0)