Rename usages of "split"

ayylol · ayylol · commit 70c2555b6238 · 2024-11-13T11:34:47.000-08:00
diff --git a/sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp b/sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp
@@ -1,6 +1,6 @@
 // UNSUPPORTED: windows
 // REQUIRES: cuda || hip
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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/windows_version_agnostic_sycl_lib.cpp b/sycl/test-e2e/Basic/windows_version_agnostic_sycl_lib.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: windows
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-mode
 
 // RUN: %clangxx --driver-mode=cl /std:c++17 /EHsc /imsvc %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
@@ -1,5 +1,5 @@
 // using --offload-compress without zstd should throw an error.
 // REQUIRES: !zstd
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -1,5 +1,5 @@
 // REQUIRES: aspect-fp64, windows
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -1,5 +1,5 @@
 // REQUIRES: windows
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -1,7 +1,7 @@
 // RUN: %{build} -Wno-error=deprecated-declarations -o %t.out %cuda_options
 // RUN: %{run} %t.out
 // REQUIRES: cuda, cuda_dev_kit
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-mode
 
 #include <cuda.h>
 
diff --git a/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp b/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp
@@ -3,7 +3,7 @@
 // RUN: %{build} -o %t.out -I%rocm_path/include -L%rocm_path/lib -lamdhip64
 // RUN: %{run} %t.out
 // REQUIRES: hip
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -1,5 +1,5 @@
 // REQUIRES: cuda, cuda_dev_kit
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-mode
 // RUN: %{build} -o %t.out %cuda_options
 // 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
@@ -1,5 +1,5 @@
 // REQUIRES: cuda, cuda_dev_kit
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -1,7 +1,7 @@
 // RUN: %{build} -o %t.out %cuda_options
 // RUN: %{run} %t.out
 // REQUIRES: cuda, cuda_dev_kit
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -3,7 +3,7 @@
 // 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: unsplit-test-mode
+// REQUIRES: run-and-build-mode
 
 #include <iostream>
 #include <sycl/backend.hpp>
diff --git a/sycl/test-e2e/KernelAndProgram/test_cache_jit_aot.cpp b/sycl/test-e2e/KernelAndProgram/test_cache_jit_aot.cpp
@@ -2,7 +2,7 @@
 // cannot do that reliably when number of devices is unknown.
 //
 // REQUIRES: level_zero, ocloc
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-mode
 //
 // DEFINE: %{cache_vars} = env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_TRACE=1 SYCL_CACHE_DIR=%t/cache_dir
 // DEFINE: %{build_cmd} = %{build}
diff --git a/sycl/test-e2e/Matrix/joint_matrix_hip_gfx90a.cpp b/sycl/test-e2e/Matrix/joint_matrix_hip_gfx90a.cpp
@@ -10,7 +10,7 @@
 // RUN: %{run} %t.out
 
 // REQUIRES: gpu-amd-gfx90a
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -11,7 +11,7 @@
 
 // REQUIRES: gpu-amd-gfx90a
 // REQUIRES: aspect-fp16
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // REQUIRES: cuda
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // REQUIRES: gpu-amd-gfx90a
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -1,5 +1,5 @@
 // REQUIRES: hip_amd, opencl, gpu, cpu
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -1,5 +1,5 @@
 // REQUIRES: cuda, opencl, gpu, cpu
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -1,5 +1,5 @@
 // REQUIRES: ocloc, level_zero, gpu, cpu
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -1,5 +1,5 @@
 // REQUIRES: gpu, cuda, cuda_dev_kit
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -1,5 +1,5 @@
 // REQUIRES: windows
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -1,5 +1,5 @@
 // REQUIRES: gpu, cuda
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -1,5 +1,5 @@
 // REQUIRES: gpu, hip, sycl-ls
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -1,5 +1,5 @@
 // REQUIRES: gpu, cuda, hip, opencl, sycl-ls
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -6,7 +6,7 @@
 // RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="cuda:*"   %t-nvptx64-spir64.out
 
 // REQUIRES: opencl, cuda
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -1,5 +1,5 @@
 // REQUIRES: windows
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -1,7 +1,7 @@
 // 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: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -3,7 +3,7 @@
 // RUN: %{build} /MDd -o %t2.exe
 // RUN: %{run} %t2.exe
 // REQUIRES: system-windows, cl_options
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -3,7 +3,7 @@
 // The test is repeated for per_kernel device code splitting.
 //
 // REQUIRES: cuda || hip || native_cpu
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -1,5 +1,5 @@
 // REQUIRES: cuda
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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/bindless_images/cubemap/cubemap_sampled.cpp b/sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: cuda,aspect-ext_oneapi_cubemap
 // REQUIRES: aspect-ext_oneapi_cubemap_seamless_filtering
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -1,6 +1,6 @@
 // REQUIRES: aspect-ext_oneapi_bindless_images
 // REQUIRES: windows
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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/examples/example_5_sample_cubemap.cpp b/sycl/test-e2e/bindless_images/examples/example_5_sample_cubemap.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: cuda
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-mode
 
 // 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
