From 7432d1ce9ab38ce983234cf7b5462de8d627d652 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Thu, 7 Nov 2024 10:18:14 -0800 Subject: [PATCH 01/18] Add functionality to split build and run of e2e tests --- sycl/test-e2e/format.py | 44 ++++++++++++++++++++++++++++++---------- sycl/test-e2e/lit.cfg.py | 12 +++++++++++ 2 files changed, 45 insertions(+), 11 deletions(-) diff --git a/sycl/test-e2e/format.py b/sycl/test-e2e/format.py index e0cf41d8b118f..b4e9640111817 100644 --- a/sycl/test-e2e/format.py +++ b/sycl/test-e2e/format.py @@ -154,18 +154,26 @@ def execute(self, test, litConfig): if isinstance(script, lit.Test.Result): return script - devices_for_test = self.select_devices_for_test(test) - if not devices_for_test: - return lit.Test.Result( - lit.Test.UNSUPPORTED, "No supported devices to run the test on" - ) - - substitutions = lit.TestRunner.getDefaultSubstitutions(test, tmpDir, tmpBase) + devices_for_test = [] triples = set() - for sycl_device in devices_for_test: - (backend, _) = sycl_device.split(":") - triples.add(get_triple(test, backend)) + if "run-mode" not in test.config.available_features: + if "unsplit-mode" in test.requires or "TEMPORARY_DISABLED" in test.requires: + return lit.Test.Result( + lit.Test.UNSUPPORTED, "Test unsupported for this environment" + ) + triples = {"spir64"} + else: + devices_for_test = self.select_devices_for_test(test) + if not devices_for_test: + return lit.Test.Result( + lit.Test.UNSUPPORTED, "No supported devices to run the test on" + ) + + for sycl_device in devices_for_test: + (backend, _) = sycl_device.split(":") + triples.add(get_triple(test, backend)) + substitutions = lit.TestRunner.getDefaultSubstitutions(test, tmpDir, tmpBase) substitutions.append(("%{sycl_triple}", format(",".join(triples)))) # -fsycl-targets is needed for CUDA/HIP, so just use it be default so # -that new tests by default would runnable there (unless they have @@ -223,6 +231,17 @@ def get_extra_env(sycl_devices): new_script.append(directive) continue + # Filter commands based on split-mode + is_run_line = any( + i in directive.command + for i in ["%{run}", "%{run-unfiltered-devices}", "%if run-mode"] + ) + + if (is_run_line and "run-mode" not in test.config.available_features) or ( + not is_run_line and "build-mode" not in test.config.available_features + ): + directive.command = "" + if "%{run}" not in directive.command: new_script.append(directive) continue @@ -278,7 +297,10 @@ def get_extra_env(sycl_devices): test, litConfig, useExternalSh, script, tmpBase ) - if len(devices_for_test) > 1: + if ( + len(devices_for_test) > 1 + or "run-mode" not in test.config.available_features + ): return result # Single device - might be an XFAIL. diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index ee91220fd3be3..629cbe8f5aa76 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -37,6 +37,18 @@ config.required_features = [] 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.available_features.add("run-mode") + case "build": + config.available_features.add("build-mode") + config.sycl_devices = [] + case _: + config.available_features.add("run-mode") + config.available_features.add("build-mode") + config.available_features.add("unsplit-mode") + # Cleanup environment variables which may affect tests possibly_dangerous_env_vars = [ "COMPILER_PATH", From be37e4174dc94dd9346c4d54d03d943840f1844d Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Thu, 7 Nov 2024 10:54:19 -0800 Subject: [PATCH 02/18] Add `REQUIRES: unsplit-mode` to tests that failed building --- sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp | 1 + sycl/test-e2e/Basic/windows_version_agnostic_sycl_lib.cpp | 1 + sycl/test-e2e/Compression/no_zstd_warning.cpp | 1 + sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp | 1 + sycl/test-e2e/DeviceLib/math_windows_test.cpp | 1 + sycl/test-e2e/EnqueueNativeCommand/custom-command-cuda.cpp | 1 + sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp | 1 + .../EnqueueNativeCommand/custom-command-multiple-dev-cuda.cpp | 1 + .../HostInteropTask/interop-task-cuda-buffer-migrate.cpp | 1 + sycl/test-e2e/HostInteropTask/interop-task-cuda.cpp | 1 + sycl/test-e2e/HostInteropTask/interop-task-hip.cpp | 1 + sycl/test-e2e/KernelAndProgram/test_cache_jit_aot.cpp | 1 + sycl/test-e2e/Matrix/joint_matrix_hip_gfx90a.cpp | 1 + sycl/test-e2e/Matrix/joint_matrix_hip_half_gfx90a.cpp | 1 + sycl/test-e2e/Matrix/joint_matrix_tensorcores_sm70.cpp | 1 + sycl/test-e2e/Matrix/runtime_query_hip_gfx90a.cpp | 1 + .../is_compatible/is_compatible_amdgcn.cpp | 1 + .../is_compatible/is_compatible_nvptx64.cpp | 1 + .../is_compatible/is_compatible_several_targets.cpp | 1 + sycl/test-e2e/Plugin/cuda_queue_priority.cpp | 1 + sycl/test-e2e/Plugin/dll-detach-order.cpp | 1 + sycl/test-e2e/Plugin/sycl-ls-gpu-cuda.cpp | 1 + sycl/test-e2e/Plugin/sycl-ls-gpu-hip.cpp | 1 + sycl/test-e2e/Plugin/sycl-ls-gpu-sycl-be.cpp | 1 + sycl/test-e2e/Plugin/sycl-targets-order.cpp | 1 + sycl/test-e2e/Regression/compile_on_win_with_mdd.cpp | 1 + sycl/test-e2e/Regression/fsycl-host-compiler-win.cpp | 1 + sycl/test-e2e/Regression/msvc_crt.cpp | 1 + sycl/test-e2e/Regression/multiple-targets.cpp | 1 + sycl/test-e2e/SpecConstants/2020/non_native/cuda.cpp | 1 + sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp | 1 + .../bindless_images/dx12_interop/read_write_unsampled.cpp | 1 + .../bindless_images/examples/example_5_sample_cubemap.cpp | 1 + sycl/test-e2e/bindless_images/vulkan_interop/mipmaps.cpp | 1 + sycl/test-e2e/bindless_images/vulkan_interop/sampled_images.cpp | 1 + .../bindless_images/vulkan_interop/sampled_images_USM.cpp | 1 + .../test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp | 1 + .../vulkan_interop/unsampled_images_semaphore.cpp | 1 + sycl/test-e2e/syclcompat/kernel/kernel_win.cpp | 1 + sycl/test-e2e/syclcompat/launch/launch_properties.cpp | 1 + sycl/test-e2e/syclcompat/memory/local_memory_ptr_to_integer.cpp | 1 + 41 files changed, 41 insertions(+) diff --git a/sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp b/sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp index bea29d5c89a80..c0f426ee7f079 100644 --- a/sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp +++ b/sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp @@ -1,5 +1,6 @@ // UNSUPPORTED: windows // REQUIRES: cuda || hip +// REQUIRES: unsplit-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 index c95e05a1d7d6a..080981c78a810 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,5 @@ // REQUIRES: windows +// REQUIRES: unsplit-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 c87f2fe480096..2c640ccd417f4 100644 --- a/sycl/test-e2e/Compression/no_zstd_warning.cpp +++ b/sycl/test-e2e/Compression/no_zstd_warning.cpp @@ -1,4 +1,5 @@ // using --offload-compress without zstd should throw an error. // REQUIRES: !zstd +// REQUIRES: unsplit-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..226a21f79ae3b 100644 --- a/sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp +++ b/sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp @@ -1,4 +1,5 @@ // REQUIRES: aspect-fp64, windows +// REQUIRES: unsplit-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..9423124ce58fe 100644 --- a/sycl/test-e2e/DeviceLib/math_windows_test.cpp +++ b/sycl/test-e2e/DeviceLib/math_windows_test.cpp @@ -1,4 +1,5 @@ // REQUIRES: windows +// REQUIRES: unsplit-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..8188aa37dc97b 100644 --- a/sycl/test-e2e/EnqueueNativeCommand/custom-command-cuda.cpp +++ b/sycl/test-e2e/EnqueueNativeCommand/custom-command-cuda.cpp @@ -1,6 +1,7 @@ // RUN: %{build} -Wno-error=deprecated-declarations -o %t.out %cuda_options // RUN: %{run} %t.out // REQUIRES: cuda, cuda_dev_kit +// REQUIRES: unsplit-mode #include diff --git a/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp b/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp index 7dec45ccee05a..0886d198036f6 100644 --- a/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp +++ b/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp @@ -3,6 +3,7 @@ // RUN: %{build} -o %t.out -I%rocm_path/include -L%rocm_path/lib -lamdhip64 // RUN: %{run} %t.out // REQUIRES: hip +// REQUIRES: unsplit-mode #include #include 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..961fb63702cad 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,5 @@ // REQUIRES: cuda, cuda_dev_kit +// REQUIRES: unsplit-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 index b6ac1f96f90e1..a143575fd65f5 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,5 @@ // REQUIRES: cuda, cuda_dev_kit +// REQUIRES: unsplit-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..f45bf0f73778a 100644 --- a/sycl/test-e2e/HostInteropTask/interop-task-cuda.cpp +++ b/sycl/test-e2e/HostInteropTask/interop-task-cuda.cpp @@ -1,6 +1,7 @@ // RUN: %{build} -o %t.out %cuda_options // RUN: %{run} %t.out // REQUIRES: cuda, cuda_dev_kit +// REQUIRES: unsplit-mode #include #include diff --git a/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp b/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp index 96b55050418cd..c7abb1526b411 100644 --- a/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp +++ b/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp @@ -3,6 +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-mode #include #include diff --git a/sycl/test-e2e/KernelAndProgram/test_cache_jit_aot.cpp b/sycl/test-e2e/KernelAndProgram/test_cache_jit_aot.cpp index bea437200bdba..691a40c1e15f3 100644 --- a/sycl/test-e2e/KernelAndProgram/test_cache_jit_aot.cpp +++ b/sycl/test-e2e/KernelAndProgram/test_cache_jit_aot.cpp @@ -2,6 +2,7 @@ // cannot do that reliably when number of devices is unknown. // // REQUIRES: level_zero, ocloc +// REQUIRES: unsplit-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 index 008b3499a949d..0001c703b545e 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_hip_gfx90a.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_hip_gfx90a.cpp @@ -10,6 +10,7 @@ // RUN: %{run} %t.out // REQUIRES: gpu-amd-gfx90a +// REQUIRES: unsplit-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..a4f25c2571634 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: unsplit-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..4dd26f6299209 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_tensorcores_sm70.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_tensorcores_sm70.cpp @@ -7,6 +7,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: cuda +// REQUIRES: unsplit-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..51c95d2c9a354 100644 --- a/sycl/test-e2e/Matrix/runtime_query_hip_gfx90a.cpp +++ b/sycl/test-e2e/Matrix/runtime_query_hip_gfx90a.cpp @@ -7,6 +7,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: gpu-amd-gfx90a +// REQUIRES: unsplit-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..8e020516056ae 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,5 @@ // REQUIRES: hip_amd, opencl, gpu, cpu +// REQUIRES: unsplit-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..21f04fe2d2fa4 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,5 @@ // REQUIRES: cuda, opencl, gpu, cpu +// REQUIRES: unsplit-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..fd4156cf77d0e 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,5 @@ // REQUIRES: ocloc, level_zero, gpu, cpu +// REQUIRES: unsplit-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..237cfee60406f 100644 --- a/sycl/test-e2e/Plugin/cuda_queue_priority.cpp +++ b/sycl/test-e2e/Plugin/cuda_queue_priority.cpp @@ -1,4 +1,5 @@ // REQUIRES: gpu, cuda, cuda_dev_kit +// REQUIRES: unsplit-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..580cf52bb0ba7 100644 --- a/sycl/test-e2e/Plugin/dll-detach-order.cpp +++ b/sycl/test-e2e/Plugin/dll-detach-order.cpp @@ -1,4 +1,5 @@ // REQUIRES: windows +// REQUIRES: unsplit-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..51d935ce8d376 100644 --- a/sycl/test-e2e/Plugin/sycl-ls-gpu-cuda.cpp +++ b/sycl/test-e2e/Plugin/sycl-ls-gpu-cuda.cpp @@ -1,4 +1,5 @@ // REQUIRES: gpu, cuda +// REQUIRES: unsplit-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..37417a7a39aa9 100644 --- a/sycl/test-e2e/Plugin/sycl-ls-gpu-hip.cpp +++ b/sycl/test-e2e/Plugin/sycl-ls-gpu-hip.cpp @@ -1,4 +1,5 @@ // REQUIRES: gpu, hip, sycl-ls +// REQUIRES: unsplit-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..147c6a6787399 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,5 @@ // REQUIRES: gpu, cuda, hip, opencl, sycl-ls +// REQUIRES: unsplit-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..606242d4b720f 100644 --- a/sycl/test-e2e/Plugin/sycl-targets-order.cpp +++ b/sycl/test-e2e/Plugin/sycl-targets-order.cpp @@ -6,6 +6,7 @@ // RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="cuda:*" %t-nvptx64-spir64.out // REQUIRES: opencl, cuda +// REQUIRES: unsplit-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..05dde0c107a0f 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,5 @@ // REQUIRES: windows +// REQUIRES: unsplit-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..e025b30b0859c 100644 --- a/sycl/test-e2e/Regression/fsycl-host-compiler-win.cpp +++ b/sycl/test-e2e/Regression/fsycl-host-compiler-win.cpp @@ -1,6 +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-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..edecfa4c3e207 100644 --- a/sycl/test-e2e/Regression/msvc_crt.cpp +++ b/sycl/test-e2e/Regression/msvc_crt.cpp @@ -3,6 +3,7 @@ // RUN: %{build} /MDd -o %t2.exe // RUN: %{run} %t2.exe // REQUIRES: system-windows, cl_options +// REQUIRES: unsplit-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..34d08c423f3a6 100644 --- a/sycl/test-e2e/Regression/multiple-targets.cpp +++ b/sycl/test-e2e/Regression/multiple-targets.cpp @@ -3,6 +3,7 @@ // The test is repeated for per_kernel device code splitting. // // REQUIRES: cuda || hip || native_cpu +// REQUIRES: unsplit-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..27a42e0778b30 100644 --- a/sycl/test-e2e/SpecConstants/2020/non_native/cuda.cpp +++ b/sycl/test-e2e/SpecConstants/2020/non_native/cuda.cpp @@ -1,4 +1,5 @@ // REQUIRES: cuda +// REQUIRES: unsplit-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 index 71f9253b239a2..c481472b40d1c 100644 --- a/sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp +++ b/sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp @@ -1,5 +1,6 @@ // REQUIRES: cuda,aspect-ext_oneapi_cubemap // REQUIRES: aspect-ext_oneapi_cubemap_seamless_filtering +// REQUIRES: unsplit-mode // RUN: %{build} -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled.cpp b/sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled.cpp index 3f4e6e433643f..341bf704fcc34 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,6 @@ // REQUIRES: aspect-ext_oneapi_bindless_images // REQUIRES: windows +// REQUIRES: unsplit-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 index b84e86bb86cf9..35e16b905efce 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,5 @@ // REQUIRES: cuda +// REQUIRES: unsplit-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 index 1e826270f827c..042f1f0267611 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/mipmaps.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/mipmaps.cpp @@ -1,5 +1,6 @@ // REQUIRES: cuda // REQUIRES: vulkan +// REQUIRES: unsplit-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..7ff31b873ef24 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,6 @@ // REQUIRES: cuda || (windows && level_zero && aspect-ext_oneapi_bindless_images) // REQUIRES: vulkan +// REQUIRES: unsplit-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..378bd960806e5 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,6 @@ // REQUIRES: cuda // REQUIRES: vulkan +// REQUIRES: unsplit-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..61256fb9cd407 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,6 @@ // REQUIRES: cuda || (windows && level_zero && aspect-ext_oneapi_bindless_images) // REQUIRES: vulkan +// REQUIRES: unsplit-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..75fdd7d05a8da 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,6 @@ // REQUIRES: cuda // REQUIRES: vulkan +// REQUIRES: unsplit-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..496c2c985ee76 100644 --- a/sycl/test-e2e/syclcompat/kernel/kernel_win.cpp +++ b/sycl/test-e2e/syclcompat/kernel/kernel_win.cpp @@ -1,4 +1,5 @@ // REQUIRES: windows +// REQUIRES: unsplit-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..d24464f2bf986 100644 --- a/sycl/test-e2e/syclcompat/launch/launch_properties.cpp +++ b/sycl/test-e2e/syclcompat/launch/launch_properties.cpp @@ -23,6 +23,7 @@ **************************************************************************/ // REQUIRES: aspect-ext_oneapi_cuda_cluster_group +// REQUIRES: unsplit-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..51673bd1843b1 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,5 @@ // REQUIRES: cuda +// REQUIRES: unsplit-mode // RUN: %{build} -Xsycl-target-backend --cuda-gpu-arch=sm_75 -o %t.out // RUN: %{run} %t.out #include From be6805fe29f05abfbda12e0d1b561e6b27162e1e Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Thu, 7 Nov 2024 10:55:43 -0800 Subject: [PATCH 03/18] Add `XFAIL: run-mode` to xfail tests that are able to build --- sycl/test-e2e/Basic/fpga_tests/fpga_pipes_mixed_usage.cpp | 2 +- .../device_architecture_comparison_on_device_aot.cpp | 2 +- sycl/test-e2e/ESIMD/assert.cpp | 2 +- sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp | 2 +- .../InvokeSimd/Feature/ImplicitSubgroup/invoke_simd_struct.cpp | 2 +- sycl/test-e2e/InvokeSimd/Feature/invoke_simd_struct.cpp | 2 +- sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp | 2 +- .../SPVCooperativeMatrix/SG32/joint_matrix_colA_rowB_colC.cpp | 2 +- .../Matrix/SPVCooperativeMatrix/joint_matrix_colA_rowB_colC.cpp | 2 +- sycl/test-e2e/Matrix/joint_matrix_colA_rowB_colC.cpp | 2 +- sycl/test-e2e/Plugin/level_zero_sub_sub_device.cpp | 2 +- .../multiple-translation-units/separate-call.cpp | 2 +- .../multiple-translation-units/separate-vf-defs-and-call.cpp | 2 +- .../multiple-translation-units/separate-vf-defs.cpp | 2 +- sycl/test-e2e/bindless_images/mipmap/mipmap_read_3D.cpp | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sycl/test-e2e/Basic/fpga_tests/fpga_pipes_mixed_usage.cpp b/sycl/test-e2e/Basic/fpga_tests/fpga_pipes_mixed_usage.cpp index a9817fab44397..4986826b27529 100644 --- a/sycl/test-e2e/Basic/fpga_tests/fpga_pipes_mixed_usage.cpp +++ b/sycl/test-e2e/Basic/fpga_tests/fpga_pipes_mixed_usage.cpp @@ -9,7 +9,7 @@ // RUN: %{build} -o %t.out // RUN: %{run} %t.out -// XFAIL: * +// XFAIL: run-mode // XFAIL-TRACKER: https://github.com/intel/llvm/issues/13887 // If users need to use host pipe feature provided by experimental::pipe, all // pipes in their design should use the experimental::pipe (as a workround). 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/ESIMD/assert.cpp b/sycl/test-e2e/ESIMD/assert.cpp index 693694c21a007..78d8d9bca986a 100644 --- a/sycl/test-e2e/ESIMD/assert.cpp +++ b/sycl/test-e2e/ESIMD/assert.cpp @@ -6,7 +6,7 @@ // // The test still fails after GPU driver update on Linux. Temporary marking it // as expected to fail, whilst it is being investigated, see intel/llvm#11359 -// XFAIL: linux +// XFAIL: linux && run-mode // XFAIL-TRACKER: https://github.com/intel/llvm/issues/11359 // // Hanging on gen12, remove when internal tracker fixed diff --git a/sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp b/sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp index c894a2d42ace4..1e0140611389f 100644 --- a/sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp +++ b/sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp @@ -6,7 +6,7 @@ // RUN: %{run} %t.out // The test is failing when writing directly to output buffer. // If temporary variable is used (see TO_PASS mode) the test succeeded. -// XFAIL: gpu +// XFAIL: gpu && run-mode #include "include/asmhelper.h" #include #include diff --git a/sycl/test-e2e/InvokeSimd/Feature/ImplicitSubgroup/invoke_simd_struct.cpp b/sycl/test-e2e/InvokeSimd/Feature/ImplicitSubgroup/invoke_simd_struct.cpp index 43a776fcee3c8..74b82dfc85ddc 100644 --- a/sycl/test-e2e/InvokeSimd/Feature/ImplicitSubgroup/invoke_simd_struct.cpp +++ b/sycl/test-e2e/InvokeSimd/Feature/ImplicitSubgroup/invoke_simd_struct.cpp @@ -1,6 +1,6 @@ // TODO: Passing/returning structures via invoke_simd() API is not implemented // in GPU driver yet. Enable the test when GPU RT supports it. -// XFAIL: gpu +// XFAIL: gpu && run-mode // // RUN: %{build} -DIMPL_SUBGROUP -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr -o %t.out // RUN: env IGC_VCSaveStackCallLinkage=1 IGC_VCDirectCallsOnly=1 %{run} %t.out diff --git a/sycl/test-e2e/InvokeSimd/Feature/invoke_simd_struct.cpp b/sycl/test-e2e/InvokeSimd/Feature/invoke_simd_struct.cpp index 75bd87d74d0f3..014027460301c 100644 --- a/sycl/test-e2e/InvokeSimd/Feature/invoke_simd_struct.cpp +++ b/sycl/test-e2e/InvokeSimd/Feature/invoke_simd_struct.cpp @@ -1,6 +1,6 @@ // TODO: Passing/returning structures via invoke_simd() API is not implemented // in GPU driver yet. Enable the test when GPU RT supports it. -// XFAIL: gpu +// XFAIL: gpu, run-mode // // RUN: %{build} -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr -o %t.out // RUN: env IGC_VCSaveStackCallLinkage=1 IGC_VCDirectCallsOnly=1 %{run} %t.out diff --git a/sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp b/sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp index a10810bf4549c..0c3b778457036 100644 --- a/sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp +++ b/sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp @@ -11,7 +11,7 @@ // RUN: %{build} -o %t.out // RUN: %{run} %t.out -// XFAIL:* +// XFAIL: run-mode #include "../common.hpp" diff --git a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/joint_matrix_colA_rowB_colC.cpp b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/joint_matrix_colA_rowB_colC.cpp index 3ce16e94a40ba..c074a958111cd 100644 --- a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/joint_matrix_colA_rowB_colC.cpp +++ b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/joint_matrix_colA_rowB_colC.cpp @@ -11,7 +11,7 @@ // RUN: %{build} -D__SPIRV_USE_COOPERATIVE_MATRIX -o %t.out // RUN: %{run} %t.out -// XFAIL:* +// XFAIL: run-mode #include "../../common.hpp" diff --git a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_colA_rowB_colC.cpp b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_colA_rowB_colC.cpp index 083b7cbed8ef7..db9da532d6539 100644 --- a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_colA_rowB_colC.cpp +++ b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_colA_rowB_colC.cpp @@ -10,7 +10,7 @@ // RUN: %{build} -D__SPIRV_USE_COOPERATIVE_MATRIX -o %t.out // RUN: %{run} %t.out -// XFAIL:* +// XFAIL: run-mode #include "../common.hpp" diff --git a/sycl/test-e2e/Matrix/joint_matrix_colA_rowB_colC.cpp b/sycl/test-e2e/Matrix/joint_matrix_colA_rowB_colC.cpp index 71e3cb6501bb6..338564207c4ac 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_colA_rowB_colC.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_colA_rowB_colC.cpp @@ -10,7 +10,7 @@ // RUN: %{build} -o %t.out // RUN: %{run} %t.out -// XFAIL:* +// XFAIL: run-mode #include "common.hpp" 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..f7bd7b4cad233 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 diff --git a/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-call.cpp b/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-call.cpp index 8edb62e93d9b0..96ebac1c494e3 100644 --- a/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-call.cpp +++ b/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-call.cpp @@ -3,7 +3,7 @@ // VTables are global variables with possibly external linkage and that causes // them to be copied into every module we produce during device code split // which in turn leads to multiple definitions error at runtime. -// XFAIL: * +// XFAIL: run-mode // XFAIL-TRACKER: https://github.com/intel/llvm/issues/15069 // // This test covers a scenario where virtual functions defintion and their uses diff --git a/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-vf-defs-and-call.cpp b/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-vf-defs-and-call.cpp index 31c3adaf6a406..a0815f1bcaed2 100644 --- a/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-vf-defs-and-call.cpp +++ b/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-vf-defs-and-call.cpp @@ -5,7 +5,7 @@ // function definitions and therefore we won't mark construct kernel as using // virtual functions and link operation at runtime will fail due to undefined // references to virtual functions from vtable. -// XFAIL: * +// XFAIL: run-mode // XFAIL-TRACKER: https://github.com/intel/llvm/issues/15071 // // This test covers a scenario where virtual functions defintion and their uses diff --git a/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-vf-defs.cpp b/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-vf-defs.cpp index a682e2a7f15d9..ba0f2d25c9dde 100644 --- a/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-vf-defs.cpp +++ b/sycl/test-e2e/VirtualFunctions/multiple-translation-units/separate-vf-defs.cpp @@ -5,7 +5,7 @@ // function definitions and therefore we won't mark construct kernel as using // virtual functions and link operation at runtime will fail due to undefined // references to virtual functions from vtable. -// XFAIL: * +// XFAIL: run-mode // XFAIL-TRACKER: https://github.com/intel/llvm/issues/15071 // // This test covers a scenario where virtual functions defintion and their uses 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 e269eab7d8453..2369fa1f58aea 100644 --- a/sycl/test-e2e/bindless_images/mipmap/mipmap_read_3D.cpp +++ b/sycl/test-e2e/bindless_images/mipmap/mipmap_read_3D.cpp @@ -1,5 +1,5 @@ // REQUIRES: cuda -// XFAIL: * +// XFAIL: run-mode // XFAIL-TRACKER: https://github.com/intel/llvm/issues/15727 // RUN: %{build} -o %t.out // RUN: %{run-unfiltered-devices} %t.out From 10d2c4c03a2dc78be474b72afe4b544907d2ae4d Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Thu, 7 Nov 2024 10:56:30 -0800 Subject: [PATCH 04/18] Add `XFAIL: *` to tests that fail building but are marked as XFAIL in different ways --- sycl/test-e2e/InvokeSimd/Spec/ImplicitSubgroup/tuple.cpp | 2 +- sycl/test-e2e/InvokeSimd/Spec/ImplicitSubgroup/tuple_return.cpp | 2 +- sycl/test-e2e/InvokeSimd/Spec/ImplicitSubgroup/tuple_vadd.cpp | 2 +- sycl/test-e2e/InvokeSimd/Spec/tuple.cpp | 2 +- sycl/test-e2e/InvokeSimd/Spec/tuple_return.cpp | 2 +- sycl/test-e2e/InvokeSimd/Spec/tuple_vadd.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sycl/test-e2e/InvokeSimd/Spec/ImplicitSubgroup/tuple.cpp b/sycl/test-e2e/InvokeSimd/Spec/ImplicitSubgroup/tuple.cpp index c016ba2269ccb..34fe12ebb70e9 100644 --- a/sycl/test-e2e/InvokeSimd/Spec/ImplicitSubgroup/tuple.cpp +++ b/sycl/test-e2e/InvokeSimd/Spec/ImplicitSubgroup/tuple.cpp @@ -1,5 +1,5 @@ // TODO: enable when Jira ticket resolved -// XFAIL: gpu +// XFAIL: * // // Check that full compilation works: // RUN: %clangxx -DIMPL_SUBGROUP -fsycl -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr %S/../tuple.cpp -o %t.out diff --git a/sycl/test-e2e/InvokeSimd/Spec/ImplicitSubgroup/tuple_return.cpp b/sycl/test-e2e/InvokeSimd/Spec/ImplicitSubgroup/tuple_return.cpp index 3894e55f2efff..90c3468b4151f 100644 --- a/sycl/test-e2e/InvokeSimd/Spec/ImplicitSubgroup/tuple_return.cpp +++ b/sycl/test-e2e/InvokeSimd/Spec/ImplicitSubgroup/tuple_return.cpp @@ -1,5 +1,5 @@ // TODO: enable when Jira ticket resolved -// XFAIL: gpu +// XFAIL: * // // Check that full compilation works: // RUN: %clangxx -DIMPL_SUBGROUP -fsycl -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr %S/../tuple_return.cpp -o %t.out diff --git a/sycl/test-e2e/InvokeSimd/Spec/ImplicitSubgroup/tuple_vadd.cpp b/sycl/test-e2e/InvokeSimd/Spec/ImplicitSubgroup/tuple_vadd.cpp index 792a9aad10288..7d2bed1426cd8 100644 --- a/sycl/test-e2e/InvokeSimd/Spec/ImplicitSubgroup/tuple_vadd.cpp +++ b/sycl/test-e2e/InvokeSimd/Spec/ImplicitSubgroup/tuple_vadd.cpp @@ -1,5 +1,5 @@ // TODO: enable when Jira ticket resolved -// XFAIL: gpu +// XFAIL: * // // Check that full compilation works: // RUN: %clangxx -DIMPL_SUBGROUP -fsycl -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr %S/../tuple_vadd.cpp -o %t.out diff --git a/sycl/test-e2e/InvokeSimd/Spec/tuple.cpp b/sycl/test-e2e/InvokeSimd/Spec/tuple.cpp index fd835a147c6f1..6c9d869b3684a 100644 --- a/sycl/test-e2e/InvokeSimd/Spec/tuple.cpp +++ b/sycl/test-e2e/InvokeSimd/Spec/tuple.cpp @@ -1,5 +1,5 @@ // TODO: enable when Jira ticket resolved -// XFAIL: gpu +// XFAIL: * // // 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/InvokeSimd/Spec/tuple_return.cpp b/sycl/test-e2e/InvokeSimd/Spec/tuple_return.cpp index 14be37cf1c435..bdc5fe9a7e19b 100644 --- a/sycl/test-e2e/InvokeSimd/Spec/tuple_return.cpp +++ b/sycl/test-e2e/InvokeSimd/Spec/tuple_return.cpp @@ -1,5 +1,5 @@ // TODO: enable when Jira ticket resolved -// XFAIL: gpu +// XFAIL: * // // 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/InvokeSimd/Spec/tuple_vadd.cpp b/sycl/test-e2e/InvokeSimd/Spec/tuple_vadd.cpp index 5663aec9ff23c..38f654ea769b3 100644 --- a/sycl/test-e2e/InvokeSimd/Spec/tuple_vadd.cpp +++ b/sycl/test-e2e/InvokeSimd/Spec/tuple_vadd.cpp @@ -1,5 +1,5 @@ // TODO: enable when Jira ticket resolved -// XFAIL: gpu +// XFAIL: * // // Check that full compilation works: // RUN: %{build} -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr -o %t.out From 4eb0d315b5bd3e5725c85620e608ac9f477ffbdd Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Thu, 7 Nov 2024 10:57:40 -0800 Subject: [PATCH 05/18] Add `%if run-mode` to lines that should not run in build-mode --- sycl/test-e2e/Config/config.cpp | 10 +++++----- sycl/test-e2e/ESIMD/PerformanceTests/BitonicSortK.cpp | 4 ++-- .../test-e2e/ESIMD/PerformanceTests/BitonicSortKv2.cpp | 4 ++-- sycl/test-e2e/ESIMD/PerformanceTests/Stencil.cpp | 6 +++--- .../ESIMD/PerformanceTests/invoke_simd_smoke.cpp | 6 +++--- .../ESIMD/PerformanceTests/matrix_transpose.cpp | 4 ++-- sycl/test-e2e/ESIMD/PerformanceTests/stencil2.cpp | 6 +++--- sycl/test-e2e/ESIMD/preemption.cpp | 2 +- .../KernelAndProgram/trace_kernel_program_cache.cpp | 6 +++--- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/sycl/test-e2e/Config/config.cpp b/sycl/test-e2e/Config/config.cpp index d446f10519c79..5f82d3fa28111 100644 --- a/sycl/test-e2e/Config/config.cpp +++ b/sycl/test-e2e/Config/config.cpp @@ -8,13 +8,13 @@ // RUN: %{build} %debug_option %O0 -o %t.out // RUN: echo SYCL_PRINT_EXECUTION_GRAPH=always > %t.cfg // RUN: %{run-unfiltered-devices} env SYCL_CONFIG_FILE_NAME=%t.cfg %t.out -// RUN: cat *.dot > /dev/null -// RUN: rm *.dot +// RUN: %if run-mode %{cat *.dot > /dev/null%} +// RUN: %if run-mode %{rm *.dot%} // RUN: %{run-unfiltered-devices} env SYCL_PRINT_EXECUTION_GRAPH=always %t.out -// RUN: cat *.dot > /dev/null -// RUN: rm *.dot +// RUN: %if run-mode %{cat *.dot > /dev/null%} +// RUN: %if run-mode %{rm *.dot%} // RUN: %{run-unfiltered-devices} %t.out -// RUN: not cat *.dot > /dev/null +// RUN: %if run-mode %{not cat *.dot > /dev/null%} #include diff --git a/sycl/test-e2e/ESIMD/PerformanceTests/BitonicSortK.cpp b/sycl/test-e2e/ESIMD/PerformanceTests/BitonicSortK.cpp index 2fbcd9b5393ae..91d3449d1e74f 100644 --- a/sycl/test-e2e/ESIMD/PerformanceTests/BitonicSortK.cpp +++ b/sycl/test-e2e/ESIMD/PerformanceTests/BitonicSortK.cpp @@ -10,7 +10,7 @@ // RUN: mkdir -p %t.dir && %{build} -o %t.dir/exec.out // RUN: env IGC_DumpToCustomDir=%t.dir IGC_ShaderDumpEnable=1 %{run} %t.dir/exec.out -// RUN: python3 %S/instruction_count.py %t.dir 2914 ZTSZZN11BitonicSort5SolveEPjS0_jENKUlRN4sycl3_V17handlerEE0_clES4_E5Merge.asm -// RUN: echo "Baseline from driver version 1.3.30872" +// RUN: %if run-mode %{python3 %S/instruction_count.py %t.dir 2914 ZTSZZN11BitonicSort5SolveEPjS0_jENKUlRN4sycl3_V17handlerEE0_clES4_E5Merge.asm%} +// RUN: %if run-mode %{echo "Baseline from driver version 1.3.30872"%} #include "../BitonicSortK.cpp" diff --git a/sycl/test-e2e/ESIMD/PerformanceTests/BitonicSortKv2.cpp b/sycl/test-e2e/ESIMD/PerformanceTests/BitonicSortKv2.cpp index cc734ca2710e7..cbb609681a85a 100644 --- a/sycl/test-e2e/ESIMD/PerformanceTests/BitonicSortKv2.cpp +++ b/sycl/test-e2e/ESIMD/PerformanceTests/BitonicSortKv2.cpp @@ -10,7 +10,7 @@ // RUN: mkdir -p %t.dir && %{build} -o %t.dir/exec.out // RUN: env IGC_DumpToCustomDir=%t.dir IGC_ShaderDumpEnable=1 %{run} %t.dir/exec.out -// RUN: python3 %S/instruction_count.py %t.dir 2969 ZTSZZN11BitonicSort5SolveEPjS0_jENKUlRN4sycl3_V17handlerEE0_clES4_E5Merge.asm -// RUN: echo "Baseline from driver version 1.3.30872" +// RUN: %if run-mode %{python3 %S/instruction_count.py %t.dir 2969 ZTSZZN11BitonicSort5SolveEPjS0_jENKUlRN4sycl3_V17handlerEE0_clES4_E5Merge.asm%} +// RUN: %if run-mode %{echo "Baseline from driver version 1.3.30872"%} #include "../BitonicSortKv2.cpp" diff --git a/sycl/test-e2e/ESIMD/PerformanceTests/Stencil.cpp b/sycl/test-e2e/ESIMD/PerformanceTests/Stencil.cpp index 18198c14cc71c..42d906545207c 100644 --- a/sycl/test-e2e/ESIMD/PerformanceTests/Stencil.cpp +++ b/sycl/test-e2e/ESIMD/PerformanceTests/Stencil.cpp @@ -10,7 +10,7 @@ // RUN: mkdir -p %t.dir && %{build} -o %t.dir/exec.out // RUN: env IGC_DumpToCustomDir=%t.dir IGC_ShaderDumpEnable=1 %{run} %t.dir/exec.out -// RUN: python3 %S/instruction_count.py %t.dir 1699 ZTSZZ4mainENKUlRN4sycl3_V17handlerEE_clES2_E14Stencil_kernel.asm -// RUN: echo "Baseline from driver version 1.3.29138" +// RUN: %if run-mode %{python3 %S/instruction_count.py %t.dir 1699 ZTSZZ4mainENKUlRN4sycl3_V17handlerEE_clES2_E14Stencil_kernel.asm%} +// RUN: %if run-mode %{echo "Baseline from driver version 1.3.29138"%} -#include "../Stencil.cpp" \ No newline at end of file +#include "../Stencil.cpp" diff --git a/sycl/test-e2e/ESIMD/PerformanceTests/invoke_simd_smoke.cpp b/sycl/test-e2e/ESIMD/PerformanceTests/invoke_simd_smoke.cpp index 4ce76629d9d0d..97c2bf718a1cc 100644 --- a/sycl/test-e2e/ESIMD/PerformanceTests/invoke_simd_smoke.cpp +++ b/sycl/test-e2e/ESIMD/PerformanceTests/invoke_simd_smoke.cpp @@ -10,7 +10,7 @@ // RUN: mkdir -p %t.dir && %{build} -fsycl -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr -o %t.dir/exec.out // RUN: env IGC_VCSaveStackCallLinkage=1 IGC_VCDirectCallsOnly=1 IGC_DumpToCustomDir=%t.dir IGC_ShaderDumpEnable=1 %{run} %t.dir/exec.out -// RUN: python3 %S/instruction_count.py %t.dir 149 _simd16_entry_0001.asm -// RUN: echo "Baseline from driver version 1.3.29735" +// RUN: %if run-mode %{python3 %S/instruction_count.py %t.dir 149 _simd16_entry_0001.asm%} +// RUN: %if run-mode %{echo "Baseline from driver version 1.3.29735"%} -#include "../../InvokeSimd/invoke_simd_smoke.cpp" \ No newline at end of file +#include "../../InvokeSimd/invoke_simd_smoke.cpp" diff --git a/sycl/test-e2e/ESIMD/PerformanceTests/matrix_transpose.cpp b/sycl/test-e2e/ESIMD/PerformanceTests/matrix_transpose.cpp index 2d44ffe3746fe..3b5db73fb611c 100644 --- a/sycl/test-e2e/ESIMD/PerformanceTests/matrix_transpose.cpp +++ b/sycl/test-e2e/ESIMD/PerformanceTests/matrix_transpose.cpp @@ -10,7 +10,7 @@ // RUN: mkdir -p %t.dir && %{build} -o %t.dir/exec.out // RUN: env IGC_DumpToCustomDir=%t.dir IGC_ShaderDumpEnable=1 %{run} %t.dir/exec.out -// RUN: python3 %S/instruction_count.py %t.dir %if igc-dev %{ 1059 %} %else %{ 1116 %} ZTSZZ7runTestjjjRdS_ENKUlRN4sycl3_V17handlerEE_clES3_E3K16.asm -// RUN: echo "Baseline from driver version 1.3.30872" +// RUN: %if run-mode %{python3 %S/instruction_count.py %t.dir %if igc-dev %{ 1059 %} %else %{ 1116 %} ZTSZZ7runTestjjjRdS_ENKUlRN4sycl3_V17handlerEE_clES3_E3K16.asm%} +// RUN: %if run-mode %{echo "Baseline from driver version 1.3.30872"%} #include "../matrix_transpose.cpp" diff --git a/sycl/test-e2e/ESIMD/PerformanceTests/stencil2.cpp b/sycl/test-e2e/ESIMD/PerformanceTests/stencil2.cpp index 8857d286eee42..e306889c9c4b6 100644 --- a/sycl/test-e2e/ESIMD/PerformanceTests/stencil2.cpp +++ b/sycl/test-e2e/ESIMD/PerformanceTests/stencil2.cpp @@ -10,7 +10,7 @@ // RUN: mkdir -p %t.dir && %{build} -o %t.dir/exec.out // RUN: env IGC_DumpToCustomDir=%t.dir IGC_ShaderDumpEnable=1 %{run} %t.dir/exec.out -// RUN: python3 %S/instruction_count.py %t.dir 1699 ZTSZZ4mainENKUlRN4sycl3_V17handlerEE_clES2_E14Stencil_kernel.asm -// RUN: echo "Baseline from driver version 1.3.29138" +// RUN: %if run-mode %{python3 %S/instruction_count.py %t.dir 1699 ZTSZZ4mainENKUlRN4sycl3_V17handlerEE_clES2_E14Stencil_kernel.asm%} +// RUN: %if run-mode %{echo "Baseline from driver version 1.3.29138"%} -#include "../stencil2.cpp" \ No newline at end of file +#include "../stencil2.cpp" diff --git a/sycl/test-e2e/ESIMD/preemption.cpp b/sycl/test-e2e/ESIMD/preemption.cpp index 4e6a27f5d5d29..30c11306c08ca 100644 --- a/sycl/test-e2e/ESIMD/preemption.cpp +++ b/sycl/test-e2e/ESIMD/preemption.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: gpu-intel-dg2 || arch-intel_gpu_pvc // RUN: %{build} -o %t.out // RUN: env IGC_DumpToCustomDir=%t.dump IGC_ShaderDumpEnable=1 %{run} %t.out -// RUN: grep enablePreemption %t.dump/*.asm +// RUN: %if run-mode %{grep enablePreemption %t.dump/*.asm%} // The test expects to see "enablePreemption" switch in the compilation // switches. It fails if does not find it. diff --git a/sycl/test-e2e/KernelAndProgram/trace_kernel_program_cache.cpp b/sycl/test-e2e/KernelAndProgram/trace_kernel_program_cache.cpp index 447ec12200ade..f9db1b97440a4 100644 --- a/sycl/test-e2e/KernelAndProgram/trace_kernel_program_cache.cpp +++ b/sycl/test-e2e/KernelAndProgram/trace_kernel_program_cache.cpp @@ -6,12 +6,12 @@ // or SYCL_CACHE_TRACE is set to 0. // RUN: env SYCL_CACHE_IN_MEM=0 %{run} %t.out 2> %t.trace1 -// RUN: FileCheck --allow-empty --input-file=%t.trace1 --implicit-check-not "In-Memory Cache" %s +// RUN: %if run-mode %{ FileCheck --allow-empty --input-file=%t.trace1 --implicit-check-not "In-Memory Cache" %s %} // RUN: env SYCL_CACHE_TRACE=0 %{run} %t.out 2> %t.trace2 -// RUN: FileCheck --allow-empty --input-file=%t.trace2 --implicit-check-not "In-Memory Cache" %s +// RUN: %if run-mode %{ FileCheck --allow-empty --input-file=%t.trace2 --implicit-check-not "In-Memory Cache" %s %} // RUN: env SYCL_CACHE_TRACE=2 %{run} %t.out 2> %t.trace3 -// RUN: FileCheck %s --input-file=%t.trace3 --check-prefix=CHECK-CACHE-TRACE +// RUN: %if run-mode %{ FileCheck %s --input-file=%t.trace3 --check-prefix=CHECK-CACHE-TRACE %} #include From 0ed600835118dc4c7a941c07da3d2781a3587c22 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Thu, 7 Nov 2024 10:59:28 -0800 Subject: [PATCH 06/18] Add `%{run}` to tests that did not use it Added a run-line to one test as well --- .../bindless_images/examples/example_1_1D_read_write.cpp | 2 +- .../bindless_images/examples/example_2_2D_dynamic_read.cpp | 2 +- .../bindless_images/examples/example_4_1D_array_read_write.cpp | 2 +- .../examples/example_6_import_memory_and_semaphores.cpp | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sycl/test-e2e/bindless_images/examples/example_1_1D_read_write.cpp b/sycl/test-e2e/bindless_images/examples/example_1_1D_read_write.cpp index 15ef93a9deffc..cc7425a1e585c 100644 --- a/sycl/test-e2e/bindless_images/examples/example_1_1D_read_write.cpp +++ b/sycl/test-e2e/bindless_images/examples/example_1_1D_read_write.cpp @@ -1,7 +1,7 @@ // REQUIRES: cuda // RUN: %{build} -o %t.out -// RUN: %t.out +// RUN: %{run} %t.out #include #include diff --git a/sycl/test-e2e/bindless_images/examples/example_2_2D_dynamic_read.cpp b/sycl/test-e2e/bindless_images/examples/example_2_2D_dynamic_read.cpp index 035c5314d4585..f98c4c4fb073a 100644 --- a/sycl/test-e2e/bindless_images/examples/example_2_2D_dynamic_read.cpp +++ b/sycl/test-e2e/bindless_images/examples/example_2_2D_dynamic_read.cpp @@ -1,7 +1,7 @@ // REQUIRES: cuda // RUN: %{build} -o %t.out -// RUN: %t.out +// RUN: %{run} %t.out #include #include diff --git a/sycl/test-e2e/bindless_images/examples/example_4_1D_array_read_write.cpp b/sycl/test-e2e/bindless_images/examples/example_4_1D_array_read_write.cpp index 511c5a66e1828..69fb804f977c5 100644 --- a/sycl/test-e2e/bindless_images/examples/example_4_1D_array_read_write.cpp +++ b/sycl/test-e2e/bindless_images/examples/example_4_1D_array_read_write.cpp @@ -1,7 +1,7 @@ // REQUIRES: cuda // RUN: %{build} -o %t.out -// RUN: %t.out +// RUN: %{run} %t.out #include #include diff --git a/sycl/test-e2e/bindless_images/examples/example_6_import_memory_and_semaphores.cpp b/sycl/test-e2e/bindless_images/examples/example_6_import_memory_and_semaphores.cpp index d555b73d49aac..f78ae094e2117 100644 --- a/sycl/test-e2e/bindless_images/examples/example_6_import_memory_and_semaphores.cpp +++ b/sycl/test-e2e/bindless_images/examples/example_6_import_memory_and_semaphores.cpp @@ -1,6 +1,7 @@ // REQUIRES: cuda // RUN: %{build} -o %t.out +// RUN: %{run} %t.out #include #include From dd77b6d417c0b6370f32e2440d8773f01940d8ff Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Thu, 7 Nov 2024 11:59:35 -0800 Subject: [PATCH 07/18] Remove added RUN line from test --- .../examples/example_6_import_memory_and_semaphores.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/sycl/test-e2e/bindless_images/examples/example_6_import_memory_and_semaphores.cpp b/sycl/test-e2e/bindless_images/examples/example_6_import_memory_and_semaphores.cpp index f78ae094e2117..d555b73d49aac 100644 --- a/sycl/test-e2e/bindless_images/examples/example_6_import_memory_and_semaphores.cpp +++ b/sycl/test-e2e/bindless_images/examples/example_6_import_memory_and_semaphores.cpp @@ -1,7 +1,6 @@ // REQUIRES: cuda // RUN: %{build} -o %t.out -// RUN: %{run} %t.out #include #include From 29048dac0165b2facc8307e5c86cbccc66b99b26 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Tue, 12 Nov 2024 10:53:17 -0800 Subject: [PATCH 08/18] Change XFAIL for DeviceArchitecture test --- .../device_architecture_comparison_on_device_aot.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 488e9caa7e280..980761c5d8805 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, run-mode +// XFAIL: run-mode // XFAIL-TRACKER: https://github.com/intel/llvm/issues/14826 // RUN: %clangxx -fsycl -fsycl-targets=intel_gpu_pvc %s -o %t.out From b8e6cfcd73e7a032e907396f6b94f70de16929f9 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Tue, 12 Nov 2024 11:00:38 -0800 Subject: [PATCH 09/18] Replace `unsplit-mode` with `unsplit-test-mode` --- sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.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 +- .../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/KernelAndProgram/test_cache_jit_aot.cpp | 2 +- sycl/test-e2e/Matrix/joint_matrix_hip_gfx90a.cpp | 2 +- sycl/test-e2e/Matrix/joint_matrix_hip_half_gfx90a.cpp | 2 +- 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/bindless_images/cubemap/cubemap_sampled.cpp | 2 +- .../bindless_images/dx12_interop/read_write_unsampled.cpp | 2 +- .../bindless_images/examples/example_5_sample_cubemap.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/format.py | 2 +- sycl/test-e2e/lit.cfg.py | 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 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp b/sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp index c0f426ee7f079..5b7bd43941b1d 100644 --- 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-mode +// REQUIRES: unsplit-test-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 index f99800ed32dff..70e24eb78a832 100644 --- 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-mode +// REQUIRES: unsplit-test-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 index 2c640ccd417f4..b1aef5c82fb42 100644 --- 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-mode +// REQUIRES: unsplit-test-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 226a21f79ae3b..2c759de85c6cb 100644 --- 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-mode +// REQUIRES: unsplit-test-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 9423124ce58fe..87a45a3e66668 100644 --- 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-mode +// REQUIRES: unsplit-test-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 8188aa37dc97b..12474a1c32b96 100644 --- 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-mode +// REQUIRES: unsplit-test-mode #include diff --git a/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp b/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp index 0886d198036f6..02d2b5e398260 100644 --- 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-mode +// REQUIRES: unsplit-test-mode #include #include 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 961fb63702cad..aca4323801249 100644 --- 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-mode +// REQUIRES: unsplit-test-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 index a143575fd65f5..b813204b169db 100644 --- 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-mode +// REQUIRES: unsplit-test-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 f45bf0f73778a..e4cc7e55b3a4b 100644 --- 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-mode +// REQUIRES: unsplit-test-mode #include #include diff --git a/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp b/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp index c7abb1526b411..795ed8d7d2cc7 100644 --- 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-mode +// REQUIRES: unsplit-test-mode #include #include diff --git a/sycl/test-e2e/KernelAndProgram/test_cache_jit_aot.cpp b/sycl/test-e2e/KernelAndProgram/test_cache_jit_aot.cpp index 691a40c1e15f3..b7ffe44dfa27d 100644 --- 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-mode +// REQUIRES: unsplit-test-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 index 0001c703b545e..1bac1da4a11e0 100644 --- 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-mode +// REQUIRES: unsplit-test-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 a4f25c2571634..12953164dd4e4 100644 --- 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-mode +// REQUIRES: unsplit-test-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 4dd26f6299209..8e528d89cd56e 100644 --- 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-mode +// REQUIRES: unsplit-test-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 51c95d2c9a354..d442b38b20a91 100644 --- 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-mode +// REQUIRES: unsplit-test-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 8e020516056ae..6a7a8f15f216d 100644 --- 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-mode +// REQUIRES: unsplit-test-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 21f04fe2d2fa4..91069b78f00b8 100644 --- 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-mode +// REQUIRES: unsplit-test-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 fd4156cf77d0e..58bf29a06c03f 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,5 +1,5 @@ // REQUIRES: ocloc, level_zero, gpu, cpu -// REQUIRES: unsplit-mode +// REQUIRES: unsplit-test-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 237cfee60406f..08cce5bf72136 100644 --- 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-mode +// REQUIRES: unsplit-test-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 580cf52bb0ba7..04307120bb36c 100644 --- 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-mode +// REQUIRES: unsplit-test-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 51d935ce8d376..a80ed8095fcc9 100644 --- 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-mode +// REQUIRES: unsplit-test-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 37417a7a39aa9..70bb31e862075 100644 --- 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-mode +// REQUIRES: unsplit-test-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 147c6a6787399..88ee87849b8aa 100644 --- 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-mode +// REQUIRES: unsplit-test-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 606242d4b720f..40b210800260a 100644 --- 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-mode +// REQUIRES: unsplit-test-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 05dde0c107a0f..ad8a527c0a057 100644 --- 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-mode +// REQUIRES: unsplit-test-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 e025b30b0859c..6ef099e0bebe7 100644 --- 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-mode +// REQUIRES: unsplit-test-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 edecfa4c3e207..8ffcae81ca315 100644 --- 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-mode +// REQUIRES: unsplit-test-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 34d08c423f3a6..84933e54e7cef 100644 --- 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-mode +// REQUIRES: unsplit-test-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 27a42e0778b30..6f8877b44658a 100644 --- 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-mode +// REQUIRES: unsplit-test-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 index c481472b40d1c..83a4fa50c2a58 100644 --- 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-mode +// REQUIRES: unsplit-test-mode // RUN: %{build} -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled.cpp b/sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled.cpp index 341bf704fcc34..8a5b3db19ba99 100644 --- a/sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled.cpp +++ b/sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled.cpp @@ -1,6 +1,6 @@ // REQUIRES: aspect-ext_oneapi_bindless_images // REQUIRES: windows -// REQUIRES: unsplit-mode +// REQUIRES: unsplit-test-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 index 35e16b905efce..e781939755ca3 100644 --- a/sycl/test-e2e/bindless_images/examples/example_5_sample_cubemap.cpp +++ b/sycl/test-e2e/bindless_images/examples/example_5_sample_cubemap.cpp @@ -1,5 +1,5 @@ // REQUIRES: cuda -// REQUIRES: unsplit-mode +// REQUIRES: unsplit-test-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 index 042f1f0267611..be09b9f61309d 100644 --- 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-mode +// REQUIRES: unsplit-test-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 7ff31b873ef24..dd680844735e9 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images.cpp @@ -1,6 +1,6 @@ // REQUIRES: cuda || (windows && level_zero && aspect-ext_oneapi_bindless_images) // REQUIRES: vulkan -// REQUIRES: unsplit-mode +// REQUIRES: unsplit-test-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 378bd960806e5..c97db6868f2b2 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_USM.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_USM.cpp @@ -1,6 +1,6 @@ // REQUIRES: cuda // REQUIRES: vulkan -// REQUIRES: unsplit-mode +// REQUIRES: unsplit-test-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 61256fb9cd407..dde879116e09b 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp @@ -1,6 +1,6 @@ // REQUIRES: cuda || (windows && level_zero && aspect-ext_oneapi_bindless_images) // REQUIRES: vulkan -// REQUIRES: unsplit-mode +// REQUIRES: unsplit-test-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 75fdd7d05a8da..7d06b7037b891 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images_semaphore.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images_semaphore.cpp @@ -1,6 +1,6 @@ // REQUIRES: cuda // REQUIRES: vulkan -// REQUIRES: unsplit-mode +// REQUIRES: unsplit-test-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 index b4e9640111817..0b21e087b292f 100644 --- a/sycl/test-e2e/format.py +++ b/sycl/test-e2e/format.py @@ -157,7 +157,7 @@ def execute(self, test, litConfig): devices_for_test = [] triples = set() if "run-mode" not in test.config.available_features: - if "unsplit-mode" in test.requires or "TEMPORARY_DISABLED" in test.requires: + if "unsplit-test-mode" in test.requires or "TEMPORARY_DISABLED" in test.requires: return lit.Test.Result( lit.Test.UNSUPPORTED, "Test unsupported for this environment" ) diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index 629cbe8f5aa76..2e8146bf51a7b 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -47,7 +47,7 @@ case _: config.available_features.add("run-mode") config.available_features.add("build-mode") - config.available_features.add("unsplit-mode") + config.available_features.add("unsplit-test-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 index 496c2c985ee76..6ab453dc90abe 100644 --- 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-mode +// REQUIRES: unsplit-test-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 d24464f2bf986..1e8549ce10dbc 100644 --- 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-mode +// REQUIRES: unsplit-test-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 51673bd1843b1..c94266c1fa717 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,5 +1,5 @@ // REQUIRES: cuda -// REQUIRES: unsplit-mode +// REQUIRES: unsplit-test-mode // RUN: %{build} -Xsycl-target-backend --cuda-gpu-arch=sm_75 -o %t.out // RUN: %{run} %t.out #include From 0f19c31b32403f5e7b4854a70879c2b75b4f1441 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Wed, 13 Nov 2024 06:28:18 -0800 Subject: [PATCH 10/18] Add test.config.split_mode variable to clean up if statements --- sycl/test-e2e/format.py | 11 ++++------- sycl/test-e2e/lit.cfg.py | 5 +++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/sycl/test-e2e/format.py b/sycl/test-e2e/format.py index 0b21e087b292f..f8cbb538a6250 100644 --- a/sycl/test-e2e/format.py +++ b/sycl/test-e2e/format.py @@ -156,7 +156,7 @@ def execute(self, test, litConfig): devices_for_test = [] triples = set() - if "run-mode" not in test.config.available_features: + if test.config.split_mode == "build-only": if "unsplit-test-mode" in test.requires or "TEMPORARY_DISABLED" in test.requires: return lit.Test.Result( lit.Test.UNSUPPORTED, "Test unsupported for this environment" @@ -237,8 +237,8 @@ def get_extra_env(sycl_devices): for i in ["%{run}", "%{run-unfiltered-devices}", "%if run-mode"] ) - if (is_run_line and "run-mode" not in test.config.available_features) or ( - not is_run_line and "build-mode" not in test.config.available_features + if (is_run_line and test.config.split_mode == "build-only") or ( + not is_run_line and test.config.split_mode == "run-only" ): directive.command = "" @@ -297,10 +297,7 @@ def get_extra_env(sycl_devices): test, litConfig, useExternalSh, script, tmpBase ) - if ( - len(devices_for_test) > 1 - or "run-mode" not in test.config.available_features - ): + if (len(devices_for_test) > 1 or test.config.split_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 index 2e8146bf51a7b..8ce1f6daa8c26 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -40,13 +40,14 @@ # 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" config.available_features.add("run-mode") case "build": - config.available_features.add("build-mode") + config.split_mode="build-only" config.sycl_devices = [] case _: + config.split_mode="unsplit" config.available_features.add("run-mode") - config.available_features.add("build-mode") config.available_features.add("unsplit-test-mode") # Cleanup environment variables which may affect tests From 97369f784b140df2f2e9216f6057392efdf7fa76 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Wed, 13 Nov 2024 07:33:49 -0800 Subject: [PATCH 11/18] Fix formatting --- sycl/test-e2e/format.py | 7 +++++-- sycl/test-e2e/lit.cfg.py | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sycl/test-e2e/format.py b/sycl/test-e2e/format.py index f8cbb538a6250..ccf19d23ebc4a 100644 --- a/sycl/test-e2e/format.py +++ b/sycl/test-e2e/format.py @@ -157,7 +157,10 @@ def execute(self, test, litConfig): devices_for_test = [] triples = set() if test.config.split_mode == "build-only": - if "unsplit-test-mode" in test.requires or "TEMPORARY_DISABLED" in test.requires: + if ( + "unsplit-test-mode" in test.requires + or "TEMPORARY_DISABLED" in test.requires + ): return lit.Test.Result( lit.Test.UNSUPPORTED, "Test unsupported for this environment" ) @@ -297,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.split_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 index 8ce1f6daa8c26..605610da51eb9 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -40,13 +40,13 @@ # 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" + config.split_mode = "run-only" config.available_features.add("run-mode") case "build": - config.split_mode="build-only" + config.split_mode = "build-only" config.sycl_devices = [] case _: - config.split_mode="unsplit" + config.split_mode = "unsplit" config.available_features.add("run-mode") config.available_features.add("unsplit-test-mode") From 70c2555b6238592ef46335a16ce7c4748b419243 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Wed, 13 Nov 2024 11:34:47 -0800 Subject: [PATCH 12/18] Rename usages of "split" --- sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp | 2 +- .../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 +- .../EnqueueNativeCommand/custom-command-cuda.cpp | 2 +- .../EnqueueNativeCommand/custom-command-hip.cpp | 2 +- .../custom-command-multiple-dev-cuda.cpp | 2 +- .../interop-task-cuda-buffer-migrate.cpp | 2 +- .../test-e2e/HostInteropTask/interop-task-cuda.cpp | 2 +- sycl/test-e2e/HostInteropTask/interop-task-hip.cpp | 2 +- .../KernelAndProgram/test_cache_jit_aot.cpp | 2 +- sycl/test-e2e/Matrix/joint_matrix_hip_gfx90a.cpp | 2 +- .../Matrix/joint_matrix_hip_half_gfx90a.cpp | 2 +- .../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_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 +- .../Regression/compile_on_win_with_mdd.cpp | 2 +- .../Regression/fsycl-host-compiler-win.cpp | 2 +- sycl/test-e2e/Regression/msvc_crt.cpp | 2 +- sycl/test-e2e/Regression/multiple-targets.cpp | 2 +- .../SpecConstants/2020/non_native/cuda.cpp | 2 +- .../bindless_images/cubemap/cubemap_sampled.cpp | 2 +- .../dx12_interop/read_write_unsampled.cpp | 2 +- .../examples/example_5_sample_cubemap.cpp | 2 +- .../bindless_images/vulkan_interop/mipmaps.cpp | 2 +- .../vulkan_interop/sampled_images.cpp | 2 +- .../vulkan_interop/sampled_images_USM.cpp | 2 +- .../vulkan_interop/unsampled_images.cpp | 2 +- .../vulkan_interop/unsampled_images_semaphore.cpp | 2 +- sycl/test-e2e/format.py | 10 +++++----- sycl/test-e2e/lit.cfg.py | 14 +++++++------- sycl/test-e2e/syclcompat/kernel/kernel_win.cpp | 2 +- .../syclcompat/launch/launch_properties.cpp | 2 +- .../memory/local_memory_ptr_to_integer.cpp | 2 +- 43 files changed, 53 insertions(+), 53 deletions(-) diff --git a/sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp b/sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp index 5b7bd43941b1d..deb0f8f0a43e5 100644 --- 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 index 70e24eb78a832..40e87de4c994b 100644 --- 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 index b1aef5c82fb42..1383153d6b85e 100644 --- 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 index 2c759de85c6cb..e692307700339 100644 --- 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 index 87a45a3e66668..b019511817672 100644 --- 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 index 12474a1c32b96..470b45b837314 100644 --- 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 diff --git a/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp b/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp index 02d2b5e398260..96ebf4ef01b80 100644 --- 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 #include 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 aca4323801249..830df3671311d 100644 --- 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 index b813204b169db..624dd8ee22aa9 100644 --- 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 index e4cc7e55b3a4b..902b70b7a4130 100644 --- 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 #include diff --git a/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp b/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp index 795ed8d7d2cc7..e5d96e7f8acd2 100644 --- 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 #include diff --git a/sycl/test-e2e/KernelAndProgram/test_cache_jit_aot.cpp b/sycl/test-e2e/KernelAndProgram/test_cache_jit_aot.cpp index b7ffe44dfa27d..32c22e027476c 100644 --- 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 index 1bac1da4a11e0..7053606f46031 100644 --- 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 index 12953164dd4e4..51b670ce4e334 100644 --- 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 index 8e528d89cd56e..d95ddac41febb 100644 --- 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 index d442b38b20a91..f50eddddc2b0d 100644 --- 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 index 6a7a8f15f216d..af1d28ec80203 100644 --- 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 index 91069b78f00b8..3792671d6685f 100644 --- 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 index 58bf29a06c03f..b537a8355ce9b 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,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 index 08cce5bf72136..f6232d9634191 100644 --- 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 index 04307120bb36c..63579b8a0b5d6 100644 --- 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 index a80ed8095fcc9..9237c34f1bae2 100644 --- 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 index 70bb31e862075..7c39022152593 100644 --- 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 index 88ee87849b8aa..35a701e64eac9 100644 --- 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 index 40b210800260a..14dff94362586 100644 --- 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 index ad8a527c0a057..566b06416bdf5 100644 --- 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 index 6ef099e0bebe7..83e15fde8b849 100644 --- 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 index 8ffcae81ca315..8330175837289 100644 --- 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 index 84933e54e7cef..af1ae73ba2aa2 100644 --- 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 index 6f8877b44658a..75313fd1ab630 100644 --- 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 index 83a4fa50c2a58..27cddb84e8e42 100644 --- 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 index 8a5b3db19ba99..1393c201c564c 100644 --- a/sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled.cpp +++ b/sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled.cpp @@ -1,6 +1,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 index e781939755ca3..94163fc7b26a4 100644 --- a/sycl/test-e2e/bindless_images/examples/example_5_sample_cubemap.cpp +++ b/sycl/test-e2e/bindless_images/examples/example_5_sample_cubemap.cpp @@ -1,5 +1,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 index be09b9f61309d..fc8c79688e3da 100644 --- 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 index dd680844735e9..f23be73865387 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images.cpp @@ -1,6 +1,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 index c97db6868f2b2..3b2c8eec236e1 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_USM.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_USM.cpp @@ -1,6 +1,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 index dde879116e09b..33e047f8110f5 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp @@ -1,6 +1,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 index 7d06b7037b891..34ee0474a2bd3 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images_semaphore.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images_semaphore.cpp @@ -1,6 +1,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 index ccf19d23ebc4a..de691cb50710f 100644 --- 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 index 605610da51eb9..932f425fbfee3 100644 --- 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 index 6ab453dc90abe..fcdefca6f8d49 100644 --- 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 index 1e8549ce10dbc..af0f78e8bd3be 100644 --- 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 index c94266c1fa717..5728afa679284 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,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 From dfcbcd14bbd2e41949facb7aef671454cdb9dc81 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Thu, 14 Nov 2024 13:18:17 -0800 Subject: [PATCH 13/18] Detect `UNSUPPORTED: true` --- sycl/test-e2e/format.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test-e2e/format.py b/sycl/test-e2e/format.py index de691cb50710f..a3477cf96ce1d 100644 --- a/sycl/test-e2e/format.py +++ b/sycl/test-e2e/format.py @@ -159,7 +159,7 @@ def execute(self, test, litConfig): if test.config.test_mode == "build-only": if ( "run-and-build-mode" in test.requires - or "TEMPORARY_DISABLED" in test.requires + or "true" in test.unsupported ): return lit.Test.Result( lit.Test.UNSUPPORTED, "Test unsupported for this environment" From b40fcf3a9640685a5eeeb155b60f1edcb719b736 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Thu, 14 Nov 2024 13:25:41 -0800 Subject: [PATCH 14/18] Rename run-and-build to build-and-run Thats the order they happen in so i feel like it makes more sense --- sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.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 +- .../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/KernelAndProgram/test_cache_jit_aot.cpp | 2 +- sycl/test-e2e/Matrix/joint_matrix_hip_gfx90a.cpp | 2 +- sycl/test-e2e/Matrix/joint_matrix_hip_half_gfx90a.cpp | 2 +- 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/bindless_images/cubemap/cubemap_sampled.cpp | 2 +- .../bindless_images/dx12_interop/read_write_unsampled.cpp | 2 +- .../bindless_images/examples/example_5_sample_cubemap.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/format.py | 2 +- sycl/test-e2e/lit.cfg.py | 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 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp b/sycl/test-e2e/AmdNvidiaJIT/kernel_and_bundle.cpp index deb0f8f0a43e5..5c045601feb3a 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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/windows_version_agnostic_sycl_lib.cpp b/sycl/test-e2e/Basic/windows_version_agnostic_sycl_lib.cpp index 40e87de4c994b..c1f43fa724c34 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-run-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 index 1383153d6b85e..4532f22b9845b 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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 e692307700339..2641408261426 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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 b019511817672..645493c496ae1 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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 470b45b837314..b777f314d2f92 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-run-mode #include diff --git a/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp b/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp index 96ebf4ef01b80..f0184bd014d4d 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-run-mode #include #include 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 830df3671311d..f487b26026ec2 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-run-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 index 624dd8ee22aa9..2eea51a1ded9b 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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 902b70b7a4130..f3a61471d1d08 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-run-mode #include #include diff --git a/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp b/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp index e5d96e7f8acd2..86d8b860b0708 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-run-mode #include #include diff --git a/sycl/test-e2e/KernelAndProgram/test_cache_jit_aot.cpp b/sycl/test-e2e/KernelAndProgram/test_cache_jit_aot.cpp index 32c22e027476c..09399274e0472 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-run-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 index 7053606f46031..6caf58f127e13 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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 51b670ce4e334..f0f1916fb9629 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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 d95ddac41febb..dc084b7c23c0e 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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 f50eddddc2b0d..08f18f558723a 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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 af1d28ec80203..e1616ec80dec0 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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 3792671d6685f..20a5139fc12cd 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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 b537a8355ce9b..55b9f7037e4f2 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,5 +1,5 @@ // REQUIRES: ocloc, level_zero, gpu, cpu -// REQUIRES: run-and-build-mode +// REQUIRES: build-and-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 f6232d9634191..008637b91f3e2 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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 63579b8a0b5d6..e6e45f6dc4db5 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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 9237c34f1bae2..c81d1284a4fc4 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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 7c39022152593..64ca76b948c6d 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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 35a701e64eac9..9a0e2786c03f6 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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 14dff94362586..273d3f51ec328 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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 566b06416bdf5..ea1e1c7d49891 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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 83e15fde8b849..e4073831bb71b 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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 8330175837289..a54570efd820c 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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 af1ae73ba2aa2..8a8c893f45ff2 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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 75313fd1ab630..af12b66208dad 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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/bindless_images/cubemap/cubemap_sampled.cpp b/sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp index 27cddb84e8e42..d228b308ab72e 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-run-mode // RUN: %{build} -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled.cpp b/sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled.cpp index 1393c201c564c..39917004fc80f 100644 --- a/sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled.cpp +++ b/sycl/test-e2e/bindless_images/dx12_interop/read_write_unsampled.cpp @@ -1,6 +1,6 @@ // REQUIRES: aspect-ext_oneapi_bindless_images // REQUIRES: windows -// REQUIRES: run-and-build-mode +// REQUIRES: build-and-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/examples/example_5_sample_cubemap.cpp b/sycl/test-e2e/bindless_images/examples/example_5_sample_cubemap.cpp index 94163fc7b26a4..c6ba9b48fad52 100644 --- a/sycl/test-e2e/bindless_images/examples/example_5_sample_cubemap.cpp +++ b/sycl/test-e2e/bindless_images/examples/example_5_sample_cubemap.cpp @@ -1,5 +1,5 @@ // REQUIRES: cuda -// REQUIRES: run-and-build-mode +// REQUIRES: build-and-run-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 index fc8c79688e3da..57623c1b2da03 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-run-mode // RUN: %{build} %link-vulkan -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images.cpp b/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images.cpp index f23be73865387..f09b786e2ced2 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images.cpp @@ -1,6 +1,6 @@ // REQUIRES: cuda || (windows && level_zero && aspect-ext_oneapi_bindless_images) // REQUIRES: vulkan -// REQUIRES: run-and-build-mode +// REQUIRES: build-and-run-mode // RUN: %{build} %link-vulkan -o %t.out %if any-device-is-level_zero %{ -Wno-ignored-attributes -DENABLE_LINEAR_TILING -DTEST_L0_SUPPORTED_VK_FORMAT %} // RUN: %{run} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out diff --git a/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_USM.cpp b/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_USM.cpp index 3b2c8eec236e1..159b1c9ec1b44 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_USM.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/sampled_images_USM.cpp @@ -1,6 +1,6 @@ // REQUIRES: cuda // REQUIRES: vulkan -// REQUIRES: run-and-build-mode +// REQUIRES: build-and-run-mode // RUN: %{build} %link-vulkan -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp b/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp index 33e047f8110f5..1fdf317aed983 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images.cpp @@ -1,6 +1,6 @@ // REQUIRES: cuda || (windows && level_zero && aspect-ext_oneapi_bindless_images) // REQUIRES: vulkan -// REQUIRES: run-and-build-mode +// REQUIRES: build-and-run-mode // RUN: %{build} %link-vulkan -o %t.out %if any-device-is-level_zero %{ -Wno-ignored-attributes -DTEST_L0_SUPPORTED_VK_FORMAT %} // RUN: %{run} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out diff --git a/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images_semaphore.cpp b/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images_semaphore.cpp index 34ee0474a2bd3..af9163311727c 100644 --- a/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images_semaphore.cpp +++ b/sycl/test-e2e/bindless_images/vulkan_interop/unsampled_images_semaphore.cpp @@ -1,6 +1,6 @@ // REQUIRES: cuda // REQUIRES: vulkan -// REQUIRES: run-and-build-mode +// REQUIRES: build-and-run-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 index a3477cf96ce1d..04f6a52626753 100644 --- a/sycl/test-e2e/format.py +++ b/sycl/test-e2e/format.py @@ -158,7 +158,7 @@ def execute(self, test, litConfig): triples = set() if test.config.test_mode == "build-only": if ( - "run-and-build-mode" in test.requires + "build-and-run-mode" in test.requires or "true" in test.unsupported ): return lit.Test.Result( diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index 932f425fbfee3..8d33c5fe5d39e 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -48,7 +48,7 @@ case _: config.test_mode = "full" config.available_features.add("run-mode") - config.available_features.add("run-and-build-mode") + config.available_features.add("build-and-run-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 index fcdefca6f8d49..02ec26ab78a48 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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 af0f78e8bd3be..5d07ad256b328 100644 --- 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: run-and-build-mode +// REQUIRES: build-and-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 5728afa679284..edd9e63a3752a 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,5 +1,5 @@ // REQUIRES: cuda -// REQUIRES: run-and-build-mode +// REQUIRES: build-and-run-mode // RUN: %{build} -Xsycl-target-backend --cuda-gpu-arch=sm_75 -o %t.out // RUN: %{run} %t.out #include From 28118902e57e8a81993bc27f7a2fb0f81a33df8f Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Fri, 15 Nov 2024 05:56:51 -0800 Subject: [PATCH 15/18] Fix formatting --- sycl/test-e2e/format.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sycl/test-e2e/format.py b/sycl/test-e2e/format.py index 04f6a52626753..e6d0da2c39b7b 100644 --- a/sycl/test-e2e/format.py +++ b/sycl/test-e2e/format.py @@ -157,10 +157,7 @@ def execute(self, test, litConfig): devices_for_test = [] triples = set() if test.config.test_mode == "build-only": - if ( - "build-and-run-mode" in test.requires - or "true" in test.unsupported - ): + if "build-and-run-mode" in test.requires or "true" in test.unsupported: return lit.Test.Result( lit.Test.UNSUPPORTED, "Test unsupported for this environment" ) From 4bd48577f2b8f3853e3b710be47416aa453a2c84 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Fri, 15 Nov 2024 06:16:11 -0800 Subject: [PATCH 16/18] Add empty device_arch flag on build-only --- sycl/test-e2e/lit.cfg.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index 61d2cb0068be2..5a70284140375 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -45,6 +45,7 @@ case "build-only": config.test_mode = "build-only" config.sycl_devices = [] + arch_flag = "" case _: config.test_mode = "full" config.available_features.add("run-mode") From 1f393c0005d3fa574c876bd59b3c45cb3959ceb6 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Fri, 15 Nov 2024 08:29:10 -0800 Subject: [PATCH 17/18] Add run-line markers for KernelCompiler test --- .../KernelCompiler/kernel_compiler_sycl_jit.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sycl/test-e2e/KernelCompiler/kernel_compiler_sycl_jit.cpp b/sycl/test-e2e/KernelCompiler/kernel_compiler_sycl_jit.cpp index 01f25f813b826..cc12f20d8891f 100644 --- a/sycl/test-e2e/KernelCompiler/kernel_compiler_sycl_jit.cpp +++ b/sycl/test-e2e/KernelCompiler/kernel_compiler_sycl_jit.cpp @@ -16,14 +16,14 @@ // -- Test again, with caching. // DEFINE: %{cache_vars} = %{l0_leak_check} env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_TRACE=5 SYCL_CACHE_DIR=%t/cache_dir -// RUN: rm -rf %t/cache_dir -// RUN: %{cache_vars} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-WRITTEN-TO-CACHE -// RUN: %{cache_vars} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-READ-FROM-CACHE +// RUN: %if run-mode %{ rm -rf %t/cache_dir %} +// RUN: %{cache_vars} %{run-unfiltered-devices} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-WRITTEN-TO-CACHE +// RUN: %{cache_vars} %{run-unfiltered-devices} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-READ-FROM-CACHE // -- Add leak check. -// RUN: rm -rf %t/cache_dir -// RUN: %{l0_leak_check} %{cache_vars} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-WRITTEN-TO-CACHE -// RUN: %{l0_leak_check} %{cache_vars} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-READ-FROM-CACHE +// RUN: %if run-mode %{ rm -rf %t/cache_dir %} +// RUN: %{l0_leak_check} %{cache_vars} %{run-unfiltered-devices} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-WRITTEN-TO-CACHE +// RUN: %{l0_leak_check} %{cache_vars} %{run-unfiltered-devices} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-READ-FROM-CACHE // CHECK-WRITTEN-TO-CACHE: [Persistent Cache]: enabled // CHECK-WRITTEN-TO-CACHE-NOT: [kernel_compiler Persistent Cache]: using cached binary From 5fcb7712429acb61375f9d1295fafcecd80363e2 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Fri, 15 Nov 2024 11:35:52 -0800 Subject: [PATCH 18/18] Address reviewer comments --- sycl/test-e2e/lit.cfg.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index 5a70284140375..3884ab873d581 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -37,7 +37,7 @@ config.required_features = [] config.unsupported_features = [] -# split-mode: Set if tests should run normally or with split build/run +# test-mode: Set if tests should run normally or only build/run match lit_config.params.get("test-mode", "full"): case "run-only": config.test_mode = "run-only" @@ -46,10 +46,12 @@ config.test_mode = "build-only" config.sycl_devices = [] arch_flag = "" - case _: + case "full": config.test_mode = "full" config.available_features.add("run-mode") config.available_features.add("build-and-run-mode") + case _: + lit_config.error("Invalid argument for test-mode") # Cleanup environment variables which may affect tests possibly_dangerous_env_vars = [