diff --git a/sycl/test-e2e/Basic/access_to_subset.cpp b/sycl/test-e2e/Basic/access_to_subset.cpp index 231dfea4fad70..f2002df8116fe 100644 --- a/sycl/test-e2e/Basic/access_to_subset.cpp +++ b/sycl/test-e2e/Basic/access_to_subset.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==---------- access_to_subset.cpp --- access to subset of buffer test ----==// // diff --git a/sycl/test-e2e/Basic/accessor/accessor.cpp b/sycl/test-e2e/Basic/accessor/accessor.cpp index 87f4d9f2e13b8..dc1db1268b4c1 100644 --- a/sycl/test-e2e/Basic/accessor/accessor.cpp +++ b/sycl/test-e2e/Basic/accessor/accessor.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==----------------accessor.cpp - SYCL accessor basic test ----------------==// // diff --git a/sycl/test-e2e/Basic/accessor/device_accessor_deduction.cpp b/sycl/test-e2e/Basic/accessor/device_accessor_deduction.cpp index dd8cc836c3b46..e7e418b0c659c 100644 --- a/sycl/test-e2e/Basic/accessor/device_accessor_deduction.cpp +++ b/sycl/test-e2e/Basic/accessor/device_accessor_deduction.cpp @@ -1,4 +1,2 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -Daccessor_new_api_test %S/Inputs/device_accessor.cpp -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{run} %t.out diff --git a/sycl/test-e2e/Basic/accessor/get_device_access_deduction.cpp b/sycl/test-e2e/Basic/accessor/get_device_access_deduction.cpp index 6e3fe38f22731..29717b90afbde 100644 --- a/sycl/test-e2e/Basic/accessor/get_device_access_deduction.cpp +++ b/sycl/test-e2e/Basic/accessor/get_device_access_deduction.cpp @@ -1,4 +1,2 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -Dbuffer_new_api_test %S/Inputs/device_accessor.cpp -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{run} %t.out diff --git a/sycl/test-e2e/Basic/accessor/get_host_access_deduction.cpp b/sycl/test-e2e/Basic/accessor/get_host_access_deduction.cpp index 5767a3389ed57..f561e1ef63d7a 100644 --- a/sycl/test-e2e/Basic/accessor/get_host_access_deduction.cpp +++ b/sycl/test-e2e/Basic/accessor/get_host_access_deduction.cpp @@ -1,4 +1,2 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -Dbuffer_new_api_test %S/Inputs/host_accessor.cpp -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{run} %t.out diff --git a/sycl/test-e2e/Basic/accessor/get_host_task_access_deduction.cpp b/sycl/test-e2e/Basic/accessor/get_host_task_access_deduction.cpp index 129d173310d30..14e2db2b86347 100644 --- a/sycl/test-e2e/Basic/accessor/get_host_task_access_deduction.cpp +++ b/sycl/test-e2e/Basic/accessor/get_host_task_access_deduction.cpp @@ -1,4 +1,2 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -Dbuffer_new_api_test %S/Inputs/host_task_accessor.cpp -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{run} %t.out diff --git a/sycl/test-e2e/Basic/accessor/host_accessor_deduction.cpp b/sycl/test-e2e/Basic/accessor/host_accessor_deduction.cpp index 6b4b3d17a3c60..e4e6bea23807b 100644 --- a/sycl/test-e2e/Basic/accessor/host_accessor_deduction.cpp +++ b/sycl/test-e2e/Basic/accessor/host_accessor_deduction.cpp @@ -1,4 +1,2 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -Daccessor_new_api_test %S/Inputs/host_accessor.cpp -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{run} %t.out diff --git a/sycl/test-e2e/Basic/accessor/host_task_accessor_deduction.cpp b/sycl/test-e2e/Basic/accessor/host_task_accessor_deduction.cpp index d71b9adf987f5..5b5dacc7cb2f3 100644 --- a/sycl/test-e2e/Basic/accessor/host_task_accessor_deduction.cpp +++ b/sycl/test-e2e/Basic/accessor/host_task_accessor_deduction.cpp @@ -1,4 +1,2 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -Daccessor_new_api_test %S/Inputs/host_task_accessor.cpp -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{run} %t.out diff --git a/sycl/test-e2e/Basic/alloc_pinned_host_memory.cpp b/sycl/test-e2e/Basic/alloc_pinned_host_memory.cpp index 0d8a0267504c0..55e93545b85e8 100644 --- a/sycl/test-e2e/Basic/alloc_pinned_host_memory.cpp +++ b/sycl/test-e2e/Basic/alloc_pinned_host_memory.cpp @@ -1,10 +1,8 @@ // REQUIRES: level_zero || cuda -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t2.out +// RUN: %{build} -o %t2.out // RUN: env SYCL_PI_TRACE=2 ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t2.out 2>&1 %GPU_L0_CHECK_PLACEHOLDER -// RUN: %CPU_RUN_PLACEHOLDER %t2.out -// RUN: %GPU_RUN_PLACEHOLDER %t2.out -// RUN: %ACC_RUN_PLACEHOLDER %t2.out +// RUN: %{run} %t2.out #include diff --git a/sycl/test-e2e/Basic/aspects.cpp b/sycl/test-e2e/Basic/aspects.cpp index 31e806e630311..1e0d0cacb59bd 100644 --- a/sycl/test-e2e/Basic/aspects.cpp +++ b/sycl/test-e2e/Basic/aspects.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -fsycl %s -o %t.out +// RUN: %{build} -o %t.out // RUN: %BE_RUN_PLACEHOLDER %t.out // // Hip is missing some of the parameters tested here so it fails with NVIDIA diff --git a/sycl/test-e2e/Basic/barrier_order.cpp b/sycl/test-e2e/Basic/barrier_order.cpp index 1e4979ee49331..bd4fcd6581498 100644 --- a/sycl/test-e2e/Basic/barrier_order.cpp +++ b/sycl/test-e2e/Basic/barrier_order.cpp @@ -1,9 +1,9 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // Temporarily disabled on HIP, CUDA and L0 due to sporadic failures. // UNSUPPORTED: hip, level_zero, cuda +// UNSUPPORTED: accelerator #include #include diff --git a/sycl/test-e2e/Basic/bit_cast/bit_cast.cpp b/sycl/test-e2e/Basic/bit_cast/bit_cast.cpp index dfaf77ba1c88d..02967eb7966b1 100644 --- a/sycl/test-e2e/Basic/bit_cast/bit_cast.cpp +++ b/sycl/test-e2e/Basic/bit_cast/bit_cast.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl-device-code-split=per_kernel -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out +// RUN: %{run} %t.out #include diff --git a/sycl/test-e2e/Basic/boolean.cpp b/sycl/test-e2e/Basic/boolean.cpp index ac1c319275f4b..087b0733deaa0 100644 --- a/sycl/test-e2e/Basic/boolean.cpp +++ b/sycl/test-e2e/Basic/boolean.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out #include #include #include diff --git a/sycl/test-e2e/Basic/buffer/buffer.cpp b/sycl/test-e2e/Basic/buffer/buffer.cpp index 39fa00c0b7037..a4c8ce6472aa9 100644 --- a/sycl/test-e2e/Basic/buffer/buffer.cpp +++ b/sycl/test-e2e/Basic/buffer/buffer.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t2.out -// RUN: %CPU_RUN_PLACEHOLDER %t2.out -// RUN: %GPU_RUN_PLACEHOLDER %t2.out -// RUN: %ACC_RUN_PLACEHOLDER %t2.out +// RUN: %{build} -o %t2.out +// RUN: %{run} %t2.out //==------------------- buffer.cpp - SYCL buffer basic test ----------------==// // diff --git a/sycl/test-e2e/Basic/buffer/buffer_allocator.cpp b/sycl/test-e2e/Basic/buffer/buffer_allocator.cpp index 88815c22d071a..90784e72249bb 100644 --- a/sycl/test-e2e/Basic/buffer/buffer_allocator.cpp +++ b/sycl/test-e2e/Basic/buffer/buffer_allocator.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env ONEAPI_DEVICE_SELECTOR='opencl:*' %CPU_RUN_PLACEHOLDER %t.out -// RUN: env ONEAPI_DEVICE_SELECTOR='opencl:*' %GPU_RUN_PLACEHOLDER %t.out -// RUN: env ONEAPI_DEVICE_SELECTOR='opencl:*' %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==---------- buffer_allocator.cpp - SYCL buffer allocator tests ----------==// // diff --git a/sycl/test-e2e/Basic/buffer/buffer_container.cpp b/sycl/test-e2e/Basic/buffer/buffer_container.cpp index d39d619345b98..63395ad529169 100644 --- a/sycl/test-e2e/Basic/buffer/buffer_container.cpp +++ b/sycl/test-e2e/Basic/buffer/buffer_container.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx %cxx_std_optionc++17 -fsycl -fsycl-targets=%sycl_triple %s -o %t2.out -// RUN: %CPU_RUN_PLACEHOLDER %t2.out -// RUN: %GPU_RUN_PLACEHOLDER %t2.out -// RUN: %ACC_RUN_PLACEHOLDER %t2.out +// RUN: %{build} %cxx_std_optionc++17 -o %t2.out +// RUN: %{run} %t2.out #include diff --git a/sycl/test-e2e/Basic/buffer/buffer_create.cpp b/sycl/test-e2e/Basic/buffer/buffer_create.cpp index fa890aa78a815..fb39ba28fe925 100644 --- a/sycl/test-e2e/Basic/buffer/buffer_create.cpp +++ b/sycl/test-e2e/Basic/buffer/buffer_create.cpp @@ -1,6 +1,6 @@ // REQUIRES: gpu,level_zero -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out 2> %t1.out; cat %t1.out %GPU_CHECK_PLACEHOLDER +// RUN: %{build} -o %t.out +// RUN: env ZE_DEBUG=1 %{run} %t.out 2>&1 | FileCheck %s // UNSUPPORTED: ze_debug-1,ze_debug4 #include diff --git a/sycl/test-e2e/Basic/buffer/buffer_dev_to_dev.cpp b/sycl/test-e2e/Basic/buffer/buffer_dev_to_dev.cpp index aab4596dc771a..ef66cb97f3b65 100644 --- a/sycl/test-e2e/Basic/buffer/buffer_dev_to_dev.cpp +++ b/sycl/test-e2e/Basic/buffer/buffer_dev_to_dev.cpp @@ -1,9 +1,7 @@ // FIXME flaky fail on HIP // UNSUPPORTED: hip -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==---------- buffer_dev_to_dev.cpp - SYCL buffer basic test --------------==// // diff --git a/sycl/test-e2e/Basic/buffer/buffer_full_copy.cpp b/sycl/test-e2e/Basic/buffer/buffer_full_copy.cpp index ee41ad02c6702..504c1edbbdcc8 100644 --- a/sycl/test-e2e/Basic/buffer/buffer_full_copy.cpp +++ b/sycl/test-e2e/Basic/buffer/buffer_full_copy.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t2.out -// RUN: %CPU_RUN_PLACEHOLDER %t2.out -// RUN: %GPU_RUN_PLACEHOLDER %t2.out -// RUN: %ACC_RUN_PLACEHOLDER %t2.out +// RUN: %{build} -o %t2.out +// RUN: %{run} %t2.out //==------------- buffer_full_copy.cpp - SYCL buffer basic test ------------==// // diff --git a/sycl/test-e2e/Basic/buffer/buffer_migrate.cpp b/sycl/test-e2e/Basic/buffer/buffer_migrate.cpp index 21b8ccd949ae9..6096ee41d9918 100644 --- a/sycl/test-e2e/Basic/buffer/buffer_migrate.cpp +++ b/sycl/test-e2e/Basic/buffer/buffer_migrate.cpp @@ -1,6 +1,6 @@ // REQUIRES: gpu -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // // Test for buffer use in a context with multiple devices (all found // root-devices) diff --git a/sycl/test-e2e/Basic/buffer/buffer_release.cpp b/sycl/test-e2e/Basic/buffer/buffer_release.cpp index 6b55e417b5b23..18d43d1fc5395 100644 --- a/sycl/test-e2e/Basic/buffer/buffer_release.cpp +++ b/sycl/test-e2e/Basic/buffer/buffer_release.cpp @@ -1,8 +1,9 @@ +// REQUIRES: cpu // UNSUPPORTED: windows // DeferredMemory Destruction not presently supported on Windows. -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out #include diff --git a/sycl/test-e2e/Basic/buffer/native_buffer_creation_flags.cpp b/sycl/test-e2e/Basic/buffer/native_buffer_creation_flags.cpp index 76b1492bfdcb7..ec075d8a2c5a7 100644 --- a/sycl/test-e2e/Basic/buffer/native_buffer_creation_flags.cpp +++ b/sycl/test-e2e/Basic/buffer/native_buffer_creation_flags.cpp @@ -1,5 +1,6 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_PI_TRACE=-1 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER +// REQUIRES: cpu +// RUN: %{build} -o %t.out +// RUN: env SYCL_PI_TRACE=-1 %{run} %t.out 2>&1 | FileCheck %s #include diff --git a/sycl/test-e2e/Basic/buffer/reinterpret.cpp b/sycl/test-e2e/Basic/buffer/reinterpret.cpp index 8a3af888f239f..311821289a529 100644 --- a/sycl/test-e2e/Basic/buffer/reinterpret.cpp +++ b/sycl/test-e2e/Basic/buffer/reinterpret.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // // XFAIL: level_zero&&gpu diff --git a/sycl/test-e2e/Basic/buffer/subbuffer.cpp b/sycl/test-e2e/Basic/buffer/subbuffer.cpp index 4b25afc49317c..8cd9f4bf34b4f 100644 --- a/sycl/test-e2e/Basic/buffer/subbuffer.cpp +++ b/sycl/test-e2e/Basic/buffer/subbuffer.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // UNSUPPORTED: (opencl && gpu) diff --git a/sycl/test-e2e/Basic/build_log.cpp b/sycl/test-e2e/Basic/build_log.cpp index 8f108f6fefde7..733eb487dd5db 100644 --- a/sycl/test-e2e/Basic/build_log.cpp +++ b/sycl/test-e2e/Basic/build_log.cpp @@ -2,7 +2,7 @@ // UNSUPPORTED: gpu-intel-dg1 || windows // // RUN: %clangxx -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend=spir64_gen "-device dg1" %s -o %t.out -// RUN: env SYCL_RT_WARNING_LEVEL=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER +// RUN: env SYCL_RT_WARNING_LEVEL=2 %{run} %t.out 2>&1 | FileCheck %s #include diff --git a/sycl/test-e2e/Basic/built-ins.cpp b/sycl/test-e2e/Basic/built-ins.cpp index dc07ceacbba9e..e39231b44023f 100644 --- a/sycl/test-e2e/Basic/built-ins.cpp +++ b/sycl/test-e2e/Basic/built-ins.cpp @@ -1,12 +1,8 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER -// RUN: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER -// RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out | FileCheck %s -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -D__SYCL_USE_NON_VARIADIC_SPIRV_OCL_PRINTF__ %s -o %t_nonvar.out -// RUN: %CPU_RUN_PLACEHOLDER %t_nonvar.out %CPU_CHECK_PLACEHOLDER -// RUN: %GPU_RUN_PLACEHOLDER %t_nonvar.out %GPU_CHECK_PLACEHOLDER -// RUN: %ACC_RUN_PLACEHOLDER %t_nonvar.out %ACC_CHECK_PLACEHOLDER +// RUN: %{build} -D__SYCL_USE_NON_VARIADIC_SPIRV_OCL_PRINTF__ -o %t_nonvar.out +// RUN: %{run} %t_nonvar.out | FileCheck %s // Hits an assertion with AMD: // XFAIL: hip_amd diff --git a/sycl/test-e2e/Basic/built-ins/marray_common.cpp b/sycl/test-e2e/Basic/built-ins/marray_common.cpp index 91fcc1ae9ba00..1a14295219aa5 100644 --- a/sycl/test-e2e/Basic/built-ins/marray_common.cpp +++ b/sycl/test-e2e/Basic/built-ins/marray_common.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out #ifdef _WIN32 #define _USE_MATH_DEFINES // To use math constants diff --git a/sycl/test-e2e/Basic/built-ins/marray_geometric.cpp b/sycl/test-e2e/Basic/built-ins/marray_geometric.cpp index 133363d96ee83..70cc0ae0ae749 100644 --- a/sycl/test-e2e/Basic/built-ins/marray_geometric.cpp +++ b/sycl/test-e2e/Basic/built-ins/marray_geometric.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out #include diff --git a/sycl/test-e2e/Basic/built-ins/marray_math.cpp b/sycl/test-e2e/Basic/built-ins/marray_math.cpp index 009cd1da51ca8..d9554e3339a4f 100644 --- a/sycl/test-e2e/Basic/built-ins/marray_math.cpp +++ b/sycl/test-e2e/Basic/built-ins/marray_math.cpp @@ -1,9 +1,7 @@ // DEFINE: %{mathflags} = %if cl_options %{/clang:-fno-fast-math%} %else %{-fno-fast-math%} -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %{mathflags} %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} %{mathflags} -o %t.out +// RUN: %{run} %t.out #include diff --git a/sycl/test-e2e/Basic/built-ins/marray_relational.cpp b/sycl/test-e2e/Basic/built-ins/marray_relational.cpp index 580d33d6e6d8e..765d28cd49097 100644 --- a/sycl/test-e2e/Basic/built-ins/marray_relational.cpp +++ b/sycl/test-e2e/Basic/built-ins/marray_relational.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out #include diff --git a/sycl/test-e2e/Basic/code_location_e2e.cpp b/sycl/test-e2e/Basic/code_location_e2e.cpp index f5518bbb570a7..1ff593e07b8fc 100644 --- a/sycl/test-e2e/Basic/code_location_e2e.cpp +++ b/sycl/test-e2e/Basic/code_location_e2e.cpp @@ -1,14 +1,10 @@ // UNSUPPORTED: hip || cuda -// RUN: %clangxx -fsycl -DNDEBUG %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER -// RUN: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER -// RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER - -// RUN: %clangxx -fsycl %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER -// RUN: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER -// RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER +// RUN: %{build} -DNDEBUG -o %t.out +// RUN: %{run} %t.out | FileCheck %s + +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out | FileCheck %s /* clang++ -fsycl -DNDEBUG -o smyl.bin code_location_e2e.cpp // <<--- NDEBUG diff --git a/sycl/test-e2e/Basic/compare_exchange_strong.cpp b/sycl/test-e2e/Basic/compare_exchange_strong.cpp index 1b4d8afacba2c..8b749119f97a9 100644 --- a/sycl/test-e2e/Basic/compare_exchange_strong.cpp +++ b/sycl/test-e2e/Basic/compare_exchange_strong.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out #include using namespace sycl; diff --git a/sycl/test-e2e/Basic/context-with-multiple-devices.cpp b/sycl/test-e2e/Basic/context-with-multiple-devices.cpp index 88cd9f5ccb61b..a13f787f11342 100644 --- a/sycl/test-e2e/Basic/context-with-multiple-devices.cpp +++ b/sycl/test-e2e/Basic/context-with-multiple-devices.cpp @@ -1,6 +1,6 @@ // REQUIRES: accelerator, opencl-aot -// RUN: %clangxx -fsycl -fintelfpga %s -o %t2.out +// RUN: %{build} -fintelfpga -o %t2.out // RUN: env CL_CONFIG_CPU_EMULATE_DEVICES=2 %t2.out #include diff --git a/sycl/test-e2e/Basic/context.cpp b/sycl/test-e2e/Basic/context.cpp index 486440d46eb16..90b6dfbdceb48 100644 --- a/sycl/test-e2e/Basic/context.cpp +++ b/sycl/test-e2e/Basic/context.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // This test performs basic check of the SYCL context class. diff --git a/sycl/test-e2e/Basic/context_platforms.cpp b/sycl/test-e2e/Basic/context_platforms.cpp index 6407ec3adf02e..09999b02d6cb6 100644 --- a/sycl/test-e2e/Basic/context_platforms.cpp +++ b/sycl/test-e2e/Basic/context_platforms.cpp @@ -1,5 +1,6 @@ -// RUN: %clangxx -fsycl %s -o %t.out +// RUN: %{build} -o %t.out // RUN: %BE_RUN_PLACEHOLDER %t.out + #include #include diff --git a/sycl/test-e2e/Basic/cuda_max_wgs_error.cpp b/sycl/test-e2e/Basic/cuda_max_wgs_error.cpp index 4c019b68e59ef..fe464662caebc 100755 --- a/sycl/test-e2e/Basic/cuda_max_wgs_error.cpp +++ b/sycl/test-e2e/Basic/cuda_max_wgs_error.cpp @@ -1,5 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -fno-sycl-id-queries-fit-in-int -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out -fno-sycl-id-queries-fit-in-int +// RUN: %{run} %t.out // // REQUIRES: cuda diff --git a/sycl/test-e2e/Basic/default_device.cpp b/sycl/test-e2e/Basic/default_device.cpp index a87a5449ba3f5..7cb44321e3150 100644 --- a/sycl/test-e2e/Basic/default_device.cpp +++ b/sycl/test-e2e/Basic/default_device.cpp @@ -6,10 +6,8 @@ // //===----------------------------------------------------------------------===// -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out #include diff --git a/sycl/test-e2e/Basic/default_platform.cpp b/sycl/test-e2e/Basic/default_platform.cpp index 14a903693eec9..5b7b7b9a68e7a 100644 --- a/sycl/test-e2e/Basic/default_platform.cpp +++ b/sycl/test-e2e/Basic/default_platform.cpp @@ -6,10 +6,8 @@ // //===----------------------------------------------------------------------===// -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out #include diff --git a/sycl/test-e2e/Basic/device-selectors.cpp b/sycl/test-e2e/Basic/device-selectors.cpp index 172163df1aa2b..d4b972c0ac529 100644 --- a/sycl/test-e2e/Basic/device-selectors.cpp +++ b/sycl/test-e2e/Basic/device-selectors.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out +// RUN: %{build} -o %t.out // RUN: %t.out #include diff --git a/sycl/test-e2e/Basic/device.cpp b/sycl/test-e2e/Basic/device.cpp index 4bcc731946b3a..76978470ced08 100644 --- a/sycl/test-e2e/Basic/device.cpp +++ b/sycl/test-e2e/Basic/device.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // This test performs basic check of the SYCL device class. diff --git a/sycl/test-e2e/Basic/device_equality.cpp b/sycl/test-e2e/Basic/device_equality.cpp index 199380af64503..d4719d99661d6 100644 --- a/sycl/test-e2e/Basic/device_equality.cpp +++ b/sycl/test-e2e/Basic/device_equality.cpp @@ -1,6 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t1.out -// RUN: %CPU_RUN_PLACEHOLDER %t1.out -// RUN: %GPU_RUN_PLACEHOLDER %t1.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==------- device_equality.cpp - SYCL device equality test ----------------==// // diff --git a/sycl/test-e2e/Basic/device_event.cpp b/sycl/test-e2e/Basic/device_event.cpp index 152191f866788..01f4c2138fa30 100644 --- a/sycl/test-e2e/Basic/device_event.cpp +++ b/sycl/test-e2e/Basic/device_event.cpp @@ -1,12 +1,8 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.run -// RUN: %GPU_RUN_PLACEHOLDER %t.run -// RUN: %CPU_RUN_PLACEHOLDER %t.run -// RUN: %ACC_RUN_PLACEHOLDER %t.run +// RUN: %{build} -o %t.run +// RUN: %{run} %t.run // -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -DUSE_DEPRECATED_LOCAL_ACC %s -o %t.run -// RUN: %GPU_RUN_PLACEHOLDER %t.run -// RUN: %CPU_RUN_PLACEHOLDER %t.run -// RUN: %ACC_RUN_PLACEHOLDER %t.run +// RUN: %{build} -DUSE_DEPRECATED_LOCAL_ACC -o %t.run +// RUN: %{run} %t.run // // Returns error "Barrier is not supported on the host device // yet." with Nvidia. diff --git a/sycl/test-e2e/Basic/device_implicitly_copyable.cpp b/sycl/test-e2e/Basic/device_implicitly_copyable.cpp index 6d00d84a4d20d..150d66a3edc08 100644 --- a/sycl/test-e2e/Basic/device_implicitly_copyable.cpp +++ b/sycl/test-e2e/Basic/device_implicitly_copyable.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==--device_implicitly_copyable.cpp - SYCL implicit device copyable test --==// // diff --git a/sycl/test-e2e/Basic/diagnostics/device-check.cpp b/sycl/test-e2e/Basic/diagnostics/device-check.cpp index 2970bd329a873..9ecb2f63b04a3 100644 --- a/sycl/test-e2e/Basic/diagnostics/device-check.cpp +++ b/sycl/test-e2e/Basic/diagnostics/device-check.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out +// RUN: %{build} -o %t.out // RUN: env SYCL_DEVICE_TYPE=cpu %BE_RUN_PLACEHOLDER %t.out // RUN: env SYCL_DEVICE_TYPE=gpu %BE_RUN_PLACEHOLDER %t.out // RUN: env SYCL_DEVICE_TYPE=acc %BE_RUN_PLACEHOLDER %t.out diff --git a/sycl/test-e2e/Basic/diagnostics/handler.cpp b/sycl/test-e2e/Basic/diagnostics/handler.cpp index 59c429c15e6da..d704335a6e5b9 100644 --- a/sycl/test-e2e/Basic/diagnostics/handler.cpp +++ b/sycl/test-e2e/Basic/diagnostics/handler.cpp @@ -1,5 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %BE_RUN_PLACEHOLDER %t.out | FileCheck %s +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out | FileCheck %s // // Appears to fail on HIP Nvidia because 'no device of requested type available' // when constructing a queue with an exception_list. diff --git a/sycl/test-e2e/Basic/diagnostics/non-uniform-wk-gp-test.cpp b/sycl/test-e2e/Basic/diagnostics/non-uniform-wk-gp-test.cpp index c62f229acfb17..ae8f18756220d 100644 --- a/sycl/test-e2e/Basic/diagnostics/non-uniform-wk-gp-test.cpp +++ b/sycl/test-e2e/Basic/diagnostics/non-uniform-wk-gp-test.cpp @@ -1,6 +1,8 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out // REQUIRES: level_zero + +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out + // UNSUPPORTED: ze_debug-1,ze_debug4 //==------- non-uniform-wk-gp-test.cpp -------==// // This is a diagnostic test which verifies that diff --git a/sycl/test-e2e/Basic/enqueue_barrier.cpp b/sycl/test-e2e/Basic/enqueue_barrier.cpp index fc911ad2300e7..cb6e29a66bc40 100644 --- a/sycl/test-e2e/Basic/enqueue_barrier.cpp +++ b/sycl/test-e2e/Basic/enqueue_barrier.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER -// RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER -// RUN: env SYCL_PI_TRACE=2 %ACC_RUN_PLACEHOLDER %t.out 2>&1 %ACC_CHECK_PLACEHOLDER +// RUN: %{build} -o %t.out +// RUN: env SYCL_PI_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s // The test is failing sporadically on Windows OpenCL RTs // Disabling on windows until fixed diff --git a/sycl/test-e2e/Basic/event.cpp b/sycl/test-e2e/Basic/event.cpp index bfcbfaa333537..9092057184afa 100644 --- a/sycl/test-e2e/Basic/event.cpp +++ b/sycl/test-e2e/Basic/event.cpp @@ -1,6 +1,7 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out + +// UNSUPPORTED: accelerator //==--------------- event.cpp - SYCL event test ----------------------------==// // diff --git a/sycl/test-e2e/Basic/event_async_exception.cpp b/sycl/test-e2e/Basic/event_async_exception.cpp index 979f7cfc0e9ad..9a9ef88a36896 100644 --- a/sycl/test-e2e/Basic/event_async_exception.cpp +++ b/sycl/test-e2e/Basic/event_async_exception.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==---- event_async_exception.cpp - Test for event async exceptions -------==// // diff --git a/sycl/test-e2e/Basic/event_creation.cpp b/sycl/test-e2e/Basic/event_creation.cpp index 19a001d965b7a..cefcedee3015a 100644 --- a/sycl/test-e2e/Basic/event_creation.cpp +++ b/sycl/test-e2e/Basic/event_creation.cpp @@ -1,8 +1,9 @@ // REQUIRES: opencl, opencl_icd -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %opencl_lib -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out %opencl_lib +// RUN: %{run} %t.out + +// UNSUPPORTED: accelerator //==--------------- event.cpp - SYCL event test ----------------------------==// // diff --git a/sycl/test-e2e/Basic/event_profiling_info.cpp b/sycl/test-e2e/Basic/event_profiling_info.cpp index 27cf6c0c04311..d00114cfbdb4b 100644 --- a/sycl/test-e2e/Basic/event_profiling_info.cpp +++ b/sycl/test-e2e/Basic/event_profiling_info.cpp @@ -1,9 +1,7 @@ // REQUIRES: aspect-queue_profiling -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out +// RUN: %{build} -o %t.out // -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{run} %t.out //==------------------- event_profiling_info.cpp ---------------------------==// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/sycl/test-e2e/Basic/event_profiling_workaround.cpp b/sycl/test-e2e/Basic/event_profiling_workaround.cpp index 1c21bfb913ba9..ac50d15a4c70d 100644 --- a/sycl/test-e2e/Basic/event_profiling_workaround.cpp +++ b/sycl/test-e2e/Basic/event_profiling_workaround.cpp @@ -1,7 +1,9 @@ +// REQUIRES: accelerator // UNSUPPORTED: aspect-queue_profiling -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out +// RUN: %{build} -o %t.out // -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{run} %t.out + //==----------------- event_profiling_workaround.cpp -----------------------==// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/sycl/test-e2e/Basic/event_release.cpp b/sycl/test-e2e/Basic/event_release.cpp index cf78a92bd5314..05f31671fe94d 100644 --- a/sycl/test-e2e/Basic/event_release.cpp +++ b/sycl/test-e2e/Basic/event_release.cpp @@ -1,5 +1,6 @@ -// RUN: %clangxx -fsycl %s -o %t.out -// RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER +// REQUIRES: cpu +// RUN: %{build} -o %t.out +// RUN: env SYCL_PI_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s #include #include #include diff --git a/sycl/test-e2e/Basic/exceptions-SYCL-2020.cpp b/sycl/test-e2e/Basic/exceptions-SYCL-2020.cpp index 7f4ff53437a80..bfa12f0dbe0a7 100644 --- a/sycl/test-e2e/Basic/exceptions-SYCL-2020.cpp +++ b/sycl/test-e2e/Basic/exceptions-SYCL-2020.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out #include diff --git a/sycl/test-e2e/Basic/fill_accessor.cpp b/sycl/test-e2e/Basic/fill_accessor.cpp index 96219da67ea28..6fd44f79b15a9 100644 --- a/sycl/test-e2e/Basic/fill_accessor.cpp +++ b/sycl/test-e2e/Basic/fill_accessor.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out #include diff --git a/sycl/test-e2e/Basic/fpga_tests/buffer_location.cpp b/sycl/test-e2e/Basic/fpga_tests/buffer_location.cpp index 8077fa9af925f..338329ac55db1 100644 --- a/sycl/test-e2e/Basic/fpga_tests/buffer_location.cpp +++ b/sycl/test-e2e/Basic/fpga_tests/buffer_location.cpp @@ -1,5 +1,6 @@ -// RUN: %clangxx -fsycl %s -o %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// REQUIRES: accelerator +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out #include diff --git a/sycl/test-e2e/Basic/fpga_tests/fpga_aocx.cpp b/sycl/test-e2e/Basic/fpga_tests/fpga_aocx.cpp index 2669f9b53cdc1..578602dccb0e2 100644 --- a/sycl/test-e2e/Basic/fpga_tests/fpga_aocx.cpp +++ b/sycl/test-e2e/Basic/fpga_tests/fpga_aocx.cpp @@ -22,5 +22,5 @@ // AOCX with object // RUN: %clangxx -fsycl -fintelfpga %t.o %t_image.a -o %t_aocx_obj.out // -// RUN: %ACC_RUN_PLACEHOLDER %t_aocx_src.out -// RUN: %ACC_RUN_PLACEHOLDER %t_aocx_obj.out +// RUN: %{run} %t_aocx_src.out +// RUN: %{run} %t_aocx_obj.out diff --git a/sycl/test-e2e/Basic/fpga_tests/fpga_aocx_win.cpp b/sycl/test-e2e/Basic/fpga_tests/fpga_aocx_win.cpp index 1fce192d0e2d8..44f768ace53df 100644 --- a/sycl/test-e2e/Basic/fpga_tests/fpga_aocx_win.cpp +++ b/sycl/test-e2e/Basic/fpga_tests/fpga_aocx_win.cpp @@ -23,5 +23,5 @@ // AOCX with object // RUN: %clangxx -fsycl -fintelfpga %t.obj %t_image.lib -o %t_aocx_obj.out // -// RUN: %ACC_RUN_PLACEHOLDER %t_aocx_src.out -// RUN: %ACC_RUN_PLACEHOLDER %t_aocx_obj.out +// RUN: %{run} %t_aocx_src.out +// RUN: %{run} %t_aocx_obj.out diff --git a/sycl/test-e2e/Basic/fpga_tests/fpga_dsp_control.cpp b/sycl/test-e2e/Basic/fpga_tests/fpga_dsp_control.cpp index 9317bad31dde8..c4e151555091c 100644 --- a/sycl/test-e2e/Basic/fpga_tests/fpga_dsp_control.cpp +++ b/sycl/test-e2e/Basic/fpga_tests/fpga_dsp_control.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// // REQUIRES: accelerator, opencl-aot -// RUN: %clangxx -fsycl -fintelfpga %s -o %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -fintelfpga -o %t.out +// RUN: %{run} %t.out #include #include diff --git a/sycl/test-e2e/Basic/fpga_tests/fpga_io_pipes.cpp b/sycl/test-e2e/Basic/fpga_tests/fpga_io_pipes.cpp index 7d77a6acc436f..93937c2537931 100644 --- a/sycl/test-e2e/Basic/fpga_tests/fpga_io_pipes.cpp +++ b/sycl/test-e2e/Basic/fpga_tests/fpga_io_pipes.cpp @@ -1,5 +1,6 @@ -// RUN: %clangxx -fsycl %s -o %t.out -// RUNx: %ACC_RUN_PLACEHOLDER %t.out +// REQUIRES: accelerator +// RUN: %{build} -o %t.out +// RUNx: %{run} %t.out //==------------ fpga_io_pipes.cpp - SYCL FPGA pipes test ------------------==// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/sycl/test-e2e/Basic/fpga_tests/fpga_latency_control_lsu.cpp b/sycl/test-e2e/Basic/fpga_tests/fpga_latency_control_lsu.cpp index 25b556b8eea51..a78e2f08196cc 100644 --- a/sycl/test-e2e/Basic/fpga_tests/fpga_latency_control_lsu.cpp +++ b/sycl/test-e2e/Basic/fpga_tests/fpga_latency_control_lsu.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// // REQUIRES: opencl-aot, accelerator -// RUN: %clangxx -fsycl -fintelfpga %s -o %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -fintelfpga -o %t.out +// RUN: %{run} %t.out #include #include diff --git a/sycl/test-e2e/Basic/fpga_tests/fpga_latency_control_pipe.cpp b/sycl/test-e2e/Basic/fpga_tests/fpga_latency_control_pipe.cpp index 3525a6aecf633..e9c7843feb3b9 100644 --- a/sycl/test-e2e/Basic/fpga_tests/fpga_latency_control_pipe.cpp +++ b/sycl/test-e2e/Basic/fpga_tests/fpga_latency_control_pipe.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// // REQUIRES: opencl-aot, accelerator -// RUN: %clangxx -fsycl -fintelfpga %s -o %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -fintelfpga -o %t.out +// RUN: %{run} %t.out #include #include diff --git a/sycl/test-e2e/Basic/fpga_tests/fpga_lsu.cpp b/sycl/test-e2e/Basic/fpga_tests/fpga_lsu.cpp index e064916d5ce25..7e858889ea50a 100644 --- a/sycl/test-e2e/Basic/fpga_tests/fpga_lsu.cpp +++ b/sycl/test-e2e/Basic/fpga_tests/fpga_lsu.cpp @@ -6,8 +6,8 @@ //===----------------------------------------------------------------------===// // REQUIRES: accelerator, opencl-aot -// RUN: %clangxx -fsycl -fintelfpga %s -o %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -fintelfpga -o %t.out +// RUN: %{run} %t.out #include #include diff --git a/sycl/test-e2e/Basic/fpga_tests/fpga_pipes.cpp b/sycl/test-e2e/Basic/fpga_tests/fpga_pipes.cpp index 2af388e2e615f..0e25465a1c7c7 100644 --- a/sycl/test-e2e/Basic/fpga_tests/fpga_pipes.cpp +++ b/sycl/test-e2e/Basic/fpga_tests/fpga_pipes.cpp @@ -1,8 +1,6 @@ -// RUN: %clangxx -fsycl %s -o %t.out -//-fsycl-targets=%sycl_triple -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// REQUIRES: accelerator +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==------------- fpga_pipes.cpp - SYCL FPGA pipes test --------------------==// // diff --git a/sycl/test-e2e/Basic/fpga_tests/fpga_pipes_legacy_ns.cpp b/sycl/test-e2e/Basic/fpga_tests/fpga_pipes_legacy_ns.cpp index ff123e33dfcd6..fec0463447078 100644 --- a/sycl/test-e2e/Basic/fpga_tests/fpga_pipes_legacy_ns.cpp +++ b/sycl/test-e2e/Basic/fpga_tests/fpga_pipes_legacy_ns.cpp @@ -1,5 +1,6 @@ -// RUN: %clangxx -fsycl %s -o %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// REQUIRES: accelerator +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==-------- fpga_pipes_legacy_ns.cpp - SYCL FPGA pipes test ---------------==// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/sycl/test-e2e/Basic/fpga_tests/fpga_queue.cpp b/sycl/test-e2e/Basic/fpga_tests/fpga_queue.cpp index 05cd8c4412c84..c3995c46c38fc 100644 --- a/sycl/test-e2e/Basic/fpga_tests/fpga_queue.cpp +++ b/sycl/test-e2e/Basic/fpga_tests/fpga_queue.cpp @@ -1,7 +1,7 @@ // REQUIRES: opencl, opencl_icd -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %opencl_lib -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out %opencl_lib +// RUN: %{run} %t.out //==------------- fpga_queue.cpp - SYCL FPGA queues test -------------------==// // diff --git a/sycl/test-e2e/Basic/fpga_tests/global_fpga_device_selector.cpp b/sycl/test-e2e/Basic/fpga_tests/global_fpga_device_selector.cpp index c6e605ee5e081..f923e41fc559a 100644 --- a/sycl/test-e2e/Basic/fpga_tests/global_fpga_device_selector.cpp +++ b/sycl/test-e2e/Basic/fpga_tests/global_fpga_device_selector.cpp @@ -1,7 +1,7 @@ // REQUIRES: opencl-aot, accelerator -// RUN: %clangxx -fsycl -fintelfpga %s -o %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -fintelfpga -o %t.out +// RUN: %{run} %t.out #include #include diff --git a/sycl/test-e2e/Basic/fpga_tests/pipes_info.cpp b/sycl/test-e2e/Basic/fpga_tests/pipes_info.cpp index dcbe4d74115f5..5d42f4b37b715 100644 --- a/sycl/test-e2e/Basic/fpga_tests/pipes_info.cpp +++ b/sycl/test-e2e/Basic/fpga_tests/pipes_info.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==--------- pipes_info.cpp - SYCL device pipe info test --*- C++ -*-------==// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/sycl/test-e2e/Basic/free_function_queries/free_function_queries.cpp b/sycl/test-e2e/Basic/free_function_queries/free_function_queries.cpp index be7b509bf89e8..79282422f151c 100644 --- a/sycl/test-e2e/Basic/free_function_queries/free_function_queries.cpp +++ b/sycl/test-e2e/Basic/free_function_queries/free_function_queries.cpp @@ -1,9 +1,7 @@ // FIXME: Investigate OS-agnostic failures // REQUIRES: TEMPORARY_DISABLED -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // UNSUPPORTED: windows // The failure is caused by intel/llvm#5213 diff --git a/sycl/test-e2e/Basic/free_function_queries/free_function_queries_sub_group.cpp b/sycl/test-e2e/Basic/free_function_queries/free_function_queries_sub_group.cpp index e60f9c12d0fc7..c45d40890e006 100644 --- a/sycl/test-e2e/Basic/free_function_queries/free_function_queries_sub_group.cpp +++ b/sycl/test-e2e/Basic/free_function_queries/free_function_queries_sub_group.cpp @@ -3,10 +3,8 @@ // UNSUPPORTED: cuda || hip // CUDA and HIP compilation and runtime do not yet support sub-groups. // -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // UNSUPPORTED: windows // The failure is caused by intel/llvm#5213 diff --git a/sycl/test-e2e/Basic/get_backend.cpp b/sycl/test-e2e/Basic/get_backend.cpp index d4bb31d739539..e78022b589402 100644 --- a/sycl/test-e2e/Basic/get_backend.cpp +++ b/sycl/test-e2e/Basic/get_backend.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out +// RUN: %{build} -o %t.out // RUN: %t.out // //==----------------- get_backend.cpp ------------------------==// diff --git a/sycl/test-e2e/Basic/gpu_max_wgs_error.cpp b/sycl/test-e2e/Basic/gpu_max_wgs_error.cpp index e5425cd4e882f..44a1885106959 100644 --- a/sycl/test-e2e/Basic/gpu_max_wgs_error.cpp +++ b/sycl/test-e2e/Basic/gpu_max_wgs_error.cpp @@ -1,5 +1,5 @@ // UNSUPPORTED: cuda || hip -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -fno-sycl-id-queries-fit-in-int +// RUN: %{build} -o %t.out -fno-sycl-id-queries-fit-in-int // RUN: %GPU_RUN_PLACEHOLDER %t.out #include diff --git a/sycl/test-e2e/Basic/group_async_copy.cpp b/sycl/test-e2e/Basic/group_async_copy.cpp index ab18bea2e6963..b51d6da3f8d81 100644 --- a/sycl/test-e2e/Basic/group_async_copy.cpp +++ b/sycl/test-e2e/Basic/group_async_copy.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -std=c++17 -fsycl-targets=%sycl_triple %s -o %t.run -// RUN: %GPU_RUN_PLACEHOLDER %t.run -// RUN: %CPU_RUN_PLACEHOLDER %t.run -// RUN: %ACC_RUN_PLACEHOLDER %t.run +// RUN: %{build} -std=c++17 -o %t.run +// RUN: %{run} %t.run #include #include diff --git a/sycl/test-e2e/Basic/group_local_id.cpp b/sycl/test-e2e/Basic/group_local_id.cpp index 47849f93cabc0..e7cd63c8587ef 100644 --- a/sycl/test-e2e/Basic/group_local_id.cpp +++ b/sycl/test-e2e/Basic/group_local_id.cpp @@ -1,7 +1,7 @@ // REQUIRES: cpu -// RUN: %clangxx -fsycl -std=c++17 -fsycl-targets=%sycl_triple %s -o %t.run -// RUN: %CPU_RUN_PLACEHOLDER %t.run +// RUN: %{build} -std=c++17 -o %t.out +// RUN: %{run} %t.out #include diff --git a/sycl/test-e2e/Basic/half_builtins.cpp b/sycl/test-e2e/Basic/half_builtins.cpp index 8857af50cba71..1e49477426e46 100644 --- a/sycl/test-e2e/Basic/half_builtins.cpp +++ b/sycl/test-e2e/Basic/half_builtins.cpp @@ -1,8 +1,6 @@ // REQUIRES: aspect-fp16 -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // Intel OpenCL CPU and FPGA emulator drivers do not support cl_khr_fp16 // extension diff --git a/sycl/test-e2e/Basic/half_type.cpp b/sycl/test-e2e/Basic/half_type.cpp index 033c2922b227b..baa12b73c5a55 100644 --- a/sycl/test-e2e/Basic/half_type.cpp +++ b/sycl/test-e2e/Basic/half_type.cpp @@ -1,8 +1,6 @@ // REQUIRES: aspect-fp16 -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==--------------- half_type.cpp - SYCL half type test --------------------==// // diff --git a/sycl/test-e2e/Basic/handler/handler_copy_with_offset.cpp b/sycl/test-e2e/Basic/handler/handler_copy_with_offset.cpp index f63ad464f2b59..cd3a936475d5e 100644 --- a/sycl/test-e2e/Basic/handler/handler_copy_with_offset.cpp +++ b/sycl/test-e2e/Basic/handler/handler_copy_with_offset.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==--- handler_copy_with_offset.cpp - SYCL handler copy with offset test --==// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/sycl/test-e2e/Basic/handler/handler_generic_integral_lambda.cpp b/sycl/test-e2e/Basic/handler/handler_generic_integral_lambda.cpp index 0d302674b8de3..27883afc064c1 100644 --- a/sycl/test-e2e/Basic/handler/handler_generic_integral_lambda.cpp +++ b/sycl/test-e2e/Basic/handler/handler_generic_integral_lambda.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==-------------- handler_generic_integral_lambda.cpp ---------------------==// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/sycl/test-e2e/Basic/handler/handler_mem_op.cpp b/sycl/test-e2e/Basic/handler/handler_mem_op.cpp index dd825a1413531..30a9b299a2d22 100644 --- a/sycl/test-e2e/Basic/handler/handler_mem_op.cpp +++ b/sycl/test-e2e/Basic/handler/handler_mem_op.cpp @@ -1,6 +1,7 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out + +// UNSUPPORTED: accelerator //==- handler.cpp - SYCL handler explicit memory operations test -*- C++-*--==// // diff --git a/sycl/test-e2e/Basic/handler/interop_task.cpp b/sycl/test-e2e/Basic/handler/interop_task.cpp index 2cde2698d6eb7..8f20fdbd06798 100644 --- a/sycl/test-e2e/Basic/handler/interop_task.cpp +++ b/sycl/test-e2e/Basic/handler/interop_task.cpp @@ -1,7 +1,8 @@ // REQUIRES: opencl, opencl_icd -// RUN: %clangxx -fsycl %s -o %t.out %opencl_lib -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out %opencl_lib +// RUN: %{run} %t.out + +// UNSUPPORTED: accelerator //==------- interop_task.cpp -----------------------------------------------==// // diff --git a/sycl/test-e2e/Basic/handler/run_on_host_intel.cpp b/sycl/test-e2e/Basic/handler/run_on_host_intel.cpp index 8f0d7d39f6de8..feb079f6219c1 100644 --- a/sycl/test-e2e/Basic/handler/run_on_host_intel.cpp +++ b/sycl/test-e2e/Basic/handler/run_on_host_intel.cpp @@ -1,5 +1,6 @@ -// RUN: %clangxx -fsycl %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out +// REQUIRES: cpu +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==-- run_on_host_intel.cpp -----------------------------------------------==// // diff --git a/sycl/test-e2e/Basic/handler/run_on_host_intel2.cpp b/sycl/test-e2e/Basic/handler/run_on_host_intel2.cpp index 97b9480848cb0..736996f6e3e73 100644 --- a/sycl/test-e2e/Basic/handler/run_on_host_intel2.cpp +++ b/sycl/test-e2e/Basic/handler/run_on_host_intel2.cpp @@ -1,5 +1,6 @@ -// RUN: %clangxx -fsycl %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out +// REQUIRES: cpu +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out #include #include diff --git a/sycl/test-e2e/Basic/host-task-dependency.cpp b/sycl/test-e2e/Basic/host-task-dependency.cpp index 6a74d6b4212a7..1e5903f76173f 100644 --- a/sycl/test-e2e/Basic/host-task-dependency.cpp +++ b/sycl/test-e2e/Basic/host-task-dependency.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %threads_lib -// RUN: env SYCL_PI_TRACE=-1 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER -// RUN: env SYCL_PI_TRACE=-1 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER -// RUN: env SYCL_PI_TRACE=-1 %ACC_RUN_PLACEHOLDER %t.out 2>&1 %ACC_CHECK_PLACEHOLDER +// RUN: %{build} -o %t.out %threads_lib +// RUN: env SYCL_PI_TRACE=-1 %{run} %t.out 2>&1 | FileCheck %s // // TODO: Behaviour is unstable for level zero on Windows. Enable when fixed. // TODO: The test is sporadically fails on CUDA. Enable when fixed. diff --git a/sycl/test-e2e/Basic/host_task_depends.cpp b/sycl/test-e2e/Basic/host_task_depends.cpp index ad0dccf47f5d8..b6495a7f3efd0 100644 --- a/sycl/test-e2e/Basic/host_task_depends.cpp +++ b/sycl/test-e2e/Basic/host_task_depends.cpp @@ -1,5 +1,6 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out +// REQUIRES: cpu +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out #include diff --git a/sycl/test-e2e/Basic/image/image.cpp b/sycl/test-e2e/Basic/image/image.cpp index 88ef6ee7fd092..0ac5042987736 100644 --- a/sycl/test-e2e/Basic/image/image.cpp +++ b/sycl/test-e2e/Basic/image/image.cpp @@ -1,8 +1,7 @@ // REQUIRES: aspect-ext_intel_legacy_image // UNSUPPORTED: hip -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==------------------- image.cpp - SYCL image basic test -----------------==// // diff --git a/sycl/test-e2e/Basic/image/image_accessor_range.cpp b/sycl/test-e2e/Basic/image/image_accessor_range.cpp index f28c09ee298fa..180e9bb9fa359 100755 --- a/sycl/test-e2e/Basic/image/image_accessor_range.cpp +++ b/sycl/test-e2e/Basic/image/image_accessor_range.cpp @@ -5,9 +5,8 @@ // UNSUPPORTED: cuda || hip // CUDA does not support SYCL 1.2.1 images. // -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out #include #include diff --git a/sycl/test-e2e/Basic/image/image_accessor_readsampler.cpp b/sycl/test-e2e/Basic/image/image_accessor_readsampler.cpp index 4eca4046fbd3d..2e2425fa02e4b 100644 --- a/sycl/test-e2e/Basic/image/image_accessor_readsampler.cpp +++ b/sycl/test-e2e/Basic/image/image_accessor_readsampler.cpp @@ -3,9 +3,8 @@ // unsupported on windows (level-zero) due to fail of Jenkins/pre-ci-windows // CUDA cannot support SYCL 1.2.1 images. // -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // //==-----------------image_accessor read API test with sampler--------------==// // diff --git a/sycl/test-e2e/Basic/image/image_accessor_readwrite.cpp b/sycl/test-e2e/Basic/image/image_accessor_readwrite.cpp index a9b4aa7c359e8..126c66de4978d 100644 --- a/sycl/test-e2e/Basic/image/image_accessor_readwrite.cpp +++ b/sycl/test-e2e/Basic/image/image_accessor_readwrite.cpp @@ -2,9 +2,8 @@ // UNSUPPORTED: cuda || hip // CUDA cannot support SYCL 1.2.1 images. // -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==--------------------image_accessor_readwrite.cpp ----------------------==// //==----------image_accessor read without sampler & write API test---------==// diff --git a/sycl/test-e2e/Basic/image/image_accessor_readwrite_half.cpp b/sycl/test-e2e/Basic/image/image_accessor_readwrite_half.cpp index 4083e4e3c036a..1fc0aec183b8c 100644 --- a/sycl/test-e2e/Basic/image/image_accessor_readwrite_half.cpp +++ b/sycl/test-e2e/Basic/image/image_accessor_readwrite_half.cpp @@ -2,9 +2,8 @@ // UNSUPPORTED: cuda || hip // CUDA cannot support SYCL 1.2.1 images. // -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==------------------ image_accessor_readwrite_half.cpp -------------------==// //=-image_accessor read (without sampler)& write API test for half datatype-==// diff --git a/sycl/test-e2e/Basic/image/image_array.cpp b/sycl/test-e2e/Basic/image/image_array.cpp index 9494705e141a1..c38c3b3c570c3 100644 --- a/sycl/test-e2e/Basic/image/image_array.cpp +++ b/sycl/test-e2e/Basic/image/image_array.cpp @@ -1,8 +1,9 @@ // UNSUPPORTED: hip // -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUNx: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out + +// UNSUPPORTED: gpu //==------------------- image.cpp - SYCL image basic test -----------------==// // diff --git a/sycl/test-e2e/Basic/image/image_constructors.cpp b/sycl/test-e2e/Basic/image/image_constructors.cpp index d2dcc53726df7..9784ab50e0e77 100644 --- a/sycl/test-e2e/Basic/image/image_constructors.cpp +++ b/sycl/test-e2e/Basic/image/image_constructors.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t2.out -// RUN: %CPU_RUN_PLACEHOLDER %t2.out -// RUN: %GPU_RUN_PLACEHOLDER %t2.out -// RUN: %ACC_RUN_PLACEHOLDER %t2.out +// RUN: %{build} -o %t2.out +// RUN: %{run} %t2.out // //==-------image_constructors.cpp - SYCL image constructors basic test------==// // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/sycl/test-e2e/Basic/image/image_max_size.cpp b/sycl/test-e2e/Basic/image/image_max_size.cpp index ba6d78af4e70c..92e94b8e0c12c 100644 --- a/sycl/test-e2e/Basic/image/image_max_size.cpp +++ b/sycl/test-e2e/Basic/image/image_max_size.cpp @@ -1,7 +1,6 @@ // REQUIRES: aspect-ext_intel_legacy_image -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // UNSUPPORTED: cuda || hip || (windows && opencl && gpu) // CUDA does not support info::device::image3d_max_width query. diff --git a/sycl/test-e2e/Basic/image/image_read.cpp b/sycl/test-e2e/Basic/image/image_read.cpp index 1acf5468c8634..2b0756e043b92 100644 --- a/sycl/test-e2e/Basic/image/image_read.cpp +++ b/sycl/test-e2e/Basic/image/image_read.cpp @@ -1,8 +1,7 @@ // REQUIRES: aspect-ext_intel_legacy_image // UNSUPPORTED: hip -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out #include "image_read.h" diff --git a/sycl/test-e2e/Basic/image/image_read_fp16.cpp b/sycl/test-e2e/Basic/image/image_read_fp16.cpp index 54bd52483ab46..ea831a8e01feb 100644 --- a/sycl/test-e2e/Basic/image/image_read_fp16.cpp +++ b/sycl/test-e2e/Basic/image/image_read_fp16.cpp @@ -1,8 +1,7 @@ // REQUIRES: aspect-fp16, aspect-ext_intel_legacy_image // UNSUPPORTED: hip -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out #include "image_read.h" diff --git a/sycl/test-e2e/Basic/image/image_sample.cpp b/sycl/test-e2e/Basic/image/image_sample.cpp index 7dd7970d5b385..6703dedf23fc0 100644 --- a/sycl/test-e2e/Basic/image/image_sample.cpp +++ b/sycl/test-e2e/Basic/image/image_sample.cpp @@ -1,7 +1,6 @@ // REQUIRES: aspect-ext_intel_legacy_image -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // Temporarily disable test on Windows due to regressions in GPU driver. // UNSUPPORTED: hip, windows diff --git a/sycl/test-e2e/Basic/image/image_write.cpp b/sycl/test-e2e/Basic/image/image_write.cpp index 40dcfe71cb5c9..372ca0c846919 100644 --- a/sycl/test-e2e/Basic/image/image_write.cpp +++ b/sycl/test-e2e/Basic/image/image_write.cpp @@ -1,7 +1,6 @@ // REQUIRES: aspect-ext_intel_legacy_image -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // UNSUPPORTED: cuda || hip // TODO: re-enable on cuda device. diff --git a/sycl/test-e2e/Basic/image/image_write_fp16.cpp b/sycl/test-e2e/Basic/image/image_write_fp16.cpp index 98afa59c1b995..6d7f8a57b7d91 100644 --- a/sycl/test-e2e/Basic/image/image_write_fp16.cpp +++ b/sycl/test-e2e/Basic/image/image_write_fp16.cpp @@ -1,8 +1,7 @@ // REQUIRES: aspect-fp16, aspect-ext_intel_legacy_image // UNSUPPORTED: hip || cuda -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out #include "image_write.h" diff --git a/sycl/test-e2e/Basic/image/srgba-aspect-check.cpp b/sycl/test-e2e/Basic/image/srgba-aspect-check.cpp index 07c8e8fe39552..3715ef536de7c 100644 --- a/sycl/test-e2e/Basic/image/srgba-aspect-check.cpp +++ b/sycl/test-e2e/Basic/image/srgba-aspect-check.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out #include diff --git a/sycl/test-e2e/Basic/image/srgba-read.cpp b/sycl/test-e2e/Basic/image/srgba-read.cpp index b721407a3efab..e091741da28db 100644 --- a/sycl/test-e2e/Basic/image/srgba-read.cpp +++ b/sycl/test-e2e/Basic/image/srgba-read.cpp @@ -1,7 +1,6 @@ // REQUIRES: aspect-ext_oneapi_srgb, aspect-ext_intel_legacy_image -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER -// RUN: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out | FileCheck %s #include #include diff --git a/sycl/test-e2e/Basic/in_order_queue_status.cpp b/sycl/test-e2e/Basic/in_order_queue_status.cpp index 7f7662666d69b..f4e92ed923630 100644 --- a/sycl/test-e2e/Basic/in_order_queue_status.cpp +++ b/sycl/test-e2e/Basic/in_order_queue_status.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // Test checks that queue::ext_oneapi_empty() returns status of the in-order // queue. diff --git a/sycl/test-e2e/Basic/info.cpp b/sycl/test-e2e/Basic/info.cpp index 887d862c7c52a..7ed12faa1404f 100644 --- a/sycl/test-e2e/Basic/info.cpp +++ b/sycl/test-e2e/Basic/info.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -D__SYCL_INTERNAL_API -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -D__SYCL_INTERNAL_API -o %t.out +// RUN: %{run} %t.out //==----------------info.cpp - SYCL objects get_info() test ----------------==// // diff --git a/sycl/test-e2e/Basic/intel-ext-device.cpp b/sycl/test-e2e/Basic/intel-ext-device.cpp index a98e8c5cc8e2e..8c207c36071e1 100644 --- a/sycl/test-e2e/Basic/intel-ext-device.cpp +++ b/sycl/test-e2e/Basic/intel-ext-device.cpp @@ -1,7 +1,7 @@ -// RUN: %clangxx -fsycl %s -o %t.out -// REQUIRES: aspect-gpu +// REQUIRES: gpu // REQUIRES: level_zero || opencl -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // //==--------- intel-ext-device.cpp - SYCL device test ------------==// // diff --git a/sycl/test-e2e/Basic/interop/check_carrying_real_kernel_IDs.cpp b/sycl/test-e2e/Basic/interop/check_carrying_real_kernel_IDs.cpp index 65513d64cbdc5..f5b9b06c798a9 100644 --- a/sycl/test-e2e/Basic/interop/check_carrying_real_kernel_IDs.cpp +++ b/sycl/test-e2e/Basic/interop/check_carrying_real_kernel_IDs.cpp @@ -1,8 +1,6 @@ // REQUIRES: opencl, opencl_icd -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %opencl_lib -// RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out %opencl_lib +// RUN: %{run} %t.out #include #include diff --git a/sycl/test-e2e/Basic/interop/construction_ocl.cpp b/sycl/test-e2e/Basic/interop/construction_ocl.cpp index 390f840bb8075..197262ab91eb0 100644 --- a/sycl/test-e2e/Basic/interop/construction_ocl.cpp +++ b/sycl/test-e2e/Basic/interop/construction_ocl.cpp @@ -1,5 +1,5 @@ // REQUIRES: opencl, opencl_icd -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %opencl_lib %s -o %t.ocl.out +// RUN: %{build} %opencl_lib -o %t.ocl.out // RUN: env ONEAPI_DEVICE_SELECTOR="opencl:*" %t.ocl.out #include diff --git a/sycl/test-e2e/Basic/interop/construction_ze.cpp b/sycl/test-e2e/Basic/interop/construction_ze.cpp index 2da8f5d19192d..7ef4c89c7695a 100644 --- a/sycl/test-e2e/Basic/interop/construction_ze.cpp +++ b/sycl/test-e2e/Basic/interop/construction_ze.cpp @@ -1,5 +1,5 @@ // REQUIRES: level_zero, level_zero_dev_kit -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.ze.out +// RUN: %{build} %level_zero_options -o %t.ze.out // RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" %t.ze.out #include diff --git a/sycl/test-e2e/Basic/interop/get_native_ocl.cpp b/sycl/test-e2e/Basic/interop/get_native_ocl.cpp index 1c9ff25651e70..8d8553ef8c362 100644 --- a/sycl/test-e2e/Basic/interop/get_native_ocl.cpp +++ b/sycl/test-e2e/Basic/interop/get_native_ocl.cpp @@ -1,7 +1,8 @@ // REQUIRES: opencl, opencl_dev_kit -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %opencl_options %s -o %t.ocl.out -// RUN: %CPU_RUN_PLACEHOLDER %t.ocl.out -// RUN: %GPU_RUN_PLACEHOLDER %t.ocl.out +// RUN: %{build} %opencl_options -o %t.ocl.out +// RUN: %{run} %t.out + +// UNSUPPORTED: accelerator #include diff --git a/sycl/test-e2e/Basic/interop/get_native_ze.cpp b/sycl/test-e2e/Basic/interop/get_native_ze.cpp index ee4d58ce3e02e..bb869570959d8 100644 --- a/sycl/test-e2e/Basic/interop/get_native_ze.cpp +++ b/sycl/test-e2e/Basic/interop/get_native_ze.cpp @@ -1,6 +1,6 @@ // REQUIRES: level_zero, level_zero_dev_kit -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.ze.out -// RUN: %GPU_RUN_PLACEHOLDER %t.ze.out +// RUN: %{build} %level_zero_options -o %t.ze.out +// RUN: %{run} %t.ze.out // Temporarily disable on L0 due to fails in CI // UNSUPPORTED: level_zero diff --git a/sycl/test-e2e/Basic/kernel_bundle/kernel_bundle_api.cpp b/sycl/test-e2e/Basic/kernel_bundle/kernel_bundle_api.cpp index 19977ade23115..31198f015a2d8 100644 --- a/sycl/test-e2e/Basic/kernel_bundle/kernel_bundle_api.cpp +++ b/sycl/test-e2e/Basic/kernel_bundle/kernel_bundle_api.cpp @@ -1,8 +1,9 @@ +// REQUIRES: cpu // Use of per-kernel device code split and linking the bundle with all images // involved leads to multiple definition of AssertHappened structure due each // device image is statically linked against fallback libdevice. -// RUN: %clangxx -DSYCL_DISABLE_FALLBACK_ASSERT=1 -fsycl -fsycl-device-code-split=per_kernel -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER +// RUN: %{build} -DSYCL_DISABLE_FALLBACK_ASSERT=1 -fsycl-device-code-split=per_kernel -o %t.out +// RUN: env SYCL_PI_TRACE=2 %{run} %t.out | FileCheck %s // // UNSUPPORTED: hip diff --git a/sycl/test-e2e/Basic/kernel_info.cpp b/sycl/test-e2e/Basic/kernel_info.cpp index 157181adda719..657119629e1c0 100644 --- a/sycl/test-e2e/Basic/kernel_info.cpp +++ b/sycl/test-e2e/Basic/kernel_info.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // // Fail is flaky for level_zero, enable when fixed. // UNSUPPORTED: level_zero diff --git a/sycl/test-e2e/Basic/library_loading.cpp b/sycl/test-e2e/Basic/library_loading.cpp index e31f2410314f8..ee521f40d1b83 100644 --- a/sycl/test-e2e/Basic/library_loading.cpp +++ b/sycl/test-e2e/Basic/library_loading.cpp @@ -1,5 +1,5 @@ // REQUIRES: linux -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out +// RUN: %{build} -o %t.out // RUN: env SYCL_PI_TRACE=-1 %t.out &> %t_trace_no_filter.txt || true // RUN: FileCheck --input-file=%t_trace_no_filter.txt --check-prefix=CHECK-NO-FILTER %s // RUN: env SYCL_PI_TRACE=-1 ONEAPI_DEVICE_SELECTOR='esimd_emulator:*' %t.out &> %t_trace_esimd_filter.txt || true diff --git a/sycl/test-e2e/Basic/linear-sub_group.cpp b/sycl/test-e2e/Basic/linear-sub_group.cpp index 9b980836b2203..a856ae44b8a18 100644 --- a/sycl/test-e2e/Basic/linear-sub_group.cpp +++ b/sycl/test-e2e/Basic/linear-sub_group.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // //==--------------- linear-sub_group.cpp - SYCL linear id test -------------==// // diff --git a/sycl/test-e2e/Basic/local_mem_type.cpp b/sycl/test-e2e/Basic/local_mem_type.cpp index 45d38f9edcd87..78aa2d9073fb0 100644 --- a/sycl/test-e2e/Basic/local_mem_type.cpp +++ b/sycl/test-e2e/Basic/local_mem_type.cpp @@ -1,5 +1,7 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// REQUIRES: gpu +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out + //==--------------- local_mem_type.cpp - SYCL local mem type test ----------==// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/sycl/test-e2e/Basic/max_work_group_query.cpp b/sycl/test-e2e/Basic/max_work_group_query.cpp index 6cb758e562f80..d15dafd1e7ab7 100644 --- a/sycl/test-e2e/Basic/max_work_group_query.cpp +++ b/sycl/test-e2e/Basic/max_work_group_query.cpp @@ -1,6 +1,6 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out +// RUN: %{build} -o %t.out // REQUIRES: cuda || hip || level_zero -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{run} %t.out #include diff --git a/sycl/test-e2e/Basic/multi_ptr.cpp b/sycl/test-e2e/Basic/multi_ptr.cpp index 20fccfefc3b11..52ed97e6f541f 100644 --- a/sycl/test-e2e/Basic/multi_ptr.cpp +++ b/sycl/test-e2e/Basic/multi_ptr.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-dead-args-optimization %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -fsycl-dead-args-optimization -o %t.out +// RUN: %{run} %t.out //==--------------- multi_ptr.cpp - SYCL multi_ptr test --------------------==// // diff --git a/sycl/test-e2e/Basic/multi_ptr_legacy.cpp b/sycl/test-e2e/Basic/multi_ptr_legacy.cpp index caadef7630107..42d748aa98d17 100644 --- a/sycl/test-e2e/Basic/multi_ptr_legacy.cpp +++ b/sycl/test-e2e/Basic/multi_ptr_legacy.cpp @@ -1,11 +1,7 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-dead-args-optimization %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUN: %clangxx -DRESTRICT_WRITE_ACCESS_TO_CONSTANT_PTR -fsycl -fsycl-targets=%sycl_triple -fsycl-dead-args-optimization %s -o %t1.out -// RUN: %CPU_RUN_PLACEHOLDER %t1.out -// RUN: %GPU_RUN_PLACEHOLDER %t1.out -// RUN: %ACC_RUN_PLACEHOLDER %t1.out +// RUN: %{build} -fsycl-dead-args-optimization -o %t.out +// RUN: %{run} %t.out +// RUN: %{build} -DRESTRICT_WRITE_ACCESS_TO_CONSTANT_PTR -fsycl-dead-args-optimization -o %t1.out +// RUN: %{run} %t1.out //==-------- multi_ptr_legacy.cpp - SYCL multi_ptr legacy test -------------==// // diff --git a/sycl/test-e2e/Basic/multi_ptr_legacy_usm_addr_ext.cpp b/sycl/test-e2e/Basic/multi_ptr_legacy_usm_addr_ext.cpp index cdd6fdc82d355..6c234a9315c44 100644 --- a/sycl/test-e2e/Basic/multi_ptr_legacy_usm_addr_ext.cpp +++ b/sycl/test-e2e/Basic/multi_ptr_legacy_usm_addr_ext.cpp @@ -1,7 +1,8 @@ -// RUN: %clangxx -D__ENABLE_USM_ADDR_SPACE__ -fsycl -fsycl-targets=%sycl_triple -fsycl-dead-args-optimization %s -o %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUN: %clangxx -D__ENABLE_USM_ADDR_SPACE__ -DRESTRICT_WRITE_ACCESS_TO_CONSTANT_PTR -fsycl -fsycl-targets=%sycl_triple -fsycl-dead-args-optimization %s -o %t1.out -// RUN: %ACC_RUN_PLACEHOLDER %t1.out +// REQUIRES: accelerator +// RUN: %{build} -D__ENABLE_USM_ADDR_SPACE__ -fsycl-dead-args-optimization -o %t.out +// RUN: %{run} %t.out +// RUN: %{build} -D__ENABLE_USM_ADDR_SPACE__ -DRESTRICT_WRITE_ACCESS_TO_CONSTANT_PTR -fsycl-dead-args-optimization -o %t1.out +// RUN: %{run} %t1.out //==-- multi_ptr_legacy_usm_addr_ext.cpp - SYCL multi_ptr legacy test ext --==// // diff --git a/sycl/test-e2e/Basic/multi_ptr_usm_addr_ext.cpp b/sycl/test-e2e/Basic/multi_ptr_usm_addr_ext.cpp index a15ccaa49e54e..84dc6d16812aa 100644 --- a/sycl/test-e2e/Basic/multi_ptr_usm_addr_ext.cpp +++ b/sycl/test-e2e/Basic/multi_ptr_usm_addr_ext.cpp @@ -1,5 +1,6 @@ -// RUN: %clangxx -D__ENABLE_USM_ADDR_SPACE__ -fsycl -fsycl-targets=%sycl_triple -fsycl-dead-args-optimization %s -o %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// REQUIRES: accelerator +// RUN: %{build} -D__ENABLE_USM_ADDR_SPACE__ -fsycl-dead-args-optimization -o %t.out +// RUN: %{run} %t.out //==----- multi_ptr_usm_addr_ext.cpp - SYCL multi_ptr test with usm ext ----==// // diff --git a/sycl/test-e2e/Basic/multisource.cpp b/sycl/test-e2e/Basic/multisource.cpp index ddf486eb4c44c..d513d563ff5e2 100644 --- a/sycl/test-e2e/Basic/multisource.cpp +++ b/sycl/test-e2e/Basic/multisource.cpp @@ -7,21 +7,17 @@ //===----------------------------------------------------------------------===// // Separate kernel sources and host code sources -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -c -o %t.kernel.o %s -DINIT_KERNEL -DCALC_KERNEL -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -c -o %t.main.o %s -DMAIN_APP +// RUN: %{build} -c -o %t.kernel.o -DINIT_KERNEL -DCALC_KERNEL +// RUN: %{build} -c -o %t.main.o -DMAIN_APP // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %t.kernel.o %t.main.o -o %t.fat -// RUN: %CPU_RUN_PLACEHOLDER %t.fat -// RUN: %GPU_RUN_PLACEHOLDER %t.fat -// RUN: %ACC_RUN_PLACEHOLDER %t.fat +// RUN: %{run} %t.fat // Multiple sources with kernel code -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -c -o %t.init.o %s -DINIT_KERNEL -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -c -o %t.calc.o %s -DCALC_KERNEL -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -c -o %t.main.o %s -DMAIN_APP +// RUN: %{build} -c -o %t.init.o -DINIT_KERNEL +// RUN: %{build} -c -o %t.calc.o -DCALC_KERNEL +// RUN: %{build} -c -o %t.main.o -DMAIN_APP // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %t.init.o %t.calc.o %t.main.o -o %t.fat -// RUN: %CPU_RUN_PLACEHOLDER %t.fat -// RUN: %GPU_RUN_PLACEHOLDER %t.fat -// RUN: %ACC_RUN_PLACEHOLDER %t.fat +// RUN: %{run} %t.fat #include diff --git a/sycl/test-e2e/Basic/offset-accessor-get_pointer.cpp b/sycl/test-e2e/Basic/offset-accessor-get_pointer.cpp index c3e1352c1850e..c588874d3b6b6 100644 --- a/sycl/test-e2e/Basic/offset-accessor-get_pointer.cpp +++ b/sycl/test-e2e/Basic/offset-accessor-get_pointer.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // Per the SYCL 2020 spec (4.7.6.12 and others) // accessor::get_pointer() returns a pointer to the start of this accessor’s diff --git a/sycl/test-e2e/Basic/out_of_order_queue_status.cpp b/sycl/test-e2e/Basic/out_of_order_queue_status.cpp index 7d3a330d9da05..c9da9facd0294 100644 --- a/sycl/test-e2e/Basic/out_of_order_queue_status.cpp +++ b/sycl/test-e2e/Basic/out_of_order_queue_status.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // Test checks that queue::ext_oneapi_empty() returns status of the out-of-order // queue. diff --git a/sycl/test-e2e/Basic/parallel_for_disable_range_roundup.cpp b/sycl/test-e2e/Basic/parallel_for_disable_range_roundup.cpp index d76e786cb2fc1..36b6fa69a88ef 100755 --- a/sycl/test-e2e/Basic/parallel_for_disable_range_roundup.cpp +++ b/sycl/test-e2e/Basic/parallel_for_disable_range_roundup.cpp @@ -1,12 +1,13 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -D__SYCL_DISABLE_PARALLEL_FOR_RANGE_ROUNDING__ %s -o %t.out +// REQUIRES: gpu +// RUN: %{build} -D__SYCL_DISABLE_PARALLEL_FOR_RANGE_ROUNDING__ -o %t.out -// RUN: env SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE=1 %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER --check-prefix CHECK-DISABLED +// RUN: env SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE=1 %{run} %t.out | FileCheck %s --check-prefix CHECK-DISABLED -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -sycl-std=2017 %s -o %t.out -// RUN: env SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE=1 %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER --check-prefix CHECK-DISABLED +// RUN: %{build} -sycl-std=2017 -o %t.out +// RUN: env SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE=1 %{run} %t.out | FileCheck %s --check-prefix CHECK-DISABLED -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -sycl-std=2020 %s -o %t.out -// RUN: env SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE=1 %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER --check-prefix CHECK-ENABLED +// RUN: %{build} -sycl-std=2020 -o %t.out +// RUN: env SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE=1 %{run} %t.out | FileCheck %s --check-prefix CHECK-ENABLED #include #include diff --git a/sycl/test-e2e/Basic/parallel_for_indexers.cpp b/sycl/test-e2e/Basic/parallel_for_indexers.cpp index ab4d391a42580..beed0e9f55409 100644 --- a/sycl/test-e2e/Basic/parallel_for_indexers.cpp +++ b/sycl/test-e2e/Basic/parallel_for_indexers.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t2.out -// RUN: %CPU_RUN_PLACEHOLDER %t2.out -// RUN: %GPU_RUN_PLACEHOLDER %t2.out -// RUN: %ACC_RUN_PLACEHOLDER %t2.out +// RUN: %{build} -o %t2.out +// RUN: %{run} %t2.out #include diff --git a/sycl/test-e2e/Basic/parallel_for_range_roundup.cpp b/sycl/test-e2e/Basic/parallel_for_range_roundup.cpp index 2107d29620781..4b83927930d71 100644 --- a/sycl/test-e2e/Basic/parallel_for_range_roundup.cpp +++ b/sycl/test-e2e/Basic/parallel_for_range_roundup.cpp @@ -1,5 +1,6 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE=1 %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER +// REQUIRES: gpu +// RUN: %{build} -o %t.out +// RUN: env SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE=1 %{run} %t.out | FileCheck %s #include #include diff --git a/sycl/test-e2e/Basic/parallel_for_user_types.cpp b/sycl/test-e2e/Basic/parallel_for_user_types.cpp index e1cfa66d6319a..b473497d7452e 100644 --- a/sycl/test-e2e/Basic/parallel_for_user_types.cpp +++ b/sycl/test-e2e/Basic/parallel_for_user_types.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // This test performs basic check of supporting user defined class that are // implicitly converted from sycl::item/sycl::nd_item in parallel_for. diff --git a/sycl/test-e2e/Basic/partition_supported.cpp b/sycl/test-e2e/Basic/partition_supported.cpp index 0786a0ac3c0e5..f75a983754112 100644 --- a/sycl/test-e2e/Basic/partition_supported.cpp +++ b/sycl/test-e2e/Basic/partition_supported.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // // Nvidia should not allow sub_devices but does not throw corresponding error. // XFAIL: hip_nvidia diff --git a/sycl/test-e2e/Basic/property_list.cpp b/sycl/test-e2e/Basic/property_list.cpp index 49a6b7ecb901a..42d9e7e127b07 100644 --- a/sycl/test-e2e/Basic/property_list.cpp +++ b/sycl/test-e2e/Basic/property_list.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // This test performs basic check of the SYCL property_list class. diff --git a/sycl/test-e2e/Basic/query.cpp b/sycl/test-e2e/Basic/query.cpp index bb1055018ec1d..61678f1c56196 100644 --- a/sycl/test-e2e/Basic/query.cpp +++ b/sycl/test-e2e/Basic/query.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out +// RUN: %{build} -o %t.out // RUN: env ONEAPI_DEVICE_SELECTOR="*:gpu" %t.out // REQUIRES: gpu-intel-dg1 diff --git a/sycl/test-e2e/Basic/query_emulate_subdevice.cpp b/sycl/test-e2e/Basic/query_emulate_subdevice.cpp index ac013f064e478..1b10460126f65 100644 --- a/sycl/test-e2e/Basic/query_emulate_subdevice.cpp +++ b/sycl/test-e2e/Basic/query_emulate_subdevice.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out +// RUN: %{build} -o %t.out // RUN: env CreateMultipleSubDevices=2 EnableTimestampPacket=1 \ // RUN: NEOReadDebugKeys=1 ONEAPI_DEVICE_SELECTOR="*:gpu" %t.out diff --git a/sycl/test-e2e/Basic/queue/queue.cpp b/sycl/test-e2e/Basic/queue/queue.cpp index e6cb8161d8ff6..bb3105e9dde2e 100644 --- a/sycl/test-e2e/Basic/queue/queue.cpp +++ b/sycl/test-e2e/Basic/queue/queue.cpp @@ -1,5 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %BE_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // // XFAIL: hip_nvidia //==--------------- queue.cpp - SYCL queue test ----------------------------==// diff --git a/sycl/test-e2e/Basic/queue/queue_parallel_for_generic.cpp b/sycl/test-e2e/Basic/queue/queue_parallel_for_generic.cpp index db32903a508bc..d5d94a48da301 100644 --- a/sycl/test-e2e/Basic/queue/queue_parallel_for_generic.cpp +++ b/sycl/test-e2e/Basic/queue/queue_parallel_for_generic.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //=-queue_parallel_for_generic.cpp - SYCL queue parallel_for generic lambda-=// // diff --git a/sycl/test-e2e/Basic/queue/queue_select_device_not_in_context.cpp b/sycl/test-e2e/Basic/queue/queue_select_device_not_in_context.cpp index a5072d172bfa2..30f68dac1b558 100644 --- a/sycl/test-e2e/Basic/queue/queue_select_device_not_in_context.cpp +++ b/sycl/test-e2e/Basic/queue/queue_select_device_not_in_context.cpp @@ -1,5 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %BE_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // This test checks that the queue constructor throws a sycl::exception if the // device selected by the provided selector is not in the specified context. @@ -36,4 +36,4 @@ int main() { "Error code should be sycl::errc::invalid."); } return 0; -} \ No newline at end of file +} diff --git a/sycl/test-e2e/Basic/queue/queue_shortcut_functions.cpp b/sycl/test-e2e/Basic/queue/queue_shortcut_functions.cpp index 3b3fe2b230365..14beee2134dd3 100644 --- a/sycl/test-e2e/Basic/queue/queue_shortcut_functions.cpp +++ b/sycl/test-e2e/Basic/queue/queue_shortcut_functions.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==-- queue_shortcut_functions.cpp - SYCL queue shortcut functions test ---==// // diff --git a/sycl/test-e2e/Basic/queue/release.cpp b/sycl/test-e2e/Basic/queue/release.cpp index cc669864b920a..87f3dc0ae8dbb 100644 --- a/sycl/test-e2e/Basic/queue/release.cpp +++ b/sycl/test-e2e/Basic/queue/release.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER -// RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER -// RUN: env SYCL_PI_TRACE=2 %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER +// RUN: %{build} -o %t.out +// RUN: env SYCL_PI_TRACE=2 %{run} %t.out | FileCheck %s // // XFAIL: hip_nvidia diff --git a/sycl/test-e2e/Basic/range_large_y_dim.cpp b/sycl/test-e2e/Basic/range_large_y_dim.cpp index 8bd65947dff0f..0cca18125bfe2 100644 --- a/sycl/test-e2e/Basic/range_large_y_dim.cpp +++ b/sycl/test-e2e/Basic/range_large_y_dim.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out #include diff --git a/sycl/test-e2e/Basic/range_offset_fit_in_int.cpp b/sycl/test-e2e/Basic/range_offset_fit_in_int.cpp index 85dcc5013ad27..9550eb84310b3 100644 --- a/sycl/test-e2e/Basic/range_offset_fit_in_int.cpp +++ b/sycl/test-e2e/Basic/range_offset_fit_in_int.cpp @@ -1,5 +1,6 @@ -// RUN: %clangxx -fsycl -fsycl-id-queries-fit-in-int -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out +// REQUIRES: cpu +// RUN: %{build} -fsycl-id-queries-fit-in-int -o %t.out +// RUN: %{run} %t.out #include #include diff --git a/sycl/test-e2e/Basic/reqd_work_group_size.cpp b/sycl/test-e2e/Basic/reqd_work_group_size.cpp index 932eff7096b4c..17ed83c67d82c 100644 --- a/sycl/test-e2e/Basic/reqd_work_group_size.cpp +++ b/sycl/test-e2e/Basic/reqd_work_group_size.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // // Failing negative test with HIP // UNSUPPORTED: hip diff --git a/sycl/test-e2e/Basic/sampler/sampler.cpp b/sycl/test-e2e/Basic/sampler/sampler.cpp index 360dc172c6cb5..e0eb1fac2d7e2 100644 --- a/sycl/test-e2e/Basic/sampler/sampler.cpp +++ b/sycl/test-e2e/Basic/sampler/sampler.cpp @@ -1,7 +1,8 @@ // REQUIRES: opencl -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-dead-args-optimization %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -fsycl-dead-args-optimization -o %t.out +// RUN: %{run} %t.out + +// UNSUPPORTED: accelerator //==--------------- sampler.cpp - SYCL sampler basic test ------------------==// // diff --git a/sycl/test-e2e/Basic/scalar_vec_access.cpp b/sycl/test-e2e/Basic/scalar_vec_access.cpp index fc12c7bb86a0d..2f5fab7867c32 100644 --- a/sycl/test-e2e/Basic/scalar_vec_access.cpp +++ b/sycl/test-e2e/Basic/scalar_vec_access.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER -// RUN: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER -// RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out | FileCheck %s //==------- scalar_vec_access.cpp - SYCL scalar access to vec test ---------==// // diff --git a/sycl/test-e2e/Basic/span.cpp b/sycl/test-e2e/Basic/span.cpp index db45ce35c2762..cbe1a9980c088 100644 --- a/sycl/test-e2e/Basic/span.cpp +++ b/sycl/test-e2e/Basic/span.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // // Fails to release USM pointer on HIP for NVIDIA // XFAIL: hip_nvidia diff --git a/sycl/test-e2e/Basic/stream/auto_flush.cpp b/sycl/test-e2e/Basic/stream/auto_flush.cpp index 9da8378613f07..ad7fa0678892f 100644 --- a/sycl/test-e2e/Basic/stream/auto_flush.cpp +++ b/sycl/test-e2e/Basic/stream/auto_flush.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out +// RUN: %{build} -o %t.out // TODO: Enable on host when commands cleanup will be implemented in scheduler // RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER // RUN: %GPU_RUN_ON_LINUX_PLACEHOLDER %t.out %GPU_CHECK_ON_LINUX_PLACEHOLDER diff --git a/sycl/test-e2e/Basic/stream/blocking_pipes_and_stream.cpp b/sycl/test-e2e/Basic/stream/blocking_pipes_and_stream.cpp index 2b19387185be7..3a955da486efa 100644 --- a/sycl/test-e2e/Basic/stream/blocking_pipes_and_stream.cpp +++ b/sycl/test-e2e/Basic/stream/blocking_pipes_and_stream.cpp @@ -1,7 +1,7 @@ // REQUIRES: accelerator -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out | FileCheck %s // Test that usage of blocking pipes and stream object in the same kernel // doesn't cause program hang. diff --git a/sycl/test-e2e/Basic/stream/release_resources_test.cpp b/sycl/test-e2e/Basic/stream/release_resources_test.cpp index 91cb9414d83b4..a6b733d0d62b0 100644 --- a/sycl/test-e2e/Basic/stream/release_resources_test.cpp +++ b/sycl/test-e2e/Basic/stream/release_resources_test.cpp @@ -1,9 +1,7 @@ // Disable temporarily because of the flaky failure. // UNSUPPORTED: windows -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER -// RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER -// RUN: env SYCL_PI_TRACE=2 %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER +// RUN: %{build} -o %t.out +// RUN: env SYCL_PI_TRACE=2 %{run} %t.out | FileCheck %s // Check that buffer used by a stream object is released. diff --git a/sycl/test-e2e/Basic/stream/stream.cpp b/sycl/test-e2e/Basic/stream/stream.cpp index d900d1acc7b20..bc9bacaafd81a 100644 --- a/sycl/test-e2e/Basic/stream/stream.cpp +++ b/sycl/test-e2e/Basic/stream/stream.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -fsycl -fsycl-device-code-split=per_kernel -fsycl-targets=%sycl_triple %s -o %t.out +// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER // RUN: %GPU_RUN_ON_LINUX_PLACEHOLDER %t.out %GPU_CHECK_ON_LINUX_PLACEHOLDER // RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER diff --git a/sycl/test-e2e/Basic/stream/stream_copies_buffer_sync.cpp b/sycl/test-e2e/Basic/stream/stream_copies_buffer_sync.cpp index e32d1d7f997ca..6611de70d4180 100644 --- a/sycl/test-e2e/Basic/stream/stream_copies_buffer_sync.cpp +++ b/sycl/test-e2e/Basic/stream/stream_copies_buffer_sync.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out +// RUN: %{build} -o %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER // RUN: %GPU_RUN_ON_LINUX_PLACEHOLDER %t.out %GPU_CHECK_ON_LINUX_PLACEHOLDER // RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER diff --git a/sycl/test-e2e/Basic/stream/stream_max_stmt_exceed.cpp b/sycl/test-e2e/Basic/stream/stream_max_stmt_exceed.cpp index f333368246099..dd5a9d6ee466b 100644 --- a/sycl/test-e2e/Basic/stream/stream_max_stmt_exceed.cpp +++ b/sycl/test-e2e/Basic/stream/stream_max_stmt_exceed.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out +// RUN: %{build} -o %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER // RUN: %GPU_RUN_ON_LINUX_PLACEHOLDER %t.out %GPU_CHECK_ON_LINUX_PLACEHOLDER // RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER diff --git a/sycl/test-e2e/Basic/sub_group_size_prop.cpp b/sycl/test-e2e/Basic/sub_group_size_prop.cpp index 50d4cd8b83f51..028d5d752e0fc 100644 --- a/sycl/test-e2e/Basic/sub_group_size_prop.cpp +++ b/sycl/test-e2e/Basic/sub_group_size_prop.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-device-code-split=per_kernel -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out +// RUN: %{run} %t.out #include diff --git a/sycl/test-e2e/Basic/subdevice.cpp b/sycl/test-e2e/Basic/subdevice.cpp index 99e37a347f645..a6cb8a17b385b 100644 --- a/sycl/test-e2e/Basic/subdevice.cpp +++ b/sycl/test-e2e/Basic/subdevice.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==------------ subdevice.cpp - SYCL subdevice basic test -----------------==// // diff --git a/sycl/test-e2e/Basic/subdevice_pi.cpp b/sycl/test-e2e/Basic/subdevice_pi.cpp index a3d24fdf392bb..a867e5c486b0c 100644 --- a/sycl/test-e2e/Basic/subdevice_pi.cpp +++ b/sycl/test-e2e/Basic/subdevice_pi.cpp @@ -1,10 +1,11 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out separate equally %CPU_CHECK_PLACEHOLDER --check-prefix CHECK-SEPARATE -// RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out shared equally %CPU_CHECK_PLACEHOLDER --check-prefix CHECK-SHARED --implicit-check-not piContextCreate --implicit-check-not piMemBufferCreate -// RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out fused equally %CPU_CHECK_PLACEHOLDER --check-prefix CHECK-FUSED --implicit-check-not piContextCreate --implicit-check-not piMemBufferCreate -// // Intel OpenCL CPU Runtime supports device partition on all (multi-core) // platforms. Other devices may not support this. +// REQUIRES: cpu +// +// RUN: %{build} -o %t.out +// RUN: env SYCL_PI_TRACE=2 %{run} %t.out separate equally | FileCheck %s --check-prefix CHECK-SEPARATE +// RUN: env SYCL_PI_TRACE=2 %{run} %t.out shared equally | FileCheck %s --check-prefix CHECK-SHARED --implicit-check-not piContextCreate --implicit-check-not piMemBufferCreate +// RUN: env SYCL_PI_TRACE=2 %{run} %t.out fused equally | FileCheck %s --check-prefix CHECK-FUSED --implicit-check-not piContextCreate --implicit-check-not piMemBufferCreate #include #include diff --git a/sycl/test-e2e/Basic/submit_barrier.cpp b/sycl/test-e2e/Basic/submit_barrier.cpp index 034abf4106f86..49fc3f4481213 100755 --- a/sycl/test-e2e/Basic/submit_barrier.cpp +++ b/sycl/test-e2e/Basic/submit_barrier.cpp @@ -1,7 +1,8 @@ // UNSUPPORTED: hip_amd -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out + +// UNSUPPORTED: accelerator #include #include diff --git a/sycl/test-e2e/Basic/subsubdevice.cpp b/sycl/test-e2e/Basic/subsubdevice.cpp index 9a794cb48fad0..039660f92b990 100644 --- a/sycl/test-e2e/Basic/subsubdevice.cpp +++ b/sycl/test-e2e/Basic/subsubdevice.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==------------ subdevice.cpp - SYCL subdevice basic test -----------------==// // diff --git a/sycl/test-e2e/Basic/swizzle_op.cpp b/sycl/test-e2e/Basic/swizzle_op.cpp index a84db3af1ed08..ef9791e7c3946 100644 --- a/sycl/test-e2e/Basic/swizzle_op.cpp +++ b/sycl/test-e2e/Basic/swizzle_op.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==------------ swizzle_op.cpp - SYCL SwizzleOp basic test ----------------==// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/sycl/test-e2e/Basic/sycl-namespace.cpp b/sycl/test-e2e/Basic/sycl-namespace.cpp index c06c9b7674156..f1f34a8ab57af 100644 --- a/sycl/test-e2e/Basic/sycl-namespace.cpp +++ b/sycl/test-e2e/Basic/sycl-namespace.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out #include diff --git a/sycl/test-e2e/Basic/unused_pointer.cpp b/sycl/test-e2e/Basic/unused_pointer.cpp index 50e4eae83aab6..08701954a7ea4 100644 --- a/sycl/test-e2e/Basic/unused_pointer.cpp +++ b/sycl/test-e2e/Basic/unused_pointer.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==---------- unused_pointer.cpp - test pointers in struct --------------==// // diff --git a/sycl/test-e2e/Basic/use_pinned_host_memory.cpp b/sycl/test-e2e/Basic/use_pinned_host_memory.cpp index 9efb9115b9c10..7b3a818fe0f01 100644 --- a/sycl/test-e2e/Basic/use_pinned_host_memory.cpp +++ b/sycl/test-e2e/Basic/use_pinned_host_memory.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out +// RUN: %{build} -o %t.out // RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER #include diff --git a/sycl/test-e2e/Basic/vec_bool.cpp b/sycl/test-e2e/Basic/vec_bool.cpp index 3bb33646fe26a..33e875f5f25ec 100644 --- a/sycl/test-e2e/Basic/vec_bool.cpp +++ b/sycl/test-e2e/Basic/vec_bool.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -std=c++17 -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==-------------- vec_bool.cpp - SYCL vec<> for bool test -----------------==// // diff --git a/sycl/test-e2e/Basic/vector_byte.cpp b/sycl/test-e2e/Basic/vector_byte.cpp index 14a488eac7647..893aa48879cf4 100644 --- a/sycl/test-e2e/Basic/vector_byte.cpp +++ b/sycl/test-e2e/Basic/vector_byte.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -std=c++17 -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -std=c++17 -o %t.out +// RUN: %{run} %t.out //==---------- vector_byte.cpp - SYCL vec<> for std::byte test -------------==// // diff --git a/sycl/test-e2e/Basic/vector_operators.cpp b/sycl/test-e2e/Basic/vector_operators.cpp index d149af28de62b..6ff8f448434ea 100644 --- a/sycl/test-e2e/Basic/vector_operators.cpp +++ b/sycl/test-e2e/Basic/vector_operators.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl-device-code-split=per_kernel -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out +// RUN: %{run} %t.out //==---------- vector_operators.cpp - SYCL vec<> operators test ------------==// // diff --git a/sycl/test-e2e/Basic/work_group_size_prop.cpp b/sycl/test-e2e/Basic/work_group_size_prop.cpp index 6f3790856b52a..e3e0e83a7f26b 100644 --- a/sycl/test-e2e/Basic/work_group_size_prop.cpp +++ b/sycl/test-e2e/Basic/work_group_size_prop.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // // Failing negative test with HIP. Temporarily disabled for CUDA. // XFAIL: hip, cuda diff --git a/sycl/test-e2e/Basic/wrapped_usm_pointers.cpp b/sycl/test-e2e/Basic/wrapped_usm_pointers.cpp index 8073c7b6ecbec..7b81493db6dce 100644 --- a/sycl/test-e2e/Basic/wrapped_usm_pointers.cpp +++ b/sycl/test-e2e/Basic/wrapped_usm_pointers.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==---------- wrapped_usm_pointer.cpp - test pointers in struct ---------==// // diff --git a/sycl/test-e2e/Basic/zero_size_range.cpp b/sycl/test-e2e/Basic/zero_size_range.cpp index dc4dfde7cab4f..c4708bc111e7a 100644 --- a/sycl/test-e2e/Basic/zero_size_range.cpp +++ b/sycl/test-e2e/Basic/zero_size_range.cpp @@ -1,6 +1,6 @@ // REQUIRES: cuda || hip -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out //==--------------- range_zero_size.cpp - SYCL range test ------------------==// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.