[SYCL][Test E2E] Use %{build}/%{run} in ESIMD tests (#9328)

Author: aelovikov-intel

sycl/test-e2e/ESIMD/BitonicSortK.cpp

@@ -8,7 +8,7 @@
 // REQUIRES: gpu
 // UNSUPPORTED: gpu-intel-gen9 && windows
 // UNSUPPORTED: cuda || hip || esimd_emulator
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 #include "BitonicSortK.hpp"

sycl/test-e2e/ESIMD/BitonicSortK_emu.cpp

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 // REQUIRES: esimd_emulator
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 #define ESIMD_EMU
 

sycl/test-e2e/ESIMD/BitonicSortKv2.cpp

@@ -8,8 +8,8 @@
 // REQUIRES: gpu
 // UNSUPPORTED: gpu-intel-gen9 && windows
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 #include "esimd_test_utils.hpp"
 

sycl/test-e2e/ESIMD/InlineAsm/asm_glb.cpp

@@ -7,8 +7,8 @@
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 #include "../esimd_test_utils.hpp"
 

sycl/test-e2e/ESIMD/InlineAsm/asm_simd_mask.cpp

@@ -8,8 +8,8 @@
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 #include "../esimd_test_utils.hpp"
 

sycl/test-e2e/ESIMD/InlineAsm/asm_simd_view.cpp

@@ -8,8 +8,8 @@
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 #include "../esimd_test_utils.hpp"
 

sycl/test-e2e/ESIMD/InlineAsm/asm_vadd.cpp

@@ -8,8 +8,8 @@
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 #include "../esimd_test_utils.hpp"
 

sycl/test-e2e/ESIMD/PrefixSum.cpp

@@ -8,8 +8,8 @@
 // REQUIRES: gpu
 // UNSUPPORTED: gpu-intel-gen9 && windows
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out 20
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out 20
 
 #include "esimd_test_utils.hpp"
 

sycl/test-e2e/ESIMD/Prefix_Local_sum1.cpp

@@ -8,8 +8,8 @@
 // REQUIRES: gpu
 // UNSUPPORTED: gpu-intel-gen9 && windows
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out 20
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out 20
 
 #include "esimd_test_utils.hpp"
 

sycl/test-e2e/ESIMD/Prefix_Local_sum2.cpp

@@ -8,8 +8,8 @@
 // REQUIRES: gpu
 // UNSUPPORTED: gpu-intel-gen9 && windows
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out 20
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out 20
 
 #include "esimd_test_utils.hpp"
 

sycl/test-e2e/ESIMD/Prefix_Local_sum3.cpp

@@ -8,8 +8,8 @@
 // REQUIRES: gpu
 // UNSUPPORTED: gpu-intel-gen9 && windows
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 #include "esimd_test_utils.hpp"
 

sycl/test-e2e/ESIMD/Stencil.cpp

@@ -8,8 +8,8 @@
 // REQUIRES: gpu
 // UNSUPPORTED: gpu-intel-gen9 && windows
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 #include "esimd_test_utils.hpp"
 

sycl/test-e2e/ESIMD/acc_gather_scatter_rgba.cpp

@@ -8,8 +8,8 @@
 // REQUIRES: gpu
 // UNSUPPORTED: gpu-intel-gen9 && windows
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 //
 // The test checks functionality of the gather_rgba/scatter_rgba accessor-based
 // ESIMD intrinsics.

sycl/test-e2e/ESIMD/acc_gather_scatter_rgba_stateless.cpp

@@ -8,8 +8,8 @@
 // REQUIRES: gpu
 // UNSUPPORTED: gpu-intel-gen9 && windows
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl -fsycl-esimd-force-stateless-mem %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -fsycl-esimd-force-stateless-mem -o %t.out
+// RUN: %{run} %t.out
 //
 // The test checks functionality of the gather_rgba/scatter_rgba accessor-based
 // ESIMD intrinsics when stateless memory accesses are enforced, i.e. accessor

sycl/test-e2e/ESIMD/accessor.cpp

@@ -8,8 +8,8 @@
 // REQUIRES: gpu
 // UNSUPPORTED: gpu-intel-gen9 && windows
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl -D_CRT_SECURE_NO_WARNINGS=1 %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -D_CRT_SECURE_NO_WARNINGS=1 -o %t.out
+// RUN: %{run} %t.out
 
 // This test checks that accessor-based memory accesses work correctly in ESIMD.
 

sycl/test-e2e/ESIMD/accessor_gather_scatter.cpp

@@ -8,8 +8,8 @@
 // REQUIRES: gpu
 // UNSUPPORTED: gpu-intel-gen9 && windows
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 //
 // The test checks functionality of the gather/scatter accessor-based ESIMD
 // intrinsics.

sycl/test-e2e/ESIMD/accessor_gather_scatter_stateless.cpp

@@ -8,8 +8,8 @@
 // REQUIRES: gpu
 // UNSUPPORTED: gpu-intel-gen9 && windows
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl -fsycl-esimd-force-stateless-mem %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -fsycl-esimd-force-stateless-mem -o %t.out
+// RUN: %{run} %t.out
 //
 // The test checks functionality of the gather/scatter accessor-based ESIMD
 // intrinsics when stateless memory accesses are enforced, i.e. accessor based

sycl/test-e2e/ESIMD/accessor_load_store.cpp

@@ -12,7 +12,7 @@
 // REQUIRES: gpu
 // UNSUPPORTED: gpu-intel-gen9 && windows
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 #include "accessor_load_store.hpp"

sycl/test-e2e/ESIMD/accessor_load_store_stateless.cpp

@@ -13,7 +13,7 @@
 // REQUIRES: gpu
 // UNSUPPORTED: gpu-intel-gen9 && windows
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl -fsycl-esimd-force-stateless-mem %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -fsycl-esimd-force-stateless-mem -o %t.out
+// RUN: %{run} %t.out
 
 #include "accessor_load_store.hpp"

sycl/test-e2e/ESIMD/accessor_stateless.cpp

@@ -8,8 +8,8 @@
 // REQUIRES: gpu
 // UNSUPPORTED: gpu-intel-gen9 && windows
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl -fsycl-esimd-force-stateless-mem -D_CRT_SECURE_NO_WARNINGS=1 %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -fsycl-esimd-force-stateless-mem -D_CRT_SECURE_NO_WARNINGS=1 -o %t.out
+// RUN: %{run} %t.out
 
 // This test checks that accessor-based memory accesses work correctly in ESIMD
 // when stateless memory accesses are enforced, i.e. accessor based accesses

sycl/test-e2e/ESIMD/addc.cpp

@@ -7,8 +7,8 @@
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 // The test verifies ESIMD API that adds 2 32-bit integer scalars/vectors with
 // carry returning the result as 2 parts: carry flag the input modified operand

sycl/test-e2e/ESIMD/aot_mixed.cpp

@@ -13,9 +13,9 @@
 // UNSUPPORTED: windows
 // UNSUPPORTED: linux
 // RUN: %clangxx -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend=spir64_gen "-device gen9" -o %t.sycl.out -DENABLE_SYCL=0 %s
-// RUN: %GPU_RUN_PLACEHOLDER %t.sycl.out
+// RUN: %{run} %t.sycl.out
 // RUN: %clangxx -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend=spir64_gen "-device gen9" -o %t.out %s
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{run} %t.out
 
 // This test checks the following ESIMD ahead-of-time compilation scenarios:
 // 1) When the application contains both SYCL and ESIMD kernel, thus requiring

sycl/test-e2e/ESIMD/api/ballot.cpp

@@ -8,8 +8,8 @@
 // REQUIRES: gpu
 // UNSUPPORTED: gpu-intel-gen9 && windows
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 // This test checks esimd::ballot function.
 

sycl/test-e2e/ESIMD/api/bin_and_cmp_ops_heavy.cpp

@@ -9,8 +9,8 @@
 // REQUIRES: gpu && !gpu-intel-pvc
 // UNSUPPORTED: gpu-intel-gen9 && windows
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl-device-code-split=per_kernel -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
+// RUN: %{run} %t.out
 
 // Tests various binary operations applied to simd objects.
 

sycl/test-e2e/ESIMD/api/bin_and_cmp_ops_heavy_pvc.cpp

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu-intel-pvc
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 // Tests various binary operations applied to simd objects.
 // PVC variant of the test - adds bfloat16 and tfloat32.

sycl/test-e2e/ESIMD/api/esimd_bit_ops.cpp

@@ -8,8 +8,8 @@
 // REQUIRES: gpu
 // UNSUPPORTED: gpu-intel-gen9 && windows
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl %s -fsycl-device-code-split=per_kernel -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
+// RUN: %{run} %t.out
 //
 // Smoke test for esimd bit operations APIs.
 

sycl/test-e2e/ESIMD/api/esimd_merge.cpp

@@ -8,8 +8,8 @@
 // REQUIRES: gpu
 // UNSUPPORTED: gpu-intel-gen9 && windows
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 // This is a functional test for esimd::merge free functions, as well as
 // two-input version of the simd_obj_impl::merge.

sycl/test-e2e/ESIMD/api/esimd_pack_unpack_mask.cpp

@@ -8,8 +8,8 @@
 // REQUIRES: gpu
 // UNSUPPORTED: gpu-intel-gen9 && windows
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl %s -fsycl-device-code-split=per_kernel -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
+// RUN: %{run} %t.out
 //
 // Smoke test for the esimd pack_mask/unpack_mask APIs.
 

sycl/test-e2e/ESIMD/api/esimd_rgba_smoke.cpp

@@ -8,8 +8,8 @@
 // REQUIRES: gpu
 // UNSUPPORTED: gpu-intel-gen9 && windows
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 // Smoke test for scatter/gather also illustrating correct use of these APIs
 

sycl/test-e2e/ESIMD/api/esimd_rgba_smoke_64.cpp

@@ -8,8 +8,8 @@
 // REQUIRES: gpu
 // UNSUPPORTED: gpu-intel-gen9 && windows
 // UNSUPPORTED: cuda || hip
-// RUN: %clangxx -fsycl %s -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 // Smoke test for scatter/gather also illustrating correct use of these APIs
 // 64 bit offset variant of the test - uses 64 bit offsets.

sycl/test-e2e/ESIMD/api/functional/ctors/ctor_array_core.cpp

@@ -12,8 +12,8 @@
 // The current "REQUIRES" should be replaced with "gpu" only as mentioned in
 // "XREQUIRES".
 // UNSUPPORTED: cuda, hip
-// RUN: %clangxx -fsycl %s -fsycl-device-code-split=per_kernel -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
+// RUN: %{run} %t.out
 //
 // Test for simd constructor from an array.
 // This test uses different data types, sizes and different simd constructor

sycl/test-e2e/ESIMD/api/functional/ctors/ctor_array_fp_extra.cpp

@@ -12,8 +12,8 @@
 // The current "REQUIRES" should be replaced with "gpu" only as mentioned in
 // "XREQUIRES".
 // UNSUPPORTED: cuda, hip
-// RUN: %clangxx -fsycl %s -fsycl-device-code-split=per_kernel -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
+// RUN: %{run} %t.out
 //
 // Test for simd constructor from an array.
 // This test uses extra fp data types, sizes and different simd constructor

sycl/test-e2e/ESIMD/api/functional/ctors/ctor_broadcast_core.cpp

@@ -12,8 +12,8 @@
 // The current "REQUIRES" should be replaced with "gpu" only as mentioned in
 // "XREQUIRES".
 // UNSUPPORTED: cuda, hip
-// XRUN: %clangxx -fsycl %s -fsycl-device-code-split=per_kernel -o %t.out
-// XRUN: %GPU_RUN_PLACEHOLDER %t.out
+// XRUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
+// XRUN: %{run} %t.out
 //
 // Test for simd broadcast constructor.
 // This test uses different data types, sizes and different simd constructor

sycl/test-e2e/ESIMD/api/functional/ctors/ctor_broadcast_fp_extra.cpp

@@ -12,8 +12,8 @@
 // The current "REQUIRES" should be replaced with "gpu" only as mentioned in
 // "XREQUIRES".
 // UNSUPPORTED: cuda, hip
-// RUN: %clangxx -fsycl %s -fsycl-device-code-split=per_kernel -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
+// RUN: %{run} %t.out
 //
 // Test for simd broadcast constructor.
 // This test uses fp extra data types, sizes and different simd constructor

sycl/test-e2e/ESIMD/api/functional/ctors/ctor_converting_core.cpp

@@ -12,8 +12,8 @@
 // The current "REQUIRES" should be replaced with "gpu" only as mentioned in
 // "XREQUIRES".
 // UNSUPPORTED: cuda, hip
-// RUN: %clangxx -fsycl %s -fsycl-device-code-split=per_kernel -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
+// RUN: %{run} %t.out
 //
 // Test for simd converting constructor for core types.
 // This test uses different data types, dimensionality, base and step values and

sycl/test-e2e/ESIMD/api/functional/ctors/ctor_converting_fp_extra.cpp

@@ -12,8 +12,8 @@
 // The current "REQUIRES" should be replaced with "gpu" only as mentioned in
 // "XREQUIRES".
 // UNSUPPORTED: cuda, hip
-// RUN: %clangxx -fsycl %s -fsycl-device-code-split=per_kernel -o %t.out
-// RUN: %GPU_RUN_PLACEHOLDER %t.out
+// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
+// RUN: %{run} %t.out
 //
 // Test for simd converting constructor for extra fp types.
 // This test uses extra fp data types with different dimensionality, base and