From 2977546fa2389ebb778c35e46cd24406e9c27019 Mon Sep 17 00:00:00 2001
From: "Garcia Orozco, David" <david.garcia.orozco@intel.com>
Date: Thu, 31 Oct 2024 11:00:17 -0700
Subject: [PATCH 1/9] Add `REQUIRES: run-mode` to tests that fail to build with
 current split e2e mode

---
 sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp                | 2 +-
 .../Basic/free_function_queries/free_function_queries.cpp       | 2 +-
 .../free_function_queries/free_function_queries_sub_group.cpp   | 2 +-
 sycl/test-e2e/Basic/windows_version_agnostic_sycl_lib.cpp       | 2 +-
 sycl/test-e2e/Compression/no_zstd_warning.cpp                   | 2 +-
 sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp              | 2 +-
 sycl/test-e2e/DeviceLib/math_windows_test.cpp                   | 2 +-
 sycl/test-e2e/EnqueueNativeCommand/custom-command-cuda.cpp      | 2 +-
 sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp       | 2 +-
 .../EnqueueNativeCommand/custom-command-multiple-dev-cuda.cpp   | 2 +-
 sycl/test-e2e/GroupAlgorithm/barrier.cpp                        | 2 +-
 .../HostInteropTask/interop-task-cuda-buffer-migrate.cpp        | 2 +-
 sycl/test-e2e/HostInteropTask/interop-task-cuda.cpp             | 2 +-
 sycl/test-e2e/HostInteropTask/interop-task-hip.cpp              | 2 +-
 sycl/test-e2e/InvokeSimd/Feature/ImplicitSubgroup/popcnt.cpp    | 2 +-
 sycl/test-e2e/InvokeSimd/Feature/popcnt.cpp                     | 2 +-
 sycl/test-e2e/Matrix/joint_matrix_hip_gfx90a.cpp                | 2 +-
 sycl/test-e2e/Matrix/joint_matrix_hip_half_gfx90a.cpp           | 1 +
 sycl/test-e2e/Matrix/joint_matrix_tensorcores_sm70.cpp          | 2 +-
 sycl/test-e2e/Matrix/runtime_query_hip_gfx90a.cpp               | 2 +-
 .../is_compatible/is_compatible_amdgcn.cpp                      | 2 +-
 .../is_compatible/is_compatible_nvptx64.cpp                     | 2 +-
 .../is_compatible/is_compatible_several_targets.cpp             | 2 +-
 sycl/test-e2e/Plugin/cuda_queue_priority.cpp                    | 2 +-
 sycl/test-e2e/Plugin/dll-detach-order.cpp                       | 2 +-
 sycl/test-e2e/Plugin/sycl-ls-gpu-cuda.cpp                       | 2 +-
 sycl/test-e2e/Plugin/sycl-ls-gpu-hip.cpp                        | 2 +-
 sycl/test-e2e/Plugin/sycl-ls-gpu-sycl-be.cpp                    | 2 +-
 sycl/test-e2e/Plugin/sycl-targets-order.cpp                     | 2 +-
 sycl/test-e2e/Regression/compile_on_win_with_mdd.cpp            | 2 +-
 sycl/test-e2e/Regression/fsycl-host-compiler-win.cpp            | 2 +-
 sycl/test-e2e/Regression/msvc_crt.cpp                           | 2 +-
 sycl/test-e2e/Regression/multiple-targets.cpp                   | 2 +-
 sycl/test-e2e/SpecConstants/2020/non_native/cuda.cpp            | 2 +-
 sycl/test-e2e/SubGroup/generic_reduce.cpp                       | 2 +-
 sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp       | 2 +-
 .../bindless_images/dx12_interop/read_write_unsampled.cpp       | 2 +-
 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/unsampled_images.cpp         | 2 +-
 .../vulkan_interop/unsampled_images_semaphore.cpp               | 2 +-
 sycl/test-e2e/syclcompat/kernel/kernel_win.cpp                  | 2 +-
 sycl/test-e2e/syclcompat/launch/launch_properties.cpp           | 2 +-
 sycl/test-e2e/syclcompat/memory/local_memory_ptr_to_integer.cpp | 2 +-
 45 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp b/sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp
index bea29d5c89a80..dc46db8108925 100644
--- a/sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp
+++ b/sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp
@@ -1,5 +1,5 @@
 // UNSUPPORTED: windows
-// REQUIRES: cuda || hip
+// REQUIRES: (cuda || hip) && run-mode
 
 // This test relies on debug output from a pass, make sure that the compiler
 // can generate it.
diff --git a/sycl/test-e2e/Basic/free_function_queries/free_function_queries.cpp b/sycl/test-e2e/Basic/free_function_queries/free_function_queries.cpp
index 9fe7f0ff6cb90..cfb490126c4cb 100644
--- a/sycl/test-e2e/Basic/free_function_queries/free_function_queries.cpp
+++ b/sycl/test-e2e/Basic/free_function_queries/free_function_queries.cpp
@@ -1,5 +1,5 @@
 // FIXME: Investigate OS-agnostic failures
-// REQUIRES: TEMPORARY_DISABLED
+// REQUIRES: TEMPORARY_DISABLED, run-mode
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/Basic/free_function_queries/free_function_queries_sub_group.cpp b/sycl/test-e2e/Basic/free_function_queries/free_function_queries_sub_group.cpp
index fcbdb79a5d81f..6e5f63544e724 100644
--- a/sycl/test-e2e/Basic/free_function_queries/free_function_queries_sub_group.cpp
+++ b/sycl/test-e2e/Basic/free_function_queries/free_function_queries_sub_group.cpp
@@ -1,5 +1,5 @@
 // FIXME: Investigate OS-agnostic failures
-// REQUIRES: TEMPORARY_DISABLED
+// REQUIRES: TEMPORARY_DISABLED, run-mode
 // UNSUPPORTED: cuda || hip
 // CUDA and HIP compilation and runtime do not yet support sub-groups.
 //