@@ -1,6 +1,6 @@
 // REQUIRES: cuda
 // REQUIRES: vulkan
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -1,6 +1,6 @@
 // REQUIRES: cuda || (windows && level_zero && aspect-ext_oneapi_bindless_images)
 // REQUIRES: vulkan
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -1,6 +1,6 @@
 // REQUIRES: cuda
 // REQUIRES: vulkan
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -1,6 +1,6 @@
 // REQUIRES: cuda || (windows && level_zero && aspect-ext_oneapi_bindless_images)
 // REQUIRES: vulkan
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -1,6 +1,6 @@
 // REQUIRES: cuda
 // REQUIRES: vulkan
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-mode
 
 // RUN: %{build} %link-vulkan -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/format.py b/sycl/test-e2e/format.py
@@ -156,9 +156,9 @@ def execute(self, test, litConfig):
 
         devices_for_test = []
         triples = set()
-        if test.config.split_mode == "build-only":
+        if test.config.test_mode == "build-only":
             if (
-                "unsplit-test-mode" in test.requires
+                "run-and-build-mode" in test.requires
                 or "TEMPORARY_DISABLED" in test.requires
             ):
                 return lit.Test.Result(
@@ -240,8 +240,8 @@ def get_extra_env(sycl_devices):
                 for i in ["%{run}", "%{run-unfiltered-devices}", "%if run-mode"]
             )
 
-            if (is_run_line and test.config.split_mode == "build-only") or (
-                not is_run_line and test.config.split_mode == "run-only"
+            if (is_run_line and test.config.test_mode == "build-only") or (
+                not is_run_line and test.config.test_mode == "run-only"
             ):
                 directive.command = ""
 
@@ -300,7 +300,7 @@ def get_extra_env(sycl_devices):
             test, litConfig, useExternalSh, script, tmpBase
         )
 
-        if len(devices_for_test) > 1 or test.config.split_mode == "build-only":
+        if len(devices_for_test) > 1 or test.config.test_mode == "build-only":
             return result
 
         # Single device - might be an XFAIL.
diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py
@@ -38,17 +38,17 @@
 config.unsupported_features = []
 
 # split-mode: Set if tests should run normally or with split build/run
-match lit_config.params.get("split-mode", "both"):
-    case "run":
-        config.split_mode = "run-only"
+match lit_config.params.get("test-mode", "full"):
+    case "run-only":
+        config.test_mode = "run-only"
         config.available_features.add("run-mode")
-    case "build":
-        config.split_mode = "build-only"
+    case "build-only":
+        config.test_mode = "build-only"
         config.sycl_devices = []
     case _:
-        config.split_mode = "unsplit"
+        config.test_mode = "full"
         config.available_features.add("run-mode")
-        config.available_features.add("unsplit-test-mode")
+        config.available_features.add("run-and-build-mode")
 
 # Cleanup environment variables which may affect tests
 possibly_dangerous_env_vars = [
diff --git a/sycl/test-e2e/syclcompat/kernel/kernel_win.cpp b/sycl/test-e2e/syclcompat/kernel/kernel_win.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: windows
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -23,7 +23,7 @@
  **************************************************************************/
 
 // REQUIRES: aspect-ext_oneapi_cuda_cluster_group
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-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
@@ -1,5 +1,5 @@
 // REQUIRES: cuda
-// REQUIRES: unsplit-test-mode
+// REQUIRES: run-and-build-mode
 // RUN:  %{build} -Xsycl-target-backend --cuda-gpu-arch=sm_75 -o %t.out
 // RUN:  %{run} %t.out
 #include <sycl/detail/core.hpp>
