From 8dd7aafd12b37c52979ac109d064067524d64da1 Mon Sep 17 00:00:00 2001 From: Andrei Elovikov Date: Fri, 5 May 2023 11:29:27 -0700 Subject: [PATCH 1/2] [SYCL][Test E2E] Use %{build}/%{run} in DeviceLib tests --- sycl/test-e2e/DeviceLib/ITTAnnotations/atomic.cpp | 7 ++----- sycl/test-e2e/DeviceLib/ITTAnnotations/barrier.cpp | 7 ++----- sycl/test-e2e/DeviceLib/assert-windows.cpp | 8 +++----- sycl/test-e2e/DeviceLib/assert.cpp | 2 +- .../DeviceLib/built-ins/ext_native_math.cpp | 6 ++---- .../DeviceLib/built-ins/ext_native_math_fp16.cpp | 6 ++---- .../DeviceLib/built-ins/fast-math-flag.cpp | 6 ++---- sycl/test-e2e/DeviceLib/built-ins/ftz-flag.cpp | 6 ++---- .../DeviceLib/built-ins/marray_integer.cpp | 6 ++---- sycl/test-e2e/DeviceLib/built-ins/nan.cpp | 6 ++---- sycl/test-e2e/DeviceLib/built-ins/printf.cpp | 12 ++++-------- .../test-e2e/DeviceLib/built-ins/scalar_common.cpp | 6 ++---- .../DeviceLib/built-ins/scalar_geometric.cpp | 6 ++---- .../DeviceLib/built-ins/scalar_integer.cpp | 6 ++---- sycl/test-e2e/DeviceLib/built-ins/scalar_math.cpp | 6 ++---- .../test-e2e/DeviceLib/built-ins/scalar_math_2.cpp | 6 ++---- .../DeviceLib/built-ins/scalar_relational.cpp | 6 ++---- .../test-e2e/DeviceLib/built-ins/vector_common.cpp | 6 ++---- .../DeviceLib/built-ins/vector_geometric.cpp | 6 ++---- .../DeviceLib/built-ins/vector_integer.cpp | 6 ++---- sycl/test-e2e/DeviceLib/built-ins/vector_math.cpp | 6 ++---- .../DeviceLib/built-ins/vector_relational.cpp | 6 ++---- sycl/test-e2e/DeviceLib/cmath-aot.cpp | 8 ++++---- sycl/test-e2e/DeviceLib/cmath_fp64_test.cpp | 11 +++++------ sycl/test-e2e/DeviceLib/cmath_test.cpp | 4 ++-- sycl/test-e2e/DeviceLib/complex-fpga.cpp | 4 ++-- .../imf_bfloat16_integeral_convesions.cpp | 12 ++++-------- sycl/test-e2e/DeviceLib/imf_double2bfloat16.cpp | 9 +++++---- sycl/test-e2e/DeviceLib/imf_double2half.cpp | 9 +++++---- sycl/test-e2e/DeviceLib/imf_float2bfloat16.cpp | 12 ++++-------- sycl/test-e2e/DeviceLib/imf_fp16_trivial_test.cpp | 5 +++-- sycl/test-e2e/DeviceLib/imf_fp32_test.cpp | 14 +++++--------- sycl/test-e2e/DeviceLib/imf_fp64_test.cpp | 12 ++++-------- sycl/test-e2e/DeviceLib/imf_half_type_cast.cpp | 9 +++++---- sycl/test-e2e/DeviceLib/imf_simd_emulate_test.cpp | 12 ++++-------- sycl/test-e2e/DeviceLib/math_fp64_test.cpp | 2 +- sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp | 5 ++--- sycl/test-e2e/DeviceLib/math_test.cpp | 4 ++-- sycl/test-e2e/DeviceLib/math_test_marray_vec.cpp | 6 ++---- .../DeviceLib/math_test_marray_vec_fp16.cpp | 6 ++---- sycl/test-e2e/DeviceLib/math_windows_test.cpp | 5 ++--- sycl/test-e2e/DeviceLib/separate_compile_test.cpp | 7 +++---- .../DeviceLib/std_complex_math_fp64_test.cpp | 11 +++++------ sycl/test-e2e/DeviceLib/std_complex_math_test.cpp | 11 +++++------ sycl/test-e2e/DeviceLib/string_test.cpp | 5 +++-- 45 files changed, 125 insertions(+), 196 deletions(-) diff --git a/sycl/test-e2e/DeviceLib/ITTAnnotations/atomic.cpp b/sycl/test-e2e/DeviceLib/ITTAnnotations/atomic.cpp index 7c61c69b014cf..9a65398f0d402 100644 --- a/sycl/test-e2e/DeviceLib/ITTAnnotations/atomic.cpp +++ b/sycl/test-e2e/DeviceLib/ITTAnnotations/atomic.cpp @@ -1,10 +1,7 @@ // UNSUPPORTED: hip -// RUN: %clangxx -fsycl -fsycl-instrument-device-code %s -o %t.out \ -// RUN: -fsycl-targets=%sycl_triple -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -fsycl-instrument-device-code -o %t.out +// RUN: %{run} %t.out #include "CL/sycl.hpp" diff --git a/sycl/test-e2e/DeviceLib/ITTAnnotations/barrier.cpp b/sycl/test-e2e/DeviceLib/ITTAnnotations/barrier.cpp index 35ff092a88cf8..8168eaba7d253 100644 --- a/sycl/test-e2e/DeviceLib/ITTAnnotations/barrier.cpp +++ b/sycl/test-e2e/DeviceLib/ITTAnnotations/barrier.cpp @@ -1,10 +1,7 @@ // UNSUPPORTED: hip -// RUN: %clangxx -fsycl -fsycl-instrument-device-code %s -o %t.out \ -// RUN: -fsycl-targets=%sycl_triple -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -fsycl-instrument-device-code -o %t.out +// RUN: %{run} %t.out #include "CL/sycl.hpp" #include diff --git a/sycl/test-e2e/DeviceLib/assert-windows.cpp b/sycl/test-e2e/DeviceLib/assert-windows.cpp index 964def2248269..2a6dede5e4ffb 100644 --- a/sycl/test-e2e/DeviceLib/assert-windows.cpp +++ b/sycl/test-e2e/DeviceLib/assert-windows.cpp @@ -4,7 +4,7 @@ // Disable the test until the fix reaches SYCL test infrastructure. // XFAIL: * // -// RUN: %clangxx -fsycl %s -o %t.out +// RUN: %{build} -o %t.out // // MSVC implementation of assert does not call an unreachable built-in, so the // program doesn't terminate when fallback is used. @@ -13,15 +13,13 @@ // explicitly. Since the test is going to crash, we'll have to follow a similar // approach as on Linux - call the test in a subprocess. // -// RUN: env SYCL_PI_TRACE=1 SYCL_DEVICELIB_INHIBIT_NATIVE=1 CL_CONFIG_USE_VECTORIZER=False %CPU_RUN_PLACEHOLDER %t.out >%t.stdout.pi.fallback -// RUN: env SHOULD_CRASH=1 SYCL_DEVICELIB_INHIBIT_NATIVE=1 CL_CONFIG_USE_VECTORIZER=False %CPU_RUN_PLACEHOLDER %t.out >%t.stdout.msg.fallback +// RUN: env SYCL_PI_TRACE=1 SYCL_DEVICELIB_INHIBIT_NATIVE=1 CL_CONFIG_USE_VECTORIZER=False %{run} %t.out | FileCheck %s --check-prefix=CHECK-FALLBACK +// RUN: env SHOULD_CRASH=1 SYCL_DEVICELIB_INHIBIT_NATIVE=1 CL_CONFIG_USE_VECTORIZER=False %{run} %t.out | FileCheck %s --check-prefix=CHECK-MESSAGE // -// RUN: FileCheck %s --check-prefix=CHECK-MESSAGE --input-file %t.stdout.msg.fallback // CHECK-MESSAGE: {{.*}}assert-windows.cpp:{{[0-9]+}}: (null): global id: // [{{[0-3]}},0,0], local id: [{{[0-3]}},0,0] Assertion `accessorC[wiID] == 0 && // "Invalid value"` failed. // -// RUN: FileCheck %s --input-file %t.stdout.pi.fallback --check-prefix=CHECK-FALLBACK // CHECK-FALLBACK: ---> piProgramLink #include diff --git a/sycl/test-e2e/DeviceLib/assert.cpp b/sycl/test-e2e/DeviceLib/assert.cpp index 2968974c508ab..42bd24fe2ed31 100644 --- a/sycl/test-e2e/DeviceLib/assert.cpp +++ b/sycl/test-e2e/DeviceLib/assert.cpp @@ -1,5 +1,5 @@ // REQUIRES: (cpu || cuda ) && linux -// RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl -fsycl-targets=%sycl_triple %s -o %t.out +// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out // (see the other RUN lines below; it is a bit complicated) // // assert() call in device code guarantees nothing: on some devices it behaves diff --git a/sycl/test-e2e/DeviceLib/built-ins/ext_native_math.cpp b/sycl/test-e2e/DeviceLib/built-ins/ext_native_math.cpp index 4ab4dcf4d138e..4bd465be96dc8 100644 --- a/sycl/test-e2e/DeviceLib/built-ins/ext_native_math.cpp +++ b/sycl/test-e2e/DeviceLib/built-ins/ext_native_math.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-device-code-split=per_kernel %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 // Tests oneapi extension native tanh math function for sycl::vec and // sycl::marray float cases. diff --git a/sycl/test-e2e/DeviceLib/built-ins/ext_native_math_fp16.cpp b/sycl/test-e2e/DeviceLib/built-ins/ext_native_math_fp16.cpp index 8e25e86188597..6330775c0b708 100644 --- a/sycl/test-e2e/DeviceLib/built-ins/ext_native_math_fp16.cpp +++ b/sycl/test-e2e/DeviceLib/built-ins/ext_native_math_fp16.cpp @@ -1,8 +1,6 @@ // REQUIRES: aspect-fp16 -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-device-code-split=per_kernel %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 // OpenCL CPU driver does not support cl_khr_fp16 extension for this reason this // test is compiled with the -fsycl-device-code-split flag diff --git a/sycl/test-e2e/DeviceLib/built-ins/fast-math-flag.cpp b/sycl/test-e2e/DeviceLib/built-ins/fast-math-flag.cpp index d90845e58d3e1..26934041d0a87 100644 --- a/sycl/test-e2e/DeviceLib/built-ins/fast-math-flag.cpp +++ b/sycl/test-e2e/DeviceLib/built-ins/fast-math-flag.cpp @@ -1,7 +1,5 @@ -// RUN: %clangxx -fsycl -ffast-math -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} -ffast-math -o %t.out +// RUN: %{run} %t.out #include #include diff --git a/sycl/test-e2e/DeviceLib/built-ins/ftz-flag.cpp b/sycl/test-e2e/DeviceLib/built-ins/ftz-flag.cpp index ed5058d1dd890..37917e103c7a6 100644 --- a/sycl/test-e2e/DeviceLib/built-ins/ftz-flag.cpp +++ b/sycl/test-e2e/DeviceLib/built-ins/ftz-flag.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 -Xclang -fdenormal-fp-math-f32="preserve-sign,preserve-sign" %s -o %t.out %{mathflags} -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -Xclang -fdenormal-fp-math-f32="preserve-sign,preserve-sign" -o %t.out %{mathflags} +// RUN: %{run} %t.out #include #include diff --git a/sycl/test-e2e/DeviceLib/built-ins/marray_integer.cpp b/sycl/test-e2e/DeviceLib/built-ins/marray_integer.cpp index e58cf5b7df074..c4eb526f23c04 100644 --- a/sycl/test-e2e/DeviceLib/built-ins/marray_integer.cpp +++ b/sycl/test-e2e/DeviceLib/built-ins/marray_integer.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/DeviceLib/built-ins/nan.cpp b/sycl/test-e2e/DeviceLib/built-ins/nan.cpp index 3cd6ace3d2bf8..d4726016b72ae 100644 --- a/sycl/test-e2e/DeviceLib/built-ins/nan.cpp +++ b/sycl/test-e2e/DeviceLib/built-ins/nan.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 #include diff --git a/sycl/test-e2e/DeviceLib/built-ins/printf.cpp b/sycl/test-e2e/DeviceLib/built-ins/printf.cpp index 27d72070aa98a..fcbb2dd029b3c 100644 --- a/sycl/test-e2e/DeviceLib/built-ins/printf.cpp +++ b/sycl/test-e2e/DeviceLib/built-ins/printf.cpp @@ -2,15 +2,11 @@ // HIP doesn't support printf. // CUDA doesn't support vector format specifiers ("%v"). // -// RUN: %clangxx -fsycl -fsycl-device-code-split=per_kernel -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} -fsycl-device-code-split=per_kernel -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 #include diff --git a/sycl/test-e2e/DeviceLib/built-ins/scalar_common.cpp b/sycl/test-e2e/DeviceLib/built-ins/scalar_common.cpp index 9104eec4b05ef..0bb04b5dc336a 100644 --- a/sycl/test-e2e/DeviceLib/built-ins/scalar_common.cpp +++ b/sycl/test-e2e/DeviceLib/built-ins/scalar_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 #include diff --git a/sycl/test-e2e/DeviceLib/built-ins/scalar_geometric.cpp b/sycl/test-e2e/DeviceLib/built-ins/scalar_geometric.cpp index ce8efce2510da..81c60ed484806 100644 --- a/sycl/test-e2e/DeviceLib/built-ins/scalar_geometric.cpp +++ b/sycl/test-e2e/DeviceLib/built-ins/scalar_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/DeviceLib/built-ins/scalar_integer.cpp b/sycl/test-e2e/DeviceLib/built-ins/scalar_integer.cpp index dd3318e1b3d9f..e590fd4404fb4 100644 --- a/sycl/test-e2e/DeviceLib/built-ins/scalar_integer.cpp +++ b/sycl/test-e2e/DeviceLib/built-ins/scalar_integer.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/DeviceLib/built-ins/scalar_math.cpp b/sycl/test-e2e/DeviceLib/built-ins/scalar_math.cpp index 54bd597bf8dca..aafb32379e479 100644 --- a/sycl/test-e2e/DeviceLib/built-ins/scalar_math.cpp +++ b/sycl/test-e2e/DeviceLib/built-ins/scalar_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/DeviceLib/built-ins/scalar_math_2.cpp b/sycl/test-e2e/DeviceLib/built-ins/scalar_math_2.cpp index d84c431793b99..3bce5c5dc2ee2 100644 --- a/sycl/test-e2e/DeviceLib/built-ins/scalar_math_2.cpp +++ b/sycl/test-e2e/DeviceLib/built-ins/scalar_math_2.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/DeviceLib/built-ins/scalar_relational.cpp b/sycl/test-e2e/DeviceLib/built-ins/scalar_relational.cpp index 3b6d461be31f3..17398b2e1de97 100644 --- a/sycl/test-e2e/DeviceLib/built-ins/scalar_relational.cpp +++ b/sycl/test-e2e/DeviceLib/built-ins/scalar_relational.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/DeviceLib/built-ins/vector_common.cpp b/sycl/test-e2e/DeviceLib/built-ins/vector_common.cpp index 611c605bc5644..11feb90d71d19 100644 --- a/sycl/test-e2e/DeviceLib/built-ins/vector_common.cpp +++ b/sycl/test-e2e/DeviceLib/built-ins/vector_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 #include diff --git a/sycl/test-e2e/DeviceLib/built-ins/vector_geometric.cpp b/sycl/test-e2e/DeviceLib/built-ins/vector_geometric.cpp index 306b91aa5f5e5..86c83fa6d956b 100644 --- a/sycl/test-e2e/DeviceLib/built-ins/vector_geometric.cpp +++ b/sycl/test-e2e/DeviceLib/built-ins/vector_geometric.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/DeviceLib/built-ins/vector_integer.cpp b/sycl/test-e2e/DeviceLib/built-ins/vector_integer.cpp index deed92c3e96cc..4f920ba318a0e 100644 --- a/sycl/test-e2e/DeviceLib/built-ins/vector_integer.cpp +++ b/sycl/test-e2e/DeviceLib/built-ins/vector_integer.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/DeviceLib/built-ins/vector_math.cpp b/sycl/test-e2e/DeviceLib/built-ins/vector_math.cpp index 27d48f2227033..bbd80cc2599ce 100644 --- a/sycl/test-e2e/DeviceLib/built-ins/vector_math.cpp +++ b/sycl/test-e2e/DeviceLib/built-ins/vector_math.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/DeviceLib/built-ins/vector_relational.cpp b/sycl/test-e2e/DeviceLib/built-ins/vector_relational.cpp index cc1ee6faa5e24..66afebdd0165b 100644 --- a/sycl/test-e2e/DeviceLib/built-ins/vector_relational.cpp +++ b/sycl/test-e2e/DeviceLib/built-ins/vector_relational.cpp @@ -1,9 +1,7 @@ // FIXME unsupported on windows (opencl and level-zero) until fix of libdevice // UNSUPPORTED: windows && (opencl || level_zero) -// 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/DeviceLib/cmath-aot.cpp b/sycl/test-e2e/DeviceLib/cmath-aot.cpp index 28ab9ef937661..2d88cff7127d7 100644 --- a/sycl/test-e2e/DeviceLib/cmath-aot.cpp +++ b/sycl/test-e2e/DeviceLib/cmath-aot.cpp @@ -2,13 +2,13 @@ // UNSUPPORTED: windows // RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/cmath_test.cpp -o %t.cmath.out -// RUN: %CPU_RUN_PLACEHOLDER %t.cmath.out +// RUN: %{run} %t.cmath.out // RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/cmath_fp64_test.cpp -o %t.cmath.fp64.out -// RUN: %CPU_RUN_PLACEHOLDER %t.cmath.fp64.out +// RUN: %{run} %t.cmath.fp64.out // RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/std_complex_math_test.cpp -o %t.complex.out -// RUN: %CPU_RUN_PLACEHOLDER %t.complex.out +// RUN: %{run} %t.complex.out // RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/std_complex_math_fp64_test.cpp -o %t.complex.fp64.out -// RUN: %CPU_RUN_PLACEHOLDER %t.complex.fp64.out +// RUN: %{run} %t.complex.fp64.out diff --git a/sycl/test-e2e/DeviceLib/cmath_fp64_test.cpp b/sycl/test-e2e/DeviceLib/cmath_fp64_test.cpp index 96705c88834bf..5eed9de316bb7 100644 --- a/sycl/test-e2e/DeviceLib/cmath_fp64_test.cpp +++ b/sycl/test-e2e/DeviceLib/cmath_fp64_test.cpp @@ -1,11 +1,10 @@ // REQUIRES: aspect-fp64 -// RUN: %clangxx -fsycl %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// UNSUPPORTED: gpu +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out -// RUN: %clangxx -fsycl -fsycl-device-lib-jit-link %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -fsycl-device-lib-jit-link -o %t.out +// RUN: %{run} %t.out #include "math_utils.hpp" #include diff --git a/sycl/test-e2e/DeviceLib/cmath_test.cpp b/sycl/test-e2e/DeviceLib/cmath_test.cpp index 90670fb83e59b..d631c2e0432ac 100644 --- a/sycl/test-e2e/DeviceLib/cmath_test.cpp +++ b/sycl/test-e2e/DeviceLib/cmath_test.cpp @@ -1,12 +1,12 @@ // DEFINE: %{mathflags} = %if cl_options %{/clang:-fno-fast-math%} %else %{-fno-fast-math%} // UNSUPPORTED: hip -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fno-builtin %{mathflags} %s -o %t.out +// RUN: %{build} -fno-builtin %{mathflags} -o %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUN: %clangxx -fsycl -fno-builtin -fsycl-device-lib-jit-link %{mathflags} %s -o %t.out +// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link %{mathflags} -o %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test-e2e/DeviceLib/complex-fpga.cpp b/sycl/test-e2e/DeviceLib/complex-fpga.cpp index 19f7c74369cc2..34601655fe0dc 100644 --- a/sycl/test-e2e/DeviceLib/complex-fpga.cpp +++ b/sycl/test-e2e/DeviceLib/complex-fpga.cpp @@ -9,7 +9,7 @@ // REQUIRES: opencl-aot, accelerator // RUN: %clangxx -fsycl -fsycl-targets=spir64_fpga %S/std_complex_math_test.cpp -o %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{run} %t.out // RUN: %clangxx -fsycl -fintelfpga %S/std_complex_math_test.cpp -o %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{run} %t.out diff --git a/sycl/test-e2e/DeviceLib/imf_bfloat16_integeral_convesions.cpp b/sycl/test-e2e/DeviceLib/imf_bfloat16_integeral_convesions.cpp index 884bff79e4b71..1f55973fe979e 100644 --- a/sycl/test-e2e/DeviceLib/imf_bfloat16_integeral_convesions.cpp +++ b/sycl/test-e2e/DeviceLib/imf_bfloat16_integeral_convesions.cpp @@ -1,12 +1,8 @@ -// RUN: %clangxx -fsycl %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out -// RUN: %clangxx -fsycl -fno-builtin -fsycl-device-lib-jit-link %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t.out +// RUN: %{run} %t.out // // UNSUPPORTED: cuda || hip diff --git a/sycl/test-e2e/DeviceLib/imf_double2bfloat16.cpp b/sycl/test-e2e/DeviceLib/imf_double2bfloat16.cpp index 21d3b723bc646..21bf1f4c5a140 100644 --- a/sycl/test-e2e/DeviceLib/imf_double2bfloat16.cpp +++ b/sycl/test-e2e/DeviceLib/imf_double2bfloat16.cpp @@ -1,9 +1,10 @@ +// REQUIRES: gpu // REQUIRES: aspect-fp64 -// RUN: %clangxx -fsycl %s -o %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out -// RUN: %clangxx -fsycl -fno-builtin -fsycl-device-lib-jit-link %s -o %t1.out -// RUN: %GPU_RUN_PLACEHOLDER %t1.out +// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t1.out +// RUN: %{run} %t1.out // // UNSUPPORTED: cuda || hip diff --git a/sycl/test-e2e/DeviceLib/imf_double2half.cpp b/sycl/test-e2e/DeviceLib/imf_double2half.cpp index 6c1c18bacd385..0cd93c1e350ee 100644 --- a/sycl/test-e2e/DeviceLib/imf_double2half.cpp +++ b/sycl/test-e2e/DeviceLib/imf_double2half.cpp @@ -1,9 +1,10 @@ +// REQUIRES: gpu // REQUIRES: aspect-fp64, aspect-fp16 -// RUN: %clangxx -fsycl %s -o %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out -// RUN: %clangxx -fsycl -fno-builtin -fsycl-device-lib-jit-link %s -o %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t.out +// RUN: %{run} %t.out // // UNSUPPORTED: cuda || hip diff --git a/sycl/test-e2e/DeviceLib/imf_float2bfloat16.cpp b/sycl/test-e2e/DeviceLib/imf_float2bfloat16.cpp index 2315b55c27a1d..ed8237cfcdd14 100644 --- a/sycl/test-e2e/DeviceLib/imf_float2bfloat16.cpp +++ b/sycl/test-e2e/DeviceLib/imf_float2bfloat16.cpp @@ -1,12 +1,8 @@ -// RUN: %clangxx -fsycl %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out -// RUN: %clangxx -fsycl -fno-builtin -fsycl-device-lib-jit-link %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t.out +// RUN: %{run} %t.out // // UNSUPPORTED: cuda || hip diff --git a/sycl/test-e2e/DeviceLib/imf_fp16_trivial_test.cpp b/sycl/test-e2e/DeviceLib/imf_fp16_trivial_test.cpp index c8afe49f5a1ee..82fbcd16f42cc 100644 --- a/sycl/test-e2e/DeviceLib/imf_fp16_trivial_test.cpp +++ b/sycl/test-e2e/DeviceLib/imf_fp16_trivial_test.cpp @@ -1,7 +1,8 @@ +// REQUIRES: gpu // REQUIRES: aspect-fp16 // DEFINE: %{mathflags} = %if cl_options %{/clang:-fno-fast-math%} %else %{-fno-fast-math%} -// RUN: %clangxx -fsycl %{mathflags} %s -o %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} %{mathflags} -o %t.out +// RUN: %{run} %t.out // UNSUPPORTED: cuda || hip diff --git a/sycl/test-e2e/DeviceLib/imf_fp32_test.cpp b/sycl/test-e2e/DeviceLib/imf_fp32_test.cpp index 659d32ac32fdb..74e2b4346abfe 100644 --- a/sycl/test-e2e/DeviceLib/imf_fp32_test.cpp +++ b/sycl/test-e2e/DeviceLib/imf_fp32_test.cpp @@ -1,12 +1,8 @@ -// RUN: %clangxx -fsycl %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out - -// RUN: %clangxx -fsycl -fno-builtin -fsycl-device-lib-jit-link %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out + +// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t.out +// RUN: %{run} %t.out // // UNSUPPORTED: cuda || hip diff --git a/sycl/test-e2e/DeviceLib/imf_fp64_test.cpp b/sycl/test-e2e/DeviceLib/imf_fp64_test.cpp index 805a7e68c8c1c..3cfd7422e96f4 100644 --- a/sycl/test-e2e/DeviceLib/imf_fp64_test.cpp +++ b/sycl/test-e2e/DeviceLib/imf_fp64_test.cpp @@ -1,13 +1,9 @@ // REQUIRES: aspect-fp64 -// RUN: %clangxx -fsycl %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out -// RUN: %clangxx -fsycl -fno-builtin -fsycl-device-lib-jit-link %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t.out +// RUN: %{run} %t.out // // UNSUPPORTED: cuda || hip diff --git a/sycl/test-e2e/DeviceLib/imf_half_type_cast.cpp b/sycl/test-e2e/DeviceLib/imf_half_type_cast.cpp index e61b76b756ae4..c5e82ef529850 100644 --- a/sycl/test-e2e/DeviceLib/imf_half_type_cast.cpp +++ b/sycl/test-e2e/DeviceLib/imf_half_type_cast.cpp @@ -1,9 +1,10 @@ +// REQUIRES: gpu // REQUIRES: aspect-fp16 -// RUN: %clangxx -fsycl %s -o %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out -// RUN: %clangxx -fsycl -fno-builtin -fsycl-device-lib-jit-link %s -o %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t.out +// RUN: %{run} %t.out // // UNSUPPORTED: cuda || hip diff --git a/sycl/test-e2e/DeviceLib/imf_simd_emulate_test.cpp b/sycl/test-e2e/DeviceLib/imf_simd_emulate_test.cpp index 5c870de49f076..b4fefb1da2a96 100644 --- a/sycl/test-e2e/DeviceLib/imf_simd_emulate_test.cpp +++ b/sycl/test-e2e/DeviceLib/imf_simd_emulate_test.cpp @@ -1,12 +1,8 @@ -// RUN: %clangxx -fsycl %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out -// RUN: %clangxx -fsycl -fno-builtin -fsycl-device-lib-jit-link %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t.out +// RUN: %{run} %t.out // // UNSUPPORTED: cuda || hip diff --git a/sycl/test-e2e/DeviceLib/math_fp64_test.cpp b/sycl/test-e2e/DeviceLib/math_fp64_test.cpp index 1fcf81389446f..3464bb692e69d 100644 --- a/sycl/test-e2e/DeviceLib/math_fp64_test.cpp +++ b/sycl/test-e2e/DeviceLib/math_fp64_test.cpp @@ -1,6 +1,6 @@ // REQUIRES: aspect-fp64 // UNSUPPORTED: hip -// 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 diff --git a/sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp b/sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp index e9e5640c72ed8..b30ae8983b407 100644 --- a/sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp +++ b/sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp @@ -3,10 +3,9 @@ // REQUIRES: aspect-fp64 // REQUIRES: (cpu || accelerator) && windows -// RUN: %clangxx -fsycl -c %s -o %t.o +// RUN: %{build} -c -o %t.o // RUN: %clangxx -fsycl %t.o %sycl_libs_dir/../bin/libsycl-cmath-fp64.o -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{run} %t.out #include "math_utils.hpp" #include #include diff --git a/sycl/test-e2e/DeviceLib/math_test.cpp b/sycl/test-e2e/DeviceLib/math_test.cpp index 24a9e4a5f2418..5eaae090520ff 100644 --- a/sycl/test-e2e/DeviceLib/math_test.cpp +++ b/sycl/test-e2e/DeviceLib/math_test.cpp @@ -1,10 +1,10 @@ // UNSUPPORTED: hip -// 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: %clangxx -fsycl -fsycl-device-lib-jit-link %s -o %t.out +// RUN: %{build} -fsycl-device-lib-jit-link -o %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test-e2e/DeviceLib/math_test_marray_vec.cpp b/sycl/test-e2e/DeviceLib/math_test_marray_vec.cpp index ff7cc480acc1d..85da10fa1065b 100644 --- a/sycl/test-e2e/DeviceLib/math_test_marray_vec.cpp +++ b/sycl/test-e2e/DeviceLib/math_test_marray_vec.cpp @@ -2,10 +2,8 @@ // TODO fix windows failures // UNSUPPORTED: windows && (level_zero || opencl) -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %{mathflags} %s -o %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} %{mathflags} -o %t.out +// RUN: %{run} %t.out // tests sycl floating point math functions for sycl::vec and sycl::marray float // and double cases. diff --git a/sycl/test-e2e/DeviceLib/math_test_marray_vec_fp16.cpp b/sycl/test-e2e/DeviceLib/math_test_marray_vec_fp16.cpp index 8bf84c6192c64..05c00db250ead 100644 --- a/sycl/test-e2e/DeviceLib/math_test_marray_vec_fp16.cpp +++ b/sycl/test-e2e/DeviceLib/math_test_marray_vec_fp16.cpp @@ -1,8 +1,6 @@ // REQUIRES: aspect-fp16 -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out // tests sycl floating point math functions for sycl::vec and sycl::marray fp16 // cases. diff --git a/sycl/test-e2e/DeviceLib/math_windows_test.cpp b/sycl/test-e2e/DeviceLib/math_windows_test.cpp index 0f0a5449153e5..dbd2341c26586 100644 --- a/sycl/test-e2e/DeviceLib/math_windows_test.cpp +++ b/sycl/test-e2e/DeviceLib/math_windows_test.cpp @@ -2,10 +2,9 @@ // Disabled on windows due to bug VS 2019 missing math builtins // REQUIRES: (accelerator || cpu) && windows -// RUN: %clangxx -fsycl -c %s -o %t.o +// RUN: %{build} -c -o %t.o // RUN: %clangxx -fsycl %t.o %sycl_libs_dir/../bin/libsycl-cmath.o -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{run} %t.out #include "math_utils.hpp" #include #include diff --git a/sycl/test-e2e/DeviceLib/separate_compile_test.cpp b/sycl/test-e2e/DeviceLib/separate_compile_test.cpp index a1b120e1f264b..7c0d508c4b062 100644 --- a/sycl/test-e2e/DeviceLib/separate_compile_test.cpp +++ b/sycl/test-e2e/DeviceLib/separate_compile_test.cpp @@ -1,15 +1,14 @@ +// UNSUPPORTED: gpu // RUN: %clangxx -fsycl -fsycl-link %S/std_complex_math_test.cpp -o %t_device.o // RUN: %clangxx -fsycl-device-only -Xclang -fsycl-int-header=std_complex_math_test_ihdr.h %S/std_complex_math_test.cpp -Wno-sycl-strict // >> host compilation... // RUN: %clangxx %cxx_std_optionc++17 %include_option std_complex_math_test_ihdr.h -c %S/std_complex_math_test.cpp -o %t_host.o %sycl_options -Wno-sycl-strict // RUN: %clangxx %t_host.o %t_device.o -o %t.out %sycl_options -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{run} %t.out // RUN: %clangxx -fsycl -fsycl-link %S/std_complex_math_fp64_test.cpp -o %t_fp64_device.o // RUN: %clangxx -fsycl-device-only -Xclang -fsycl-int-header=std_complex_math_fp64_test_ihdr.h %S/std_complex_math_fp64_test.cpp -Wno-sycl-strict // >> host compilation... // RUN: %clangxx %cxx_std_optionc++17 %include_option std_complex_math_fp64_test_ihdr.h -c %S/std_complex_math_fp64_test.cpp -o %t_fp64_host.o %sycl_options -Wno-sycl-strict // RUN: %clangxx %t_fp64_host.o %t_fp64_device.o -o %t_fp64.out %sycl_options -// RUN: %CPU_RUN_PLACEHOLDER %t_fp64.out -// RUN: %ACC_RUN_PLACEHOLDER %t_fp64.out +// RUN: %{run} %t.out diff --git a/sycl/test-e2e/DeviceLib/std_complex_math_fp64_test.cpp b/sycl/test-e2e/DeviceLib/std_complex_math_fp64_test.cpp index a48f44a71be31..4af4d602aba18 100644 --- a/sycl/test-e2e/DeviceLib/std_complex_math_fp64_test.cpp +++ b/sycl/test-e2e/DeviceLib/std_complex_math_fp64_test.cpp @@ -1,11 +1,10 @@ // REQUIRES: aspect-fp64 -// RUN: %clangxx -fsycl %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// UNSUPPORTED: gpu +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out -// RUN: %clangxx -fsycl -fsycl-device-lib-jit-link %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -fsycl-device-lib-jit-link -o %t.out +// RUN: %{run} %t.out #include #include diff --git a/sycl/test-e2e/DeviceLib/std_complex_math_test.cpp b/sycl/test-e2e/DeviceLib/std_complex_math_test.cpp index 5adcd2ef0ad9c..c806be43b4b17 100644 --- a/sycl/test-e2e/DeviceLib/std_complex_math_test.cpp +++ b/sycl/test-e2e/DeviceLib/std_complex_math_test.cpp @@ -1,10 +1,9 @@ -// RUN: %clangxx -fsycl %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// UNSUPPORTED: gpu +// RUN: %{build} -o %t.out +// RUN: %{run} %t.out -// RUN: %clangxx -fsycl -fsycl-device-lib-jit-link %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUN: %{build} -fsycl-device-lib-jit-link -o %t.out +// RUN: %{run} %t.out #include #include diff --git a/sycl/test-e2e/DeviceLib/string_test.cpp b/sycl/test-e2e/DeviceLib/string_test.cpp index a3b485569a82d..2b66ef8fd9ba6 100644 --- a/sycl/test-e2e/DeviceLib/string_test.cpp +++ b/sycl/test-e2e/DeviceLib/string_test.cpp @@ -1,10 +1,11 @@ // UNSUPPORTED: hip -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fno-builtin %s -o %t.out +// RUN: %{build} -fno-builtin -o %t.out +// RUN: %{run} %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUN: %clangxx -fsycl -fno-builtin -fsycl-device-lib-jit-link %s -o %t.out +// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out From 234a98dea0d92f265ed99048ec0059f8511935fb Mon Sep 17 00:00:00 2001 From: aelovikov-intel Date: Mon, 8 May 2023 11:11:27 -0700 Subject: [PATCH 2/2] Update sycl/test-e2e/DeviceLib/string_test.cpp --- sycl/test-e2e/DeviceLib/string_test.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/sycl/test-e2e/DeviceLib/string_test.cpp b/sycl/test-e2e/DeviceLib/string_test.cpp index 2b66ef8fd9ba6..5a708b7d36749 100644 --- a/sycl/test-e2e/DeviceLib/string_test.cpp +++ b/sycl/test-e2e/DeviceLib/string_test.cpp @@ -1,6 +1,5 @@ // UNSUPPORTED: hip // RUN: %{build} -fno-builtin -o %t.out -// RUN: %{run} %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out