diff --git a/sycl/test-e2e/Basic/windows_version_agnostic_sycl_lib.cpp b/sycl/test-e2e/Basic/windows_version_agnostic_sycl_lib.cpp
index c95e05a1d7d6a..883b2c9878354 100644
--- a/sycl/test-e2e/Basic/windows_version_agnostic_sycl_lib.cpp
+++ b/sycl/test-e2e/Basic/windows_version_agnostic_sycl_lib.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: windows
+// REQUIRES: windows, run-mode
 
 // RUN: %clangxx --driver-mode=cl /std:c++17 /EHsc -I%sycl_include -I%opencl_include_dir %s -o %t.out /link /defaultlib:%sycl_static_libs_dir/sycl.lib
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/Compression/no_zstd_warning.cpp b/sycl/test-e2e/Compression/no_zstd_warning.cpp
index 8a4460f9b8643..64c37ffbcac93 100644
--- a/sycl/test-e2e/Compression/no_zstd_warning.cpp
+++ b/sycl/test-e2e/Compression/no_zstd_warning.cpp
@@ -1,4 +1,4 @@
 // using --offload-compress without zstd should throw an error.
-// REQUIRES: !zstd
+// REQUIRES: !zstd, run-mode
 // RUN: not %{build} -O0 -g --offload-compress %S/Inputs/single_kernel.cpp -o %t_compress.out 2>&1 | FileCheck %s
 // CHECK: '--offload-compress' option is specified but zstd is not available. The device image will not be compressed.
diff --git a/sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp b/sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp
index 71e8a43387093..119faea85982b 100644
--- a/sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp
+++ b/sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: aspect-fp64, windows
+// REQUIRES: aspect-fp64, windows, run-mode
 
 // DEFINE: %{mathflags} = %if cl_options %{/clang:-fno-fast-math%} %else %{-fno-fast-math%}
 
diff --git a/sycl/test-e2e/DeviceLib/math_windows_test.cpp b/sycl/test-e2e/DeviceLib/math_windows_test.cpp
index ab18cf1abe254..bae1c76cd60e7 100644
--- a/sycl/test-e2e/DeviceLib/math_windows_test.cpp
+++ b/sycl/test-e2e/DeviceLib/math_windows_test.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: windows
+// REQUIRES: windows, run-mode
 
 // TODO: Add hypotf case back when the missing symbol is fixed.
 
diff --git a/sycl/test-e2e/EnqueueNativeCommand/custom-command-cuda.cpp b/sycl/test-e2e/EnqueueNativeCommand/custom-command-cuda.cpp
index 7afbaf7cc14ed..74a5683859297 100644
--- a/sycl/test-e2e/EnqueueNativeCommand/custom-command-cuda.cpp
+++ b/sycl/test-e2e/EnqueueNativeCommand/custom-command-cuda.cpp
@@ -1,6 +1,6 @@
 // RUN: %{build} -Wno-error=deprecated-declarations -o %t.out %cuda_options
 // RUN: %{run} %t.out
-// REQUIRES: cuda, cuda_dev_kit
+// REQUIRES: cuda, cuda_dev_kit, run-mode
 
 #include <cuda.h>
 
diff --git a/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp b/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp
index 7dec45ccee05a..49b7f22c8691d 100644
--- a/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp
+++ b/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp
@@ -2,7 +2,7 @@
 // we should set this with some variable instead.
 // RUN: %{build} -o %t.out -I%rocm_path/include -L%rocm_path/lib -lamdhip64
 // RUN: %{run} %t.out
-// REQUIRES: hip
+// REQUIRES: hip, run-mode
 
 #include <iostream>
 #include <sycl/backend.hpp>
diff --git a/sycl/test-e2e/EnqueueNativeCommand/custom-command-multiple-dev-cuda.cpp b/sycl/test-e2e/EnqueueNativeCommand/custom-command-multiple-dev-cuda.cpp
index 2dc30b44bfe94..a50d74920934b 100644
--- a/sycl/test-e2e/EnqueueNativeCommand/custom-command-multiple-dev-cuda.cpp
+++ b/sycl/test-e2e/EnqueueNativeCommand/custom-command-multiple-dev-cuda.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: cuda, cuda_dev_kit
+// REQUIRES: cuda, cuda_dev_kit, run-mode
 // RUN: %{build} -o %t.out %cuda_options
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/GroupAlgorithm/barrier.cpp b/sycl/test-e2e/GroupAlgorithm/barrier.cpp
index 8fb0addcf7924..5ad2121159c47 100644
--- a/sycl/test-e2e/GroupAlgorithm/barrier.cpp
+++ b/sycl/test-e2e/GroupAlgorithm/barrier.cpp
@@ -1,6 +1,6 @@
 // Temporarily disabled due to regressions introduced by
 // https://github.com/intel/llvm/pull/8412.
-// REQUIRES: TEMPORARY_DISABLED
+// REQUIRES: TEMPORARY_DISABLED, run-mode
 
 // RUN: %{build} -o %t.out -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_80
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/HostInteropTask/interop-task-cuda-buffer-migrate.cpp b/sycl/test-e2e/HostInteropTask/interop-task-cuda-buffer-migrate.cpp
index b6ac1f96f90e1..1d81d5e7fd2b6 100644
--- a/sycl/test-e2e/HostInteropTask/interop-task-cuda-buffer-migrate.cpp
+++ b/sycl/test-e2e/HostInteropTask/interop-task-cuda-buffer-migrate.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: cuda, cuda_dev_kit
+// REQUIRES: cuda, cuda_dev_kit, run-mode
 //
 // RUN: %{build} -o %t.out %cuda_options
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/HostInteropTask/interop-task-cuda.cpp b/sycl/test-e2e/HostInteropTask/interop-task-cuda.cpp
index 055160e8bb624..6629657057c97 100644
--- a/sycl/test-e2e/HostInteropTask/interop-task-cuda.cpp
+++ b/sycl/test-e2e/HostInteropTask/interop-task-cuda.cpp
@@ -1,6 +1,6 @@
 // RUN: %{build} -o %t.out %cuda_options
 // RUN: %{run} %t.out
-// REQUIRES: cuda, cuda_dev_kit
+// REQUIRES: cuda, cuda_dev_kit, run-mode
 
 #include <iostream>
 #include <sycl/backend.hpp>
diff --git a/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp b/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp
index 96b55050418cd..a43d0eab36b79 100644
--- a/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp
+++ b/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp
@@ -2,7 +2,7 @@
 // we should set this with some variable instead.
 // RUN: %{build} -Wno-error=deprecated-declarations -o %t.out -I%rocm_path/include -L%rocm_path/lib -lamdhip64
 // RUN: %{run} %t.out
-// REQUIRES: hip
+// REQUIRES: hip, run-mode
 
 #include <iostream>
 #include <sycl/backend.hpp>
diff --git a/sycl/test-e2e/InvokeSimd/Feature/ImplicitSubgroup/popcnt.cpp b/sycl/test-e2e/InvokeSimd/Feature/ImplicitSubgroup/popcnt.cpp
index 153478c11580a..6217b432516b4 100644
--- a/sycl/test-e2e/InvokeSimd/Feature/ImplicitSubgroup/popcnt.cpp
+++ b/sycl/test-e2e/InvokeSimd/Feature/ImplicitSubgroup/popcnt.cpp
@@ -1,6 +1,6 @@
 // NOTE: The feature is not yet supported, there is a discussion on the
 // feasibility of tests
-// REQUIRES: TEMPORARY_DISABLED
+// REQUIRES: TEMPORARY_DISABLED, run-mode
 //
 // Check that full compilation works:
 // RUN: %clangxx -DIMPL_SUBGROUP -fsycl -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr %S/../popcnt.cpp -o %t.out
diff --git a/sycl/test-e2e/InvokeSimd/Feature/popcnt.cpp b/sycl/test-e2e/InvokeSimd/Feature/popcnt.cpp
index f99c6fd0e097b..cf102b27f1011 100644
--- a/sycl/test-e2e/InvokeSimd/Feature/popcnt.cpp
+++ b/sycl/test-e2e/InvokeSimd/Feature/popcnt.cpp
@@ -1,6 +1,6 @@
 // NOTE: The feature is not yet supported, there is a discussion on the
 // feasibility of tests
-// REQUIRES: TEMPORARY_DISABLED
+// REQUIRES: TEMPORARY_DISABLED, run-mode
 //
 // Check that full compilation works:
 // RUN: %{build} -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr -o %t.out
diff --git a/sycl/test-e2e/Matrix/joint_matrix_hip_gfx90a.cpp b/sycl/test-e2e/Matrix/joint_matrix_hip_gfx90a.cpp
index 008b3499a949d..50db1489455cc 100644
--- a/sycl/test-e2e/Matrix/joint_matrix_hip_gfx90a.cpp
+++ b/sycl/test-e2e/Matrix/joint_matrix_hip_gfx90a.cpp
@@ -9,7 +9,7 @@
 // RUN: %{build} -fsycl -fsycl-targets=amd_gpu_gfx90a %s -o %t.out
 // RUN: %{run} %t.out
 
-// REQUIRES: gpu-amd-gfx90a
+// REQUIRES: gpu-amd-gfx90a, run-mode
 
 #include "joint_matrix_hip_apply.hpp"
 #include "joint_matrix_hip_copy.hpp"
diff --git a/sycl/test-e2e/Matrix/joint_matrix_hip_half_gfx90a.cpp b/sycl/test-e2e/Matrix/joint_matrix_hip_half_gfx90a.cpp
index 737147d14dbb3..58382bb921ccc 100644
--- a/sycl/test-e2e/Matrix/joint_matrix_hip_half_gfx90a.cpp
+++ b/sycl/test-e2e/Matrix/joint_matrix_hip_half_gfx90a.cpp
@@ -11,6 +11,7 @@
 
 // REQUIRES: gpu-amd-gfx90a
 // REQUIRES: aspect-fp16
+// REQUIRES: run-mode
 
 #include "joint_matrix_hip_apply.hpp"
 #include "joint_matrix_hip_copy.hpp"
diff --git a/sycl/test-e2e/Matrix/joint_matrix_tensorcores_sm70.cpp b/sycl/test-e2e/Matrix/joint_matrix_tensorcores_sm70.cpp
index b383c07f018a6..cc63964e9a697 100644
--- a/sycl/test-e2e/Matrix/joint_matrix_tensorcores_sm70.cpp
+++ b/sycl/test-e2e/Matrix/joint_matrix_tensorcores_sm70.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// REQUIRES: cuda
+// REQUIRES: cuda, run-mode
 // RUN: %{build} -Xsycl-target-backend --cuda-gpu-arch=sm_70 -o %t.out
 // RUN: %{run} %t.out
 //
diff --git a/sycl/test-e2e/Matrix/runtime_query_hip_gfx90a.cpp b/sycl/test-e2e/Matrix/runtime_query_hip_gfx90a.cpp
index 72592fbd0bec1..206dec77f96ff 100644
--- a/sycl/test-e2e/Matrix/runtime_query_hip_gfx90a.cpp
+++ b/sycl/test-e2e/Matrix/runtime_query_hip_gfx90a.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// REQUIRES: gpu-amd-gfx90a
+// REQUIRES: gpu-amd-gfx90a, run-mode
 // RUN: %{build} -Xsycl-target-backend=amdgcn-amd-amdhsa --offload-arch=gfx90a -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_amdgcn.cpp b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_amdgcn.cpp
index 5e240044483b7..f170002f6c99e 100644
--- a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_amdgcn.cpp
+++ b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_amdgcn.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: hip_amd, opencl, gpu, cpu
+// REQUIRES: hip_amd, opencl, gpu, cpu, run-mode
 
 // RUN: %clangxx -fsycl -Xsycl-target-backend=amdgcn-amd-amdhsa --offload-arch=gfx906 -fsycl-targets=amdgcn-amd-amdhsa %S/Inputs/is_compatible_with_env.cpp -o %t.out
 
diff --git a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_nvptx64.cpp b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_nvptx64.cpp
index ccfa829293c3f..6ed463aac4bd8 100644
--- a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_nvptx64.cpp
+++ b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_nvptx64.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: cuda, opencl, gpu, cpu
+// REQUIRES: cuda, opencl, gpu, cpu, run-mode
 
 // RUN: %clangxx -fsycl -fsycl-targets=nvptx64-nvidia-cuda %S/Inputs/is_compatible_with_env.cpp -o %t.out
 
diff --git a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_several_targets.cpp b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_several_targets.cpp
index 042874b90290c..dfe2c0a6f853a 100644
--- a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_several_targets.cpp
+++ b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_several_targets.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: ocloc, level_zero, gpu, cpu
+// REQUIRES: ocloc, level_zero, gpu, cpu, run-mode
 
 // RUN: %clangxx -fsycl -fsycl-targets=spir64_fpga,spir64_gen -Xsycl-target-backend "-device *" %S/Inputs/is_compatible_with_env.cpp -o %t.out
 
