From 58c43f2eee16bdd00132d4e6fa15f9392542e243 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Mon, 27 Jan 2025 06:08:48 -0800 Subject: [PATCH 1/2] Remove `REQUIRES: build-and-run-mode` in bindless_images tests --- sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp | 3 +-- .../bindless_images/dx12_interop/read_write_unsampled.cpp | 1 - .../bindless_images/examples/example_5_sample_cubemap.cpp | 3 +-- sycl/test-e2e/bindless_images/vulkan_interop/mipmaps.cpp | 1 - .../test-e2e/bindless_images/vulkan_interop/sampled_images.cpp | 1 - .../bindless_images/vulkan_interop/sampled_images_USM.cpp | 1 - .../vulkan_interop/sampled_images_semaphore.cpp | 1 - .../bindless_images/vulkan_interop/unsampled_images.cpp | 1 - .../vulkan_interop/unsampled_images_semaphore.cpp | 1 - 9 files changed, 2 insertions(+), 11 deletions(-) diff --git a/sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp b/sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp index d228b308ab72e..323ff9ba1fb20 100644 --- a/sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp +++ b/sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp @@ -1,6 +1,5 @@ -// REQUIRES: cuda,aspect-ext_oneapi_cubemap +// REQUIRES: target-nvidia,aspect-ext_oneapi_cubemap // REQUIRES: aspect-ext_oneapi_cubemap_seamless_filtering -// REQUIRES: build-and-run-mode // RUN: %{build} -o %t.out // RUN: %{run} %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 1d5a59a40b5ab..1aeb63636cc71 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,6 +1,5 @@ // REQUIRES: aspect-ext_oneapi_bindless_images // REQUIRES: windows -// REQUIRES: build-and-run-mode // DEFINE: %{link-flags}=%if cl_options %{ /clang:-ld3d12 /clang:-ldxgi /clang:-ldxguid %} %else %{ -ld3d12 -ldxgi -ldxguid %} // RUN: %{build} %{link-flags} -o %t.out %if any-device-is-level_zero %{ -DDISABLE_UNORM_TESTS %} diff --git a/sycl/test-e2e/bindless_images/examples/example_5_sample_cubemap.cpp b/sycl/test-e2e/bindless_images/examples/example_5_sample_cubemap.cpp index c6ba9b48fad52..ebac7e6dc9b19 100644 --- a/sycl/test-e2e/bindless_images/examples/example_5_sample_cubemap.cpp +++ b/sycl/test-e2e/bindless_images/examples/example_5_sample_cubemap.cpp @@ -1,5 +1,4 @@ -// REQUIRES: cuda -// REQUIRES: build-and-run-mode +// REQUIRES: target-nvidia // RUN: %{build} -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/bindless_images/vulkan_interop/mipmaps.cpp b/sycl/test-e2e/bindless_images/vulkan_interop/mipmaps.cpp index 57623c1b2da03..1e826270f827c 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/mipmaps.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/mipmaps.cpp @@ -1,6 +1,5 @@ // REQUIRES: cuda // REQUIRES: vulkan -// REQUIRES: build-and-run-mode // RUN: %{build} %link-vulkan -o %t.out // RUN: %{run} %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 12e5cfe5cad87..fc768b9246d14 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images.cpp @@ -1,6 +1,5 @@ // REQUIRES: cuda || (windows && level_zero && aspect-ext_oneapi_bindless_images) // REQUIRES: vulkan -// REQUIRES: build-and-run-mode // RUN: %{build} %link-vulkan -o %t.out %if any-device-is-level_zero %{ -Wno-ignored-attributes -DENABLE_LINEAR_TILING -DTEST_L0_SUPPORTED_VK_FORMAT %} // RUN: %{run} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out diff --git a/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_USM.cpp b/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_USM.cpp index 159b1c9ec1b44..d480d4fed3db8 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_USM.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_USM.cpp @@ -1,6 +1,5 @@ // REQUIRES: cuda // REQUIRES: vulkan -// REQUIRES: build-and-run-mode // RUN: %{build} %link-vulkan -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_semaphore.cpp b/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_semaphore.cpp index 497ade9d8af78..46c56f9c9db38 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_semaphore.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_semaphore.cpp @@ -1,6 +1,5 @@ // REQUIRES: cuda || (windows && level_zero && aspect-ext_oneapi_bindless_images) // REQUIRES: vulkan -// REQUIRES: build-and-run-mode // RUN: %{build} %link-vulkan -o %t.out // RUN: %{run} %t.out 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 b6d046904eea9..ddc9c5e0c9fc8 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp @@ -1,6 +1,5 @@ // REQUIRES: cuda || (windows && level_zero && aspect-ext_oneapi_bindless_images) // REQUIRES: vulkan -// REQUIRES: build-and-run-mode // RUN: %{build} %link-vulkan -o %t.out %if any-device-is-level_zero %{ -Wno-ignored-attributes -DTEST_L0_SUPPORTED_VK_FORMAT %} // RUN: %{run} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out diff --git a/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images_semaphore.cpp b/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images_semaphore.cpp index af9163311727c..54fc2d7bfb984 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images_semaphore.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images_semaphore.cpp @@ -1,6 +1,5 @@ // REQUIRES: cuda // REQUIRES: vulkan -// REQUIRES: build-and-run-mode // RUN: %{build} %link-vulkan -o %t.out // RUN: %{run} %t.out From 00a4b8886911795f3fc0df3da82574265fc88b6d Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Fri, 31 Jan 2025 07:24:56 -0800 Subject: [PATCH 2/2] Use `target-nvidia` instead of `cuda` in Vulkan tests --- sycl/test-e2e/bindless_images/vulkan_interop/mipmaps.cpp | 2 +- sycl/test-e2e/bindless_images/vulkan_interop/sampled_images.cpp | 2 +- .../bindless_images/vulkan_interop/sampled_images_USM.cpp | 2 +- .../bindless_images/vulkan_interop/sampled_images_semaphore.cpp | 2 +- .../bindless_images/vulkan_interop/unsampled_images.cpp | 2 +- .../vulkan_interop/unsampled_images_semaphore.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sycl/test-e2e/bindless_images/vulkan_interop/mipmaps.cpp b/sycl/test-e2e/bindless_images/vulkan_interop/mipmaps.cpp index 1e826270f827c..20737ce7540b8 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/mipmaps.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/mipmaps.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda +// REQUIRES: target-nvidia // REQUIRES: vulkan // RUN: %{build} %link-vulkan -o %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 fc768b9246d14..5eb9f915ebd27 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 && aspect-ext_oneapi_bindless_images) +// REQUIRES: target-nvidia || (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/sampled_images_USM.cpp b/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_USM.cpp index d480d4fed3db8..762b4155d6ef9 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_USM.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_USM.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda +// REQUIRES: target-nvidia // REQUIRES: vulkan // RUN: %{build} %link-vulkan -o %t.out diff --git a/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_semaphore.cpp b/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_semaphore.cpp index 46c56f9c9db38..9b3409defe00f 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_semaphore.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_semaphore.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda || (windows && level_zero && aspect-ext_oneapi_bindless_images) +// REQUIRES: target-nvidia || (windows && level_zero && aspect-ext_oneapi_bindless_images) // REQUIRES: vulkan // RUN: %{build} %link-vulkan -o %t.out 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 ddc9c5e0c9fc8..a320277d2d2ec 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 && aspect-ext_oneapi_bindless_images) +// REQUIRES: target-nvidia || (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 %} diff --git a/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images_semaphore.cpp b/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images_semaphore.cpp index 54fc2d7bfb984..0d7f4f9bb8da5 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images_semaphore.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images_semaphore.cpp @@ -1,4 +1,4 @@ -// REQUIRES: cuda +// REQUIRES: target-nvidia // REQUIRES: vulkan // RUN: %{build} %link-vulkan -o %t.out