From 7d2fe90acdb90f2ad0b934598148382b1a118200 Mon Sep 17 00:00:00 2001 From: David Garcia Orozco Date: Thu, 10 Oct 2024 10:44:04 -0600 Subject: [PATCH] [SYCL][E2E] Add missing `%{run-unfiltered-devices}` to e2e tests (#15636) A number of tests execute without using either the `%{run}` or `%{run-unfiltered-devices}` expansion. This patch adds `%{run-unfiltered-devices}` to these test (and `%{run}` to one test). --- sycl/test-e2e/Basic/AMX_aspect.cpp | 2 +- .../Basic/context-with-multiple-devices.cpp | 2 +- sycl/test-e2e/Basic/interop/construction_ocl.cpp | 2 +- sycl/test-e2e/Basic/interop/construction_ze.cpp | 2 +- .../Basic/interop/make_kernel_subdevice_l0.cpp | 2 +- sycl/test-e2e/Basic/query.cpp | 2 +- .../CompositeDevice/device_selector_test.cpp | 2 +- sycl/test-e2e/Config/config.cpp | 6 +++--- sycl/test-e2e/Config/default-context.cpp | 6 +++--- sycl/test-e2e/ESIMD/hardware_dispatch.cpp | 2 +- sycl/test-e2e/Graph/Explicit/basic_usm_system.cpp | 2 +- .../KernelAndProgram/cache_env_vars_win.cpp | 12 ++++++------ sycl/test-e2e/OneapiDeviceSelector/cpu_gpu_acc.cpp | 14 +++++++------- sycl/test-e2e/Plugin/sycl-targets-order.cpp | 8 ++++---- sycl/test-e2e/QueueFlushing/queue_flushing.cpp | 2 +- .../SpecConstants/2020/non_native/cuda.cpp | 2 +- sycl/test-e2e/USM/multictxt.cpp | 2 +- .../bindless_images/cubemap/cubemap_unsampled.cpp | 2 +- .../dx12_interop/read_write_unsampled.cpp | 2 +- .../read_write_unsampled_semaphore.cpp | 2 +- sycl/test-e2e/bindless_images/image_get_info.cpp | 2 +- .../bindless_images/mipmap/mipmap_read_1D.cpp | 2 +- .../bindless_images/mipmap/mipmap_read_2D.cpp | 2 +- .../bindless_images/mipmap/mipmap_read_3D.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_sampled.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 +- .../bindless_images/sampling_2D_USM_shared.cpp | 2 +- sycl/test-e2e/bindless_images/sampling_2D_half.cpp | 2 +- sycl/test-e2e/bindless_images/sampling_3D.cpp | 2 +- 42 files changed, 60 insertions(+), 60 deletions(-) diff --git a/sycl/test-e2e/Basic/AMX_aspect.cpp b/sycl/test-e2e/Basic/AMX_aspect.cpp index ff3225c3670f5..5c53d89efcc49 100644 --- a/sycl/test-e2e/Basic/AMX_aspect.cpp +++ b/sycl/test-e2e/Basic/AMX_aspect.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out -// RUN: %t.out +// RUN: %{run-unfiltered-devices} %t.out // //==--------------- AMX_aspect.cpp - SYCL device test diff --git a/sycl/test-e2e/Basic/context-with-multiple-devices.cpp b/sycl/test-e2e/Basic/context-with-multiple-devices.cpp index 6bea65d496c5d..fdc024804c22c 100644 --- a/sycl/test-e2e/Basic/context-with-multiple-devices.cpp +++ b/sycl/test-e2e/Basic/context-with-multiple-devices.cpp @@ -1,7 +1,7 @@ // REQUIRES: accelerator, opencl-aot // RUN: %clangxx -fsycl -fintelfpga %s -o %t2.out -// RUN: env CL_CONFIG_CPU_EMULATE_DEVICES=2 %t2.out +// RUN: %{run-unfiltered-devices} env CL_CONFIG_CPU_EMULATE_DEVICES=2 %t2.out #include diff --git a/sycl/test-e2e/Basic/interop/construction_ocl.cpp b/sycl/test-e2e/Basic/interop/construction_ocl.cpp index f6ac565fc77f0..c3aa69ad03c60 100644 --- a/sycl/test-e2e/Basic/interop/construction_ocl.cpp +++ b/sycl/test-e2e/Basic/interop/construction_ocl.cpp @@ -1,6 +1,6 @@ // REQUIRES: opencl, opencl_icd // RUN: %{build} %opencl_lib -o %t.ocl.out -// RUN: env ONEAPI_DEVICE_SELECTOR="opencl:*" %t.ocl.out +// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="opencl:*" %t.ocl.out #include #include diff --git a/sycl/test-e2e/Basic/interop/construction_ze.cpp b/sycl/test-e2e/Basic/interop/construction_ze.cpp index 57f89f7d41059..4b935604f200b 100644 --- a/sycl/test-e2e/Basic/interop/construction_ze.cpp +++ b/sycl/test-e2e/Basic/interop/construction_ze.cpp @@ -1,6 +1,6 @@ // REQUIRES: level_zero, level_zero_dev_kit // RUN: %{build} %level_zero_options -o %t.ze.out -// RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" %t.ze.out +// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="level_zero:*" %t.ze.out #include diff --git a/sycl/test-e2e/Basic/interop/make_kernel_subdevice_l0.cpp b/sycl/test-e2e/Basic/interop/make_kernel_subdevice_l0.cpp index 5c71f8042a3ee..2e733843a58af 100644 --- a/sycl/test-e2e/Basic/interop/make_kernel_subdevice_l0.cpp +++ b/sycl/test-e2e/Basic/interop/make_kernel_subdevice_l0.cpp @@ -1,6 +1,6 @@ // REQUIRES: level_zero, opencl, level_zero_dev_kit // RUN: %{build} %level_zero_options -lOpenCL -o %t.ze.out -// RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" %t.ze.out +// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="level_zero:*" %t.ze.out #include #include diff --git a/sycl/test-e2e/Basic/query.cpp b/sycl/test-e2e/Basic/query.cpp index 61678f1c56196..01576c78d2587 100644 --- a/sycl/test-e2e/Basic/query.cpp +++ b/sycl/test-e2e/Basic/query.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out -// RUN: env ONEAPI_DEVICE_SELECTOR="*:gpu" %t.out +// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="*:gpu" %t.out // REQUIRES: gpu-intel-dg1 #include "query.hpp" diff --git a/sycl/test-e2e/CompositeDevice/device_selector_test.cpp b/sycl/test-e2e/CompositeDevice/device_selector_test.cpp index c2ec033045938..83314fecd66f8 100644 --- a/sycl/test-e2e/CompositeDevice/device_selector_test.cpp +++ b/sycl/test-e2e/CompositeDevice/device_selector_test.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl %s -o %t.out -// RUN: env ONEAPI_DEVICE_SELECTOR=level_zero:0 ZE_FLAT_DEVICE_HIERARCHY=COMBINED %t.out +// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR=level_zero:0 ZE_FLAT_DEVICE_HIERARCHY=COMBINED %t.out // REQUIRES: level_zero #include diff --git a/sycl/test-e2e/Config/config.cpp b/sycl/test-e2e/Config/config.cpp index d7f77c5f76939..d446f10519c79 100644 --- a/sycl/test-e2e/Config/config.cpp +++ b/sycl/test-e2e/Config/config.cpp @@ -7,13 +7,13 @@ //===----------------------------------------------------------------------===// // RUN: %{build} %debug_option %O0 -o %t.out // RUN: echo SYCL_PRINT_EXECUTION_GRAPH=always > %t.cfg -// RUN: env SYCL_CONFIG_FILE_NAME=%t.cfg %t.out +// RUN: %{run-unfiltered-devices} env SYCL_CONFIG_FILE_NAME=%t.cfg %t.out // RUN: cat *.dot > /dev/null // RUN: rm *.dot -// RUN: env SYCL_PRINT_EXECUTION_GRAPH=always %t.out +// RUN: %{run-unfiltered-devices} env SYCL_PRINT_EXECUTION_GRAPH=always %t.out // RUN: cat *.dot > /dev/null // RUN: rm *.dot -// RUN: %t.out +// RUN: %{run-unfiltered-devices} %t.out // RUN: not cat *.dot > /dev/null #include diff --git a/sycl/test-e2e/Config/default-context.cpp b/sycl/test-e2e/Config/default-context.cpp index 11e3c2e42302c..ee23cc95f5dab 100644 --- a/sycl/test-e2e/Config/default-context.cpp +++ b/sycl/test-e2e/Config/default-context.cpp @@ -1,7 +1,7 @@ // RUN: %{build} -o %t.out // RUN: %{run} %t.out -// RUN: env SYCL_ENABLE_DEFAULT_CONTEXTS=1 %t.out -// RUN: env SYCL_ENABLE_DEFAULT_CONTEXTS=0 %t.out 1 +// RUN: %{run-unfiltered-devices} env SYCL_ENABLE_DEFAULT_CONTEXTS=1 %t.out +// RUN: %{run-unfiltered-devices} env SYCL_ENABLE_DEFAULT_CONTEXTS=0 %t.out 1 #include @@ -19,4 +19,4 @@ int main(int argc, char *argv[]) { assert(q1.get_context() == q2.get_context()); else assert(q1.get_context() != q2.get_context()); -} \ No newline at end of file +} diff --git a/sycl/test-e2e/ESIMD/hardware_dispatch.cpp b/sycl/test-e2e/ESIMD/hardware_dispatch.cpp index 6cd29ed6fe0c7..4166d5dfbd44e 100644 --- a/sycl/test-e2e/ESIMD/hardware_dispatch.cpp +++ b/sycl/test-e2e/ESIMD/hardware_dispatch.cpp @@ -8,7 +8,7 @@ // XFAIL: igc-dev // REQUIRES: ocloc && arch-intel_gpu_tgllp // RUN: %clangxx -fsycl -fsycl-targets=intel_gpu_tgllp %s -o %t.out -// RUN: %t.out +// RUN: %{run-unfiltered-devices} %t.out // This is basic test to test hardware dispatch functionality with ESIMD. diff --git a/sycl/test-e2e/Graph/Explicit/basic_usm_system.cpp b/sycl/test-e2e/Graph/Explicit/basic_usm_system.cpp index 9be1dba269ebc..effb3d9bad481 100644 --- a/sycl/test-e2e/Graph/Explicit/basic_usm_system.cpp +++ b/sycl/test-e2e/Graph/Explicit/basic_usm_system.cpp @@ -1,7 +1,7 @@ // RUN: %{build} -o %t.out // RUN: %{run} %t.out // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG -// RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} +// RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} // Extra run to check for immediate-command-list in Level Zero // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %} diff --git a/sycl/test-e2e/KernelAndProgram/cache_env_vars_win.cpp b/sycl/test-e2e/KernelAndProgram/cache_env_vars_win.cpp index eda1b034f5003..66ee2d6798c26 100644 --- a/sycl/test-e2e/KernelAndProgram/cache_env_vars_win.cpp +++ b/sycl/test-e2e/KernelAndProgram/cache_env_vars_win.cpp @@ -7,17 +7,17 @@ // When no environment variables pointing cache directory are set the cache is // disabled -// RUN: env SYCL_CACHE_PERSISTENT=1 env -u SYCL_CACHE_DIR env -u AppData SYCL_UR_TRACE=2 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD -// RUN: env SYCL_CACHE_PERSISTENT=1 env -u SYCL_CACHE_DIR env -u AppData SYCL_UR_TRACE=2 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: %{run-unfiltered-devices} env SYCL_CACHE_PERSISTENT=1 env -u SYCL_CACHE_DIR env -u AppData SYCL_UR_TRACE=2 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: %{run-unfiltered-devices} env SYCL_CACHE_PERSISTENT=1 env -u SYCL_CACHE_DIR env -u AppData SYCL_UR_TRACE=2 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD // When any of environment variables pointing to cache root is present cache is // enabled // RUN: rm -rf %t/cache_dir -// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=2 env -u AppData %t.out | FileCheck %s --check-prefixes=CHECK-BUILD -// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=2 env -u AppData %t.out %t.out | FileCheck %s --check-prefixes=CHECK-CACHE +// RUN: %{run-unfiltered-devices} env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=2 env -u AppData %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: %{run-unfiltered-devices} env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=2 env -u AppData %t.out %t.out | FileCheck %s --check-prefixes=CHECK-CACHE // RUN: rm -rf %t/cache_dir -// RUN: env SYCL_CACHE_PERSISTENT=1 AppData=%t/cache_dir SYCL_UR_TRACE=2 env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-BUILD -// RUN: env SYCL_CACHE_PERSISTENT=1 AppData=%t/cache_dir SYCL_UR_TRACE=2 env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-CACHE +// RUN: %{run-unfiltered-devices} env SYCL_CACHE_PERSISTENT=1 AppData=%t/cache_dir SYCL_UR_TRACE=2 env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: %{run-unfiltered-devices} env SYCL_CACHE_PERSISTENT=1 AppData=%t/cache_dir SYCL_UR_TRACE=2 env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-CACHE // CHECK-BUILD-NOT: <--- urProgramCreateWithBinary( // CHECK-BUILD: <--- urProgramCreateWithIL( diff --git a/sycl/test-e2e/OneapiDeviceSelector/cpu_gpu_acc.cpp b/sycl/test-e2e/OneapiDeviceSelector/cpu_gpu_acc.cpp index 576801daff145..d3019a202526b 100644 --- a/sycl/test-e2e/OneapiDeviceSelector/cpu_gpu_acc.cpp +++ b/sycl/test-e2e/OneapiDeviceSelector/cpu_gpu_acc.cpp @@ -2,15 +2,15 @@ // RUN: %{build} -o %t.out -// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:fpga %t.out | FileCheck %s --check-prefixes=CHECK-ACC-ONLY -// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:gpu %t.out | FileCheck %s --check-prefixes=CHECK-GPU-ONLY -// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:cpu %t.out | FileCheck %s --check-prefixes=CHECK-CPU-ONLY +// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR=opencl:fpga %t.out | FileCheck %s --check-prefixes=CHECK-ACC-ONLY +// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR=opencl:gpu %t.out | FileCheck %s --check-prefixes=CHECK-GPU-ONLY +// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR=opencl:cpu %t.out | FileCheck %s --check-prefixes=CHECK-CPU-ONLY -// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:fpga,gpu %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU -// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:fpga,cpu %t.out | FileCheck %s --check-prefixes=CHECK-ACC-CPU +// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR=opencl:fpga,gpu %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU +// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR=opencl:fpga,cpu %t.out | FileCheck %s --check-prefixes=CHECK-ACC-CPU -// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:cpu,fpga,gpu %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU-CPU -// RUN: env ONEAPI_DEVICE_SELECTOR="opencl:*" %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU-CPU +// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR=opencl:cpu,fpga,gpu %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU-CPU +// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="opencl:*" %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU-CPU // // CHECK-ACC-ONLY-NOT: Device: cpu // CHECK-ACC-ONLY-NOT: Device: gpu diff --git a/sycl/test-e2e/Plugin/sycl-targets-order.cpp b/sycl/test-e2e/Plugin/sycl-targets-order.cpp index f33d65a5f1dc7..090e819c0305d 100644 --- a/sycl/test-e2e/Plugin/sycl-targets-order.cpp +++ b/sycl/test-e2e/Plugin/sycl-targets-order.cpp @@ -1,9 +1,9 @@ // RUN: %clangxx -fsycl -fsycl-targets=spir64,nvptx64-nvidia-cuda %s -o %t-spir64-nvptx64.out -// RUN: env ONEAPI_DEVICE_SELECTOR="opencl:*" %t-spir64-nvptx64.out -// RUN: env ONEAPI_DEVICE_SELECTOR="cuda:*" %t-spir64-nvptx64.out +// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="opencl:*" %t-spir64-nvptx64.out +// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="cuda:*" %t-spir64-nvptx64.out // RUN: %clangxx -fsycl -fsycl-targets=nvptx64-nvidia-cuda,spir64 %s -o %t-nvptx64-spir64.out -// RUN: env ONEAPI_DEVICE_SELECTOR="opencl:*" %t-nvptx64-spir64.out -// RUN: env ONEAPI_DEVICE_SELECTOR="cuda:*" %t-nvptx64-spir64.out +// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="opencl:*" %t-nvptx64-spir64.out +// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="cuda:*" %t-nvptx64-spir64.out // REQUIRES: opencl, cuda diff --git a/sycl/test-e2e/QueueFlushing/queue_flushing.cpp b/sycl/test-e2e/QueueFlushing/queue_flushing.cpp index 24e3399cad5a6..d8781e4afecc2 100644 --- a/sycl/test-e2e/QueueFlushing/queue_flushing.cpp +++ b/sycl/test-e2e/QueueFlushing/queue_flushing.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out -// RUN: %t.out +// RUN: %{run-unfiltered-devices} %t.out #include #include diff --git a/sycl/test-e2e/SpecConstants/2020/non_native/cuda.cpp b/sycl/test-e2e/SpecConstants/2020/non_native/cuda.cpp index 1067a0c15e643..12d2ce6a9faf9 100644 --- a/sycl/test-e2e/SpecConstants/2020/non_native/cuda.cpp +++ b/sycl/test-e2e/SpecConstants/2020/non_native/cuda.cpp @@ -1,7 +1,7 @@ // REQUIRES: cuda // RUN: %clangxx -fsycl -fsycl-targets=nvptx64-nvidia-cuda %S/Inputs/common.cpp -o %t.out -// RUN: env ONEAPI_DEVICE_SELECTOR="cuda:*" %t.out +// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="cuda:*" %t.out // This test checks correctness of SYCL2020 non-native specialization constants // on CUDA device diff --git a/sycl/test-e2e/USM/multictxt.cpp b/sycl/test-e2e/USM/multictxt.cpp index 639e015d1885b..872294ca3e537 100644 --- a/sycl/test-e2e/USM/multictxt.cpp +++ b/sycl/test-e2e/USM/multictxt.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t1.out -// RUN: %t1.out +// RUN: %{run-unfiltered-devices} %t1.out // REQUIRES: cpu, gpu diff --git a/sycl/test-e2e/bindless_images/cubemap/cubemap_unsampled.cpp b/sycl/test-e2e/bindless_images/cubemap/cubemap_unsampled.cpp index f6297fab7390e..d74b728593ce2 100644 --- a/sycl/test-e2e/bindless_images/cubemap/cubemap_unsampled.cpp +++ b/sycl/test-e2e/bindless_images/cubemap/cubemap_unsampled.cpp @@ -1,7 +1,7 @@ // REQUIRES: cuda,aspect-ext_oneapi_cubemap // RUN: %{build} -o %t.out -// RUN: %t.out +// RUN: %{run-unfiltered-devices} %t.out #include "../helpers/common.hpp" #include 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 8abfd5a4e81f3..3f4e6e433643f 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 @@ -2,7 +2,7 @@ // REQUIRES: windows // RUN: %{build} -l d3d12 -l dxgi -l dxguid -o %t.out -// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out +// RUN: %{run-unfiltered-devices} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out #pragma clang diagnostic ignored "-Waddress-of-temporary" diff --git a/sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled_semaphore.cpp b/sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled_semaphore.cpp index d8f749f17909b..01b9fc578046c 100644 --- a/sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled_semaphore.cpp +++ b/sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled_semaphore.cpp @@ -2,7 +2,7 @@ // REQUIRES: windows // RUN: %{build} -l d3d12 -l dxgi -l dxguid -o %t.out -// RUN: %t.out +// RUN: %{run-unfiltered-devices} %t.out #define TEST_SEMAPHORE_IMPORT // FIXME large image size fails in semaphore tests. diff --git a/sycl/test-e2e/bindless_images/image_get_info.cpp b/sycl/test-e2e/bindless_images/image_get_info.cpp index 451d7b9731bc1..8c36f431ba942 100644 --- a/sycl/test-e2e/bindless_images/image_get_info.cpp +++ b/sycl/test-e2e/bindless_images/image_get_info.cpp @@ -1,7 +1,7 @@ // REQUIRES: cuda // RUN: %{build} -o %t.out -// RUN: %t.out +// RUN: %{run-unfiltered-devices} %t.out #include #include diff --git a/sycl/test-e2e/bindless_images/mipmap/mipmap_read_1D.cpp b/sycl/test-e2e/bindless_images/mipmap/mipmap_read_1D.cpp index 98eefe6408ad4..3f95d87f39b1b 100644 --- a/sycl/test-e2e/bindless_images/mipmap/mipmap_read_1D.cpp +++ b/sycl/test-e2e/bindless_images/mipmap/mipmap_read_1D.cpp @@ -1,7 +1,7 @@ // REQUIRES: cuda // RUN: %{build} -o %t.out -// RUN: %t.out +// RUN: %{run-unfiltered-devices} %t.out #include #include diff --git a/sycl/test-e2e/bindless_images/mipmap/mipmap_read_2D.cpp b/sycl/test-e2e/bindless_images/mipmap/mipmap_read_2D.cpp index 3d6af3368bc5f..a6e185a2b112c 100644 --- a/sycl/test-e2e/bindless_images/mipmap/mipmap_read_2D.cpp +++ b/sycl/test-e2e/bindless_images/mipmap/mipmap_read_2D.cpp @@ -1,7 +1,7 @@ // REQUIRES: cuda // RUN: %{build} -o %t.out -// RUN: %t.out +// RUN: %{run-unfiltered-devices} %t.out #include #include diff --git a/sycl/test-e2e/bindless_images/mipmap/mipmap_read_3D.cpp b/sycl/test-e2e/bindless_images/mipmap/mipmap_read_3D.cpp index aa3f829d7c9c1..7f3ee74cdc949 100644 --- a/sycl/test-e2e/bindless_images/mipmap/mipmap_read_3D.cpp +++ b/sycl/test-e2e/bindless_images/mipmap/mipmap_read_3D.cpp @@ -1,7 +1,7 @@ // REQUIRES: cuda // RUN: %{build} -o %t.out -// RUN: %t.out +// RUN: %{run-unfiltered-devices} %t.out #include #include diff --git a/sycl/test-e2e/bindless_images/read_1D.cpp b/sycl/test-e2e/bindless_images/read_1D.cpp index 57e9f8874b426..b619710fa2f1a 100644 --- a/sycl/test-e2e/bindless_images/read_1D.cpp +++ b/sycl/test-e2e/bindless_images/read_1D.cpp @@ -1,7 +1,7 @@ // REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out -// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out +// RUN: %{run-unfiltered-devices} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out #include #include diff --git a/sycl/test-e2e/bindless_images/read_2D.cpp b/sycl/test-e2e/bindless_images/read_2D.cpp index 218a9269914a8..af0d02cd8c3e7 100644 --- a/sycl/test-e2e/bindless_images/read_2D.cpp +++ b/sycl/test-e2e/bindless_images/read_2D.cpp @@ -1,7 +1,7 @@ // REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out -// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out +// RUN: %{run-unfiltered-devices} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out #include #include diff --git a/sycl/test-e2e/bindless_images/read_2D_dynamic.cpp b/sycl/test-e2e/bindless_images/read_2D_dynamic.cpp index a96941ee4c53e..afea8ab26d475 100644 --- a/sycl/test-e2e/bindless_images/read_2D_dynamic.cpp +++ b/sycl/test-e2e/bindless_images/read_2D_dynamic.cpp @@ -1,7 +1,7 @@ // REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out -// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out +// RUN: %{run-unfiltered-devices} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out #include #include diff --git a/sycl/test-e2e/bindless_images/read_3D.cpp b/sycl/test-e2e/bindless_images/read_3D.cpp index d99a530724657..f061d7890d7bf 100644 --- a/sycl/test-e2e/bindless_images/read_3D.cpp +++ b/sycl/test-e2e/bindless_images/read_3D.cpp @@ -1,7 +1,7 @@ // REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out -// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out +// RUN: %{run-unfiltered-devices} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out #include #include diff --git a/sycl/test-e2e/bindless_images/read_norm_types.cpp b/sycl/test-e2e/bindless_images/read_norm_types.cpp index e0fc16f049d2d..80dace1ba0a53 100644 --- a/sycl/test-e2e/bindless_images/read_norm_types.cpp +++ b/sycl/test-e2e/bindless_images/read_norm_types.cpp @@ -1,7 +1,7 @@ // REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out -// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out +// RUN: %{run-unfiltered-devices} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out #include #include diff --git a/sycl/test-e2e/bindless_images/read_sampled.cpp b/sycl/test-e2e/bindless_images/read_sampled.cpp index e321043e15fff..3e786855381e0 100644 --- a/sycl/test-e2e/bindless_images/read_sampled.cpp +++ b/sycl/test-e2e/bindless_images/read_sampled.cpp @@ -1,7 +1,7 @@ // REQUIRES: cuda // RUN: %{build} -o %t.out -// RUN: %t.out +// RUN: %{run-unfiltered-devices} %t.out // Print test names and pass status // #define VERBOSE_LV1 diff --git a/sycl/test-e2e/bindless_images/read_write_1D.cpp b/sycl/test-e2e/bindless_images/read_write_1D.cpp index aa9c03d4aa763..e42f234a07642 100644 --- a/sycl/test-e2e/bindless_images/read_write_1D.cpp +++ b/sycl/test-e2e/bindless_images/read_write_1D.cpp @@ -1,7 +1,7 @@ // REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out -// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out +// RUN: %{run-unfiltered-devices} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out #include #include 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 0c0b150de0e00..b768e9eb668eb 100644 --- a/sycl/test-e2e/bindless_images/read_write_1D_subregion.cpp +++ b/sycl/test-e2e/bindless_images/read_write_1D_subregion.cpp @@ -1,7 +1,7 @@ // REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out -// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out +// RUN: %{run-unfiltered-devices} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out #include #include diff --git a/sycl/test-e2e/bindless_images/read_write_2D.cpp b/sycl/test-e2e/bindless_images/read_write_2D.cpp index dcf9dddcddf91..1f4152e8d5336 100644 --- a/sycl/test-e2e/bindless_images/read_write_2D.cpp +++ b/sycl/test-e2e/bindless_images/read_write_2D.cpp @@ -1,7 +1,7 @@ // REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out -// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out +// RUN: %{run-unfiltered-devices} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out #include #include 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 636406a5e0156..bd5394e792080 100644 --- a/sycl/test-e2e/bindless_images/read_write_2D_subregion.cpp +++ b/sycl/test-e2e/bindless_images/read_write_2D_subregion.cpp @@ -1,7 +1,7 @@ // REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out -// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out +// RUN: %{run-unfiltered-devices} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out #include #include diff --git a/sycl/test-e2e/bindless_images/read_write_3D.cpp b/sycl/test-e2e/bindless_images/read_write_3D.cpp index 0bbb071a11d95..cebd6b834ace3 100644 --- a/sycl/test-e2e/bindless_images/read_write_3D.cpp +++ b/sycl/test-e2e/bindless_images/read_write_3D.cpp @@ -1,7 +1,7 @@ // REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out -// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out +// RUN: %{run-unfiltered-devices} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out #include #include 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 0987d0870bf71..1c8157d9760bd 100644 --- a/sycl/test-e2e/bindless_images/read_write_3D_subregion.cpp +++ b/sycl/test-e2e/bindless_images/read_write_3D_subregion.cpp @@ -1,7 +1,7 @@ // REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out -// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out +// RUN: %{run-unfiltered-devices} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out #include #include diff --git a/sycl/test-e2e/bindless_images/read_write_unsampled.cpp b/sycl/test-e2e/bindless_images/read_write_unsampled.cpp index 09d9818e5eb02..77f3ec299b7c1 100644 --- a/sycl/test-e2e/bindless_images/read_write_unsampled.cpp +++ b/sycl/test-e2e/bindless_images/read_write_unsampled.cpp @@ -1,7 +1,7 @@ // REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out -// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out +// RUN: %{run-unfiltered-devices} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out #include "helpers/common.hpp" #include diff --git a/sycl/test-e2e/bindless_images/sampling_1D.cpp b/sycl/test-e2e/bindless_images/sampling_1D.cpp index e50a90b1cb725..28a8ae12c6cfa 100644 --- a/sycl/test-e2e/bindless_images/sampling_1D.cpp +++ b/sycl/test-e2e/bindless_images/sampling_1D.cpp @@ -1,7 +1,7 @@ // REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out -// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out +// RUN: %{run-unfiltered-devices} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out #include #include diff --git a/sycl/test-e2e/bindless_images/sampling_2D.cpp b/sycl/test-e2e/bindless_images/sampling_2D.cpp index 2342763aabae7..316eebc0ace2c 100644 --- a/sycl/test-e2e/bindless_images/sampling_2D.cpp +++ b/sycl/test-e2e/bindless_images/sampling_2D.cpp @@ -1,7 +1,7 @@ // REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out -// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out +// RUN: %{run-unfiltered-devices} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out #include #include diff --git a/sycl/test-e2e/bindless_images/sampling_2D_USM_shared.cpp b/sycl/test-e2e/bindless_images/sampling_2D_USM_shared.cpp index bd4e3507747a4..96007abe1b511 100644 --- a/sycl/test-e2e/bindless_images/sampling_2D_USM_shared.cpp +++ b/sycl/test-e2e/bindless_images/sampling_2D_USM_shared.cpp @@ -2,7 +2,7 @@ // REQUIRES: aspect-ext_oneapi_bindless_images_shared_usm // RUN: %{build} -o %t.out -// RUN: %t.out +// RUN: %{run-unfiltered-devices} %t.out #include #include diff --git a/sycl/test-e2e/bindless_images/sampling_2D_half.cpp b/sycl/test-e2e/bindless_images/sampling_2D_half.cpp index 45a2a09d7947d..f23fc4c470889 100644 --- a/sycl/test-e2e/bindless_images/sampling_2D_half.cpp +++ b/sycl/test-e2e/bindless_images/sampling_2D_half.cpp @@ -2,7 +2,7 @@ // REQUIRES: aspect-fp16 // RUN: %{build} -o %t.out -// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out +// RUN: %{run-unfiltered-devices} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out #include #include diff --git a/sycl/test-e2e/bindless_images/sampling_3D.cpp b/sycl/test-e2e/bindless_images/sampling_3D.cpp index 5785dd0b55c20..bf11c21191013 100644 --- a/sycl/test-e2e/bindless_images/sampling_3D.cpp +++ b/sycl/test-e2e/bindless_images/sampling_3D.cpp @@ -1,7 +1,7 @@ // REQUIRES: aspect-ext_oneapi_bindless_images // RUN: %{build} -o %t.out -// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out +// RUN: %{run-unfiltered-devices} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out #include #include