diff --git a/sycl/test-e2e/Plugin/cuda_queue_priority.cpp b/sycl/test-e2e/Plugin/cuda_queue_priority.cpp
index 031dc252c578f..e07286c57889d 100644
--- a/sycl/test-e2e/Plugin/cuda_queue_priority.cpp
+++ b/sycl/test-e2e/Plugin/cuda_queue_priority.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu, cuda, cuda_dev_kit
+// REQUIRES: gpu, cuda, cuda_dev_kit, run-mode
 // RUN: %{build} %cuda_options -o %t.out
 // RUN: %{run} %t.out
 //
diff --git a/sycl/test-e2e/Plugin/dll-detach-order.cpp b/sycl/test-e2e/Plugin/dll-detach-order.cpp
index 207b958397b27..2f207ac40eeb7 100644
--- a/sycl/test-e2e/Plugin/dll-detach-order.cpp
+++ b/sycl/test-e2e/Plugin/dll-detach-order.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: windows
+// REQUIRES: windows, run-mode
 // RUN: env SYCL_UR_TRACE=-1 sycl-ls | FileCheck %s
 
 // ensure that the plugins are detached AFTER urLoaderTearDown is done executing
diff --git a/sycl/test-e2e/Plugin/sycl-ls-gpu-cuda.cpp b/sycl/test-e2e/Plugin/sycl-ls-gpu-cuda.cpp
index 2d1ff0ac92ad1..a0929bfcf15c3 100644
--- a/sycl/test-e2e/Plugin/sycl-ls-gpu-cuda.cpp
+++ b/sycl/test-e2e/Plugin/sycl-ls-gpu-cuda.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu, cuda
+// REQUIRES: gpu, cuda, run-mode
 
 // RUN: env ONEAPI_DEVICE_SELECTOR="cuda:*" sycl-ls --verbose >%t.cuda.out
 // RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-CUDA,CHECK-CUSTOM-GPU-CUDA --input-file %t.cuda.out
diff --git a/sycl/test-e2e/Plugin/sycl-ls-gpu-hip.cpp b/sycl/test-e2e/Plugin/sycl-ls-gpu-hip.cpp
index 67c9cd2eb365e..eee54feaab69b 100644
--- a/sycl/test-e2e/Plugin/sycl-ls-gpu-hip.cpp
+++ b/sycl/test-e2e/Plugin/sycl-ls-gpu-hip.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu, hip, sycl-ls
+// REQUIRES: gpu, hip, sycl-ls, run-mode
 
 // RUN: env ONEAPI_DEVICE_SELECTOR="hip:*" sycl-ls --verbose >%t.hip.out
 // RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-HIP,CHECK-CUSTOM-GPU-HIP --input-file %t.hip.out
diff --git a/sycl/test-e2e/Plugin/sycl-ls-gpu-sycl-be.cpp b/sycl/test-e2e/Plugin/sycl-ls-gpu-sycl-be.cpp
index 81e5b3694c5b7..0fb80d46874d9 100644
--- a/sycl/test-e2e/Plugin/sycl-ls-gpu-sycl-be.cpp
+++ b/sycl/test-e2e/Plugin/sycl-ls-gpu-sycl-be.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: gpu, cuda, hip, opencl, sycl-ls
+// REQUIRES: gpu, cuda, hip, opencl, sycl-ls, run-mode
 
 // RUN: sycl-ls --verbose >%t.default.out
 // RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-OPENCL,CHECK-CUSTOM-GPU-OPENCL --input-file %t.default.out
diff --git a/sycl/test-e2e/Plugin/sycl-targets-order.cpp b/sycl/test-e2e/Plugin/sycl-targets-order.cpp
index 090e819c0305d..2d1828f23ab17 100644
--- a/sycl/test-e2e/Plugin/sycl-targets-order.cpp
+++ b/sycl/test-e2e/Plugin/sycl-targets-order.cpp
@@ -5,7 +5,7 @@
 // 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
+// REQUIRES: opencl, cuda, run-mode
 
 //==------- sycl-targets-order.cpp - SYCL -fsycl-targets order test --------==//
 //
diff --git a/sycl/test-e2e/Regression/compile_on_win_with_mdd.cpp b/sycl/test-e2e/Regression/compile_on_win_with_mdd.cpp
index 57826c81ece2e..950f373653bbe 100644
--- a/sycl/test-e2e/Regression/compile_on_win_with_mdd.cpp
+++ b/sycl/test-e2e/Regression/compile_on_win_with_mdd.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: windows
+// REQUIRES: windows, run-mode
 
 // RUN: %clangxx --driver-mode=cl -fsycl /MDd -c %s -o %t.obj
 // RUN: %clangxx --driver-mode=cl -fsycl %t.obj -Wno-unused-command-line-argument -o %t.out
diff --git a/sycl/test-e2e/Regression/fsycl-host-compiler-win.cpp b/sycl/test-e2e/Regression/fsycl-host-compiler-win.cpp
index 4ffe42c45c52f..d303dc92b9e01 100644
--- a/sycl/test-e2e/Regression/fsycl-host-compiler-win.cpp
+++ b/sycl/test-e2e/Regression/fsycl-host-compiler-win.cpp
@@ -1,6 +1,6 @@
 // RUN: %{build} -fsycl-host-compiler=cl -DDEFINE_CHECK -fsycl-host-compiler-options="-DDEFINE_CHECK /std:c++17 /Zc:__cplusplus" -o %t.exe
 // RUN: %{run} %t.exe
-// REQUIRES: windows
+// REQUIRES: windows, run-mode
 //
 //==------- fsycl-host-compiler-win.cpp - external host compiler test ------==//
 //
diff --git a/sycl/test-e2e/Regression/msvc_crt.cpp b/sycl/test-e2e/Regression/msvc_crt.cpp
index 9d59547e50d7b..d4bf082b58220 100644
--- a/sycl/test-e2e/Regression/msvc_crt.cpp
+++ b/sycl/test-e2e/Regression/msvc_crt.cpp
@@ -2,7 +2,7 @@
 // RUN: %{run} %t1.exe
 // RUN: %{build} /MDd -o %t2.exe
 // RUN: %{run} %t2.exe
-// REQUIRES: system-windows, cl_options
+// REQUIRES: system-windows, cl_options, run-mode
 //==-------------- msvc_crt.cpp - SYCL MSVC CRT test -----------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
diff --git a/sycl/test-e2e/Regression/multiple-targets.cpp b/sycl/test-e2e/Regression/multiple-targets.cpp
index 84bc68d6238bc..90a58ea0804c5 100644
--- a/sycl/test-e2e/Regression/multiple-targets.cpp
+++ b/sycl/test-e2e/Regression/multiple-targets.cpp
@@ -2,7 +2,7 @@
 // It tests if the target triples can be specified with any order.
 // The test is repeated for per_kernel device code splitting.
 //
-// REQUIRES: cuda || hip || native_cpu
+// REQUIRES: (cuda || hip || native_cpu) && run-mode
 // RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple},spir64 -o %t1.out %s
 // RUN: %{run} %t1.out
 //
diff --git a/sycl/test-e2e/SpecConstants/2020/non_native/cuda.cpp b/sycl/test-e2e/SpecConstants/2020/non_native/cuda.cpp
index 12d2ce6a9faf9..e1cd8eeba729d 100644
--- a/sycl/test-e2e/SpecConstants/2020/non_native/cuda.cpp
+++ b/sycl/test-e2e/SpecConstants/2020/non_native/cuda.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: cuda
+// REQUIRES: cuda, run-mode
 
 // RUN: %clangxx -fsycl -fsycl-targets=nvptx64-nvidia-cuda %S/Inputs/common.cpp -o %t.out
 // RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="cuda:*" %t.out
diff --git a/sycl/test-e2e/SubGroup/generic_reduce.cpp b/sycl/test-e2e/SubGroup/generic_reduce.cpp
index e158663479ed9..97d59c13e3871 100644
--- a/sycl/test-e2e/SubGroup/generic_reduce.cpp
+++ b/sycl/test-e2e/SubGroup/generic_reduce.cpp
@@ -5,7 +5,7 @@
 // by the reduce functions in SYCL 2020, but the standard C++ syntax is used for
 // forward compatibility with future SYCL versions.
 //
-// REQUIRES: TEMPORARY_DISABLED
+// REQUIRES: TEMPORARY_DISABLED, run-mode
 
 #include "helper.hpp"
 #include <complex>
diff --git a/sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp b/sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp
index 71f9253b239a2..f6b03534e4adf 100644
--- a/sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp
+++ b/sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: cuda,aspect-ext_oneapi_cubemap
+// REQUIRES: cuda,aspect-ext_oneapi_cubemap, run-mode
 // REQUIRES: aspect-ext_oneapi_cubemap_seamless_filtering
 
 // RUN: %{build} -o %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 3f4e6e433643f..c911d52785fae 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,5 +1,5 @@
 // REQUIRES: aspect-ext_oneapi_bindless_images
-// REQUIRES: windows
+// REQUIRES: windows, run-mode
 
 // RUN: %{build} -l d3d12 -l dxgi -l dxguid -o %t.out
 // RUN: %{run-unfiltered-devices} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %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 1e826270f827c..7f368a6188622 100644
--- a/sycl/test-e2e/bindless_images/vulkan_interop/mipmaps.cpp
+++ b/sycl/test-e2e/bindless_images/vulkan_interop/mipmaps.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: cuda
-// REQUIRES: vulkan
+// REQUIRES: vulkan, 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 1417a237f0c02..e103c5accded9 100644
--- a/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images.cpp
+++ b/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: cuda || (windows && level_zero && aspect-ext_oneapi_bindless_images)
-// REQUIRES: vulkan
+// REQUIRES: vulkan, 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 d480d4fed3db8..2a7f9df56b150 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,5 +1,5 @@
 // REQUIRES: cuda
-// REQUIRES: vulkan
+// REQUIRES: vulkan, 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 043fba15297ae..6cf99ea6895b7 100644
--- a/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp
+++ b/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: cuda || (windows && level_zero && aspect-ext_oneapi_bindless_images)
-// REQUIRES: vulkan
+// REQUIRES: vulkan, 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 54fc2d7bfb984..9fc6ac27c3689 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,5 +1,5 @@
 // REQUIRES: cuda
-// REQUIRES: vulkan
+// REQUIRES: vulkan, run-mode
 
 // RUN: %{build} %link-vulkan -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/syclcompat/kernel/kernel_win.cpp b/sycl/test-e2e/syclcompat/kernel/kernel_win.cpp
index 52c324fdfcb4d..1d8069f767515 100644
--- a/sycl/test-e2e/syclcompat/kernel/kernel_win.cpp
+++ b/sycl/test-e2e/syclcompat/kernel/kernel_win.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: windows
+// REQUIRES: windows, run-mode
 
 // DEFINE: %{sharedflag} = %if cl_options %{/clang:-shared%} %else %{-shared%}
 
diff --git a/sycl/test-e2e/syclcompat/launch/launch_properties.cpp b/sycl/test-e2e/syclcompat/launch/launch_properties.cpp
index 2ed7fc673b09a..70d6a44bb1e16 100644
--- a/sycl/test-e2e/syclcompat/launch/launch_properties.cpp
+++ b/sycl/test-e2e/syclcompat/launch/launch_properties.cpp
@@ -22,7 +22,7 @@
  *     sycl/test-e2e/ClusterLaunch/cluster_launch_parallel_for.cpp
  **************************************************************************/
 
-// REQUIRES: aspect-ext_oneapi_cuda_cluster_group
+// REQUIRES: aspect-ext_oneapi_cuda_cluster_group, run-mode
 // RUN: %{build} -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_90 -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/syclcompat/memory/local_memory_ptr_to_integer.cpp b/sycl/test-e2e/syclcompat/memory/local_memory_ptr_to_integer.cpp
index 184f7b5835810..1f542bf3fef29 100644
--- a/sycl/test-e2e/syclcompat/memory/local_memory_ptr_to_integer.cpp
+++ b/sycl/test-e2e/syclcompat/memory/local_memory_ptr_to_integer.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: cuda
+// REQUIRES: cuda, run-mode
 // RUN:  %{build} -Xsycl-target-backend --cuda-gpu-arch=sm_75 -o %t.out
 // RUN:  %{run} %t.out
 #include <sycl/detail/core.hpp>

From e74877017a88aa99151239086235b6394ee477e0 Mon Sep 17 00:00:00 2001
From: "Garcia Orozco, David" <david.garcia.orozco@intel.com>
Date: Thu, 31 Oct 2024 12:58:30 -0700
Subject: [PATCH 2/9] Temporarily add run-mode feature by default

---
 sycl/test-e2e/lit.cfg.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py
index ee91220fd3be3..6dfb213572b28 100644
--- a/sycl/test-e2e/lit.cfg.py
+++ b/sycl/test-e2e/lit.cfg.py
@@ -16,6 +16,9 @@
 
 # Configuration file for the 'lit' test runner.
 
+# TODO: Remove once #15728 is merged
+config.available_features.add("run-mode")
+
 # name: The name of this test suite.
 config.name = "SYCL"
 

From ce6ee6b2d4291ab44bb71876f342581ce4a27d76 Mon Sep 17 00:00:00 2001
From: "Garcia Orozco, David" <david.garcia.orozco@intel.com>
Date: Fri, 1 Nov 2024 07:33:18 -0700
Subject: [PATCH 3/9] Add `REQUIRES: run-mode` to two more tests that failed
 building

---
 sycl/test-e2e/DeviceGlobal/device_global_copy.cpp               | 1 +
 .../bindless_images/examples/example_5_sample_cubemap.cpp       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/sycl/test-e2e/DeviceGlobal/device_global_copy.cpp b/sycl/test-e2e/DeviceGlobal/device_global_copy.cpp
index 2d9ea347179ce..dea454a7c8432 100644
--- a/sycl/test-e2e/DeviceGlobal/device_global_copy.cpp
+++ b/sycl/test-e2e/DeviceGlobal/device_global_copy.cpp
@@ -1,6 +1,7 @@
 // RUN: %{build} -std=c++23 -o %t.out
 // RUN: %{run} %t.out
 //
+// REQUIRES: run-mode
 // UNSUPPORTED: opencl && gpu
 // UNSUPPORTED-TRACKER: GSD-4287
 //
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 b84e86bb86cf9..5ee7dfb6bafc2 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,4 +1,4 @@
-// REQUIRES: cuda
+// REQUIRES: cuda, run-mode
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out

From f027234cbfa111dff18071cbb90da6c75b0391c0 Mon Sep 17 00:00:00 2001
From: "Garcia Orozco, David" <david.garcia.orozco@intel.com>
Date: Fri, 1 Nov 2024 14:45:32 -0700
Subject: [PATCH 4/9] Remove `REQUIRES: run-mode` from tests that requires
 windows

---
 sycl/test-e2e/Basic/windows_version_agnostic_sycl_lib.cpp       | 2 +-
 sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp              | 2 +-
 sycl/test-e2e/DeviceLib/math_windows_test.cpp                   | 2 +-
 sycl/test-e2e/Plugin/dll-detach-order.cpp                       | 2 +-
 sycl/test-e2e/Regression/compile_on_win_with_mdd.cpp            | 2 +-
 sycl/test-e2e/Regression/fsycl-host-compiler-win.cpp            | 2 +-
 .../bindless_images/dx12_interop/read_write_unsampled.cpp       | 2 +-
 sycl/test-e2e/syclcompat/kernel/kernel_win.cpp                  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sycl/test-e2e/Basic/windows_version_agnostic_sycl_lib.cpp b/sycl/test-e2e/Basic/windows_version_agnostic_sycl_lib.cpp
index 883b2c9878354..c95e05a1d7d6a 100644
--- a/sycl/test-e2e/Basic/windows_version_agnostic_sycl_lib.cpp
+++ b/sycl/test-e2e/Basic/windows_version_agnostic_sycl_lib.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: windows, run-mode
+// REQUIRES: windows
 
 // RUN: %clangxx --driver-mode=cl /std:c++17 /EHsc -I%sycl_include -I%opencl_include_dir %s -o %t.out /link /defaultlib:%sycl_static_libs_dir/sycl.lib
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp b/sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp
index 119faea85982b..71e8a43387093 100644
--- a/sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp
+++ b/sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: aspect-fp64, windows, run-mode
+// REQUIRES: aspect-fp64, windows
 
 // DEFINE: %{mathflags} = %if cl_options %{/clang:-fno-fast-math%} %else %{-fno-fast-math%}
 
diff --git a/sycl/test-e2e/DeviceLib/math_windows_test.cpp b/sycl/test-e2e/DeviceLib/math_windows_test.cpp
index bae1c76cd60e7..ab18cf1abe254 100644
--- a/sycl/test-e2e/DeviceLib/math_windows_test.cpp
+++ b/sycl/test-e2e/DeviceLib/math_windows_test.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: windows, run-mode
+// REQUIRES: windows
 
 // TODO: Add hypotf case back when the missing symbol is fixed.
 
diff --git a/sycl/test-e2e/Plugin/dll-detach-order.cpp b/sycl/test-e2e/Plugin/dll-detach-order.cpp
index 2f207ac40eeb7..207b958397b27 100644
--- a/sycl/test-e2e/Plugin/dll-detach-order.cpp
+++ b/sycl/test-e2e/Plugin/dll-detach-order.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: windows, run-mode
+// REQUIRES: windows
 // RUN: env SYCL_UR_TRACE=-1 sycl-ls | FileCheck %s
 
 // ensure that the plugins are detached AFTER urLoaderTearDown is done executing
diff --git a/sycl/test-e2e/Regression/compile_on_win_with_mdd.cpp b/sycl/test-e2e/Regression/compile_on_win_with_mdd.cpp
index 950f373653bbe..57826c81ece2e 100644
--- a/sycl/test-e2e/Regression/compile_on_win_with_mdd.cpp
+++ b/sycl/test-e2e/Regression/compile_on_win_with_mdd.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: windows, run-mode
+// REQUIRES: windows
 
 // RUN: %clangxx --driver-mode=cl -fsycl /MDd -c %s -o %t.obj
 // RUN: %clangxx --driver-mode=cl -fsycl %t.obj -Wno-unused-command-line-argument -o %t.out
diff --git a/sycl/test-e2e/Regression/fsycl-host-compiler-win.cpp b/sycl/test-e2e/Regression/fsycl-host-compiler-win.cpp
index d303dc92b9e01..4ffe42c45c52f 100644
--- a/sycl/test-e2e/Regression/fsycl-host-compiler-win.cpp
+++ b/sycl/test-e2e/Regression/fsycl-host-compiler-win.cpp
@@ -1,6 +1,6 @@
 // RUN: %{build} -fsycl-host-compiler=cl -DDEFINE_CHECK -fsycl-host-compiler-options="-DDEFINE_CHECK /std:c++17 /Zc:__cplusplus" -o %t.exe
 // RUN: %{run} %t.exe
-// REQUIRES: windows, run-mode
+// REQUIRES: windows
 //
 //==------- fsycl-host-compiler-win.cpp - external host compiler test ------==//
 //
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 c911d52785fae..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
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_oneapi_bindless_images
-// REQUIRES: windows, run-mode
+// REQUIRES: windows
 
 // RUN: %{build} -l d3d12 -l dxgi -l dxguid -o %t.out
 // RUN: %{run-unfiltered-devices} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
diff --git a/sycl/test-e2e/syclcompat/kernel/kernel_win.cpp b/sycl/test-e2e/syclcompat/kernel/kernel_win.cpp
index 1d8069f767515..52c324fdfcb4d 100644
--- a/sycl/test-e2e/syclcompat/kernel/kernel_win.cpp
+++ b/sycl/test-e2e/syclcompat/kernel/kernel_win.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: windows, run-mode
+// REQUIRES: windows
 
 // DEFINE: %{sharedflag} = %if cl_options %{/clang:-shared%} %else %{-shared%}
 

From baad80ad5e2b83266e9a87f30cc0d79e38d6da31 Mon Sep 17 00:00:00 2001
From: "Garcia Orozco, David" <david.garcia.orozco@intel.com>
Date: Fri, 1 Nov 2024 14:54:11 -0700
Subject: [PATCH 5/9] Add `TEMPORARY_DISABLED` to device agnostic features set

---
 .../Basic/free_function_queries/free_function_queries.cpp       | 2 +-
 .../free_function_queries/free_function_queries_sub_group.cpp   | 2 +-
 sycl/test-e2e/GroupAlgorithm/barrier.cpp                        | 2 +-
 sycl/test-e2e/InvokeSimd/Feature/ImplicitSubgroup/popcnt.cpp    | 2 +-
 sycl/test-e2e/InvokeSimd/Feature/popcnt.cpp                     | 2 +-
 sycl/test-e2e/SubGroup/generic_reduce.cpp                       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sycl/test-e2e/Basic/free_function_queries/free_function_queries.cpp b/sycl/test-e2e/Basic/free_function_queries/free_function_queries.cpp
index cfb490126c4cb..9fe7f0ff6cb90 100644
--- a/sycl/test-e2e/Basic/free_function_queries/free_function_queries.cpp
+++ b/sycl/test-e2e/Basic/free_function_queries/free_function_queries.cpp
@@ -1,5 +1,5 @@
 // FIXME: Investigate OS-agnostic failures
-// REQUIRES: TEMPORARY_DISABLED, run-mode
+// REQUIRES: TEMPORARY_DISABLED
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/Basic/free_function_queries/free_function_queries_sub_group.cpp b/sycl/test-e2e/Basic/free_function_queries/free_function_queries_sub_group.cpp
index 6e5f63544e724..fcbdb79a5d81f 100644
--- a/sycl/test-e2e/Basic/free_function_queries/free_function_queries_sub_group.cpp
+++ b/sycl/test-e2e/Basic/free_function_queries/free_function_queries_sub_group.cpp
@@ -1,5 +1,5 @@
 // FIXME: Investigate OS-agnostic failures
-// REQUIRES: TEMPORARY_DISABLED, run-mode
+// REQUIRES: TEMPORARY_DISABLED
 // UNSUPPORTED: cuda || hip
 // CUDA and HIP compilation and runtime do not yet support sub-groups.
 //
diff --git a/sycl/test-e2e/GroupAlgorithm/barrier.cpp b/sycl/test-e2e/GroupAlgorithm/barrier.cpp
index 5ad2121159c47..8fb0addcf7924 100644
--- a/sycl/test-e2e/GroupAlgorithm/barrier.cpp
+++ b/sycl/test-e2e/GroupAlgorithm/barrier.cpp
@@ -1,6 +1,6 @@
 // Temporarily disabled due to regressions introduced by
 // https://github.com/intel/llvm/pull/8412.
-// REQUIRES: TEMPORARY_DISABLED, run-mode
+// REQUIRES: TEMPORARY_DISABLED
 
 // RUN: %{build} -o %t.out -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_80
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/InvokeSimd/Feature/ImplicitSubgroup/popcnt.cpp b/sycl/test-e2e/InvokeSimd/Feature/ImplicitSubgroup/popcnt.cpp
index 6217b432516b4..153478c11580a 100644
--- a/sycl/test-e2e/InvokeSimd/Feature/ImplicitSubgroup/popcnt.cpp
+++ b/sycl/test-e2e/InvokeSimd/Feature/ImplicitSubgroup/popcnt.cpp
@@ -1,6 +1,6 @@
 // NOTE: The feature is not yet supported, there is a discussion on the
 // feasibility of tests
-// REQUIRES: TEMPORARY_DISABLED, run-mode
+// REQUIRES: TEMPORARY_DISABLED
 //
 // Check that full compilation works:
 // RUN: %clangxx -DIMPL_SUBGROUP -fsycl -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr %S/../popcnt.cpp -o %t.out
diff --git a/sycl/test-e2e/InvokeSimd/Feature/popcnt.cpp b/sycl/test-e2e/InvokeSimd/Feature/popcnt.cpp
index cf102b27f1011..f99c6fd0e097b 100644
--- a/sycl/test-e2e/InvokeSimd/Feature/popcnt.cpp
+++ b/sycl/test-e2e/InvokeSimd/Feature/popcnt.cpp
@@ -1,6 +1,6 @@
 // NOTE: The feature is not yet supported, there is a discussion on the
 // feasibility of tests
-// REQUIRES: TEMPORARY_DISABLED, run-mode
+// REQUIRES: TEMPORARY_DISABLED
 //
 // Check that full compilation works:
 // RUN: %{build} -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr -o %t.out
diff --git a/sycl/test-e2e/SubGroup/generic_reduce.cpp b/sycl/test-e2e/SubGroup/generic_reduce.cpp
index 97d59c13e3871..e158663479ed9 100644
--- a/sycl/test-e2e/SubGroup/generic_reduce.cpp
+++ b/sycl/test-e2e/SubGroup/generic_reduce.cpp
@@ -5,7 +5,7 @@
 // by the reduce functions in SYCL 2020, but the standard C++ syntax is used for
 // forward compatibility with future SYCL versions.
 //
-// REQUIRES: TEMPORARY_DISABLED, run-mode
+// REQUIRES: TEMPORARY_DISABLED
 
 #include "helper.hpp"
 #include <complex>

From acf69504bf0f8c61adf06d7db658c8da6a77b0c2 Mon Sep 17 00:00:00 2001
From: "Garcia Orozco, David" <david.garcia.orozco@intel.com>
Date: Fri, 1 Nov 2024 15:02:29 -0700
Subject: [PATCH 6/9] Add vulkan to device agnostic features set

---
 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/unsampled_images.cpp         | 2 +-
 .../vulkan_interop/unsampled_images_semaphore.cpp               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sycl/test-e2e/bindless_images/vulkan_interop/mipmaps.cpp b/sycl/test-e2e/bindless_images/vulkan_interop/mipmaps.cpp
index 7f368a6188622..1e826270f827c 100644
--- a/sycl/test-e2e/bindless_images/vulkan_interop/mipmaps.cpp
+++ b/sycl/test-e2e/bindless_images/vulkan_interop/mipmaps.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: cuda
-// REQUIRES: vulkan, run-mode
+// REQUIRES: vulkan
 
 // 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 e103c5accded9..1417a237f0c02 100644
--- a/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images.cpp
+++ b/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: cuda || (windows && level_zero && aspect-ext_oneapi_bindless_images)
-// REQUIRES: vulkan, run-mode
+// 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 %}
 // 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 2a7f9df56b150..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,5 +1,5 @@
 // REQUIRES: cuda
-// REQUIRES: vulkan, run-mode
+// REQUIRES: vulkan
 
 // 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 6cf99ea6895b7..043fba15297ae 100644
--- a/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp
+++ b/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: cuda || (windows && level_zero && aspect-ext_oneapi_bindless_images)
-// REQUIRES: vulkan, run-mode
+// REQUIRES: vulkan
 
 // 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 9fc6ac27c3689..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,5 +1,5 @@
 // REQUIRES: cuda
-// REQUIRES: vulkan, run-mode
+// REQUIRES: vulkan
 
 // RUN: %{build} %link-vulkan -o %t.out
 // RUN: %{run} %t.out

From 3e0a61f6b46645c30516f225780d7ffb5a21aa6c Mon Sep 17 00:00:00 2001
From: "Garcia Orozco, David" <david.garcia.orozco@intel.com>
Date: Mon, 4 Nov 2024 06:35:39 -0800
Subject: [PATCH 7/9] Add zstd to device agnostic features

---
 sycl/test-e2e/Compression/no_zstd_warning.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sycl/test-e2e/Compression/no_zstd_warning.cpp b/sycl/test-e2e/Compression/no_zstd_warning.cpp
index 64c37ffbcac93..8a4460f9b8643 100644
--- a/sycl/test-e2e/Compression/no_zstd_warning.cpp
+++ b/sycl/test-e2e/Compression/no_zstd_warning.cpp
@@ -1,4 +1,4 @@
 // using --offload-compress without zstd should throw an error.
-// REQUIRES: !zstd, run-mode
+// REQUIRES: !zstd
 // RUN: not %{build} -O0 -g --offload-compress %S/Inputs/single_kernel.cpp -o %t_compress.out 2>&1 | FileCheck %s
 // CHECK: '--offload-compress' option is specified but zstd is not available. The device image will not be compressed.

From faf0f8913d321cedcf7428c903dc10429efd629e Mon Sep 17 00:00:00 2001
From: "Garcia Orozco, David" <david.garcia.orozco@intel.com>
Date: Mon, 4 Nov 2024 07:39:07 -0800
Subject: [PATCH 8/9] add cl_options and system-windows to device agnostic
 features

---
 sycl/test-e2e/Regression/msvc_crt.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sycl/test-e2e/Regression/msvc_crt.cpp b/sycl/test-e2e/Regression/msvc_crt.cpp
index d4bf082b58220..9d59547e50d7b 100644
--- a/sycl/test-e2e/Regression/msvc_crt.cpp
+++ b/sycl/test-e2e/Regression/msvc_crt.cpp
@@ -2,7 +2,7 @@
 // RUN: %{run} %t1.exe
 // RUN: %{build} /MDd -o %t2.exe
 // RUN: %{run} %t2.exe
-// REQUIRES: system-windows, cl_options, run-mode
+// REQUIRES: system-windows, cl_options
 //==-------------- msvc_crt.cpp - SYCL MSVC CRT test -----------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

From 85e1a36b1556549e6c354f7107647c3179588e6d Mon Sep 17 00:00:00 2001
From: "Garcia Orozco, David" <david.garcia.orozco@intel.com>
Date: Mon, 4 Nov 2024 07:53:49 -0800
Subject: [PATCH 9/9] Mark two tests with `XFAIL: run-mode`

---
 .../device_architecture_comparison_on_device_aot.cpp            | 2 +-
 sycl/test-e2e/Plugin/level_zero_sub_sub_device.cpp              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_device_aot.cpp b/sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_device_aot.cpp
index 76a6a54671061..488e9caa7e280 100644
--- a/sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_device_aot.cpp
+++ b/sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_device_aot.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: arch-intel_gpu_pvc, ocloc
 
-// XFAIL: arch-intel_gpu_pvc
+// XFAIL: arch-intel_gpu_pvc, run-mode
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/14826
 
 // RUN: %clangxx -fsycl -fsycl-targets=intel_gpu_pvc %s -o %t.out
diff --git a/sycl/test-e2e/Plugin/level_zero_sub_sub_device.cpp b/sycl/test-e2e/Plugin/level_zero_sub_sub_device.cpp
index fd05d1071870b..3f36dd6b5ff99 100644
--- a/sycl/test-e2e/Plugin/level_zero_sub_sub_device.cpp
+++ b/sycl/test-e2e/Plugin/level_zero_sub_sub_device.cpp
@@ -1,6 +1,6 @@
 // REQUIRES:  arch-intel_gpu_pvc, level_zero
 
-// XFAIL: arch-intel_gpu_pvc
+// XFAIL: arch-intel_gpu_pvc, run-mode
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/15602
 
 // RUN: %{build} %level_zero_options -o %t.out