Skip to content

Commit fa89b05

Browse files
aelovikov-intelaelovikov-intel
authored
[SYCL][Test E2E] Use %{build}/%{run} in Plugin tests (#9331)
1 parent f5ea811 commit fa89b05

File tree

53 files changed

+165
-182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+165
-182
lines changed

‎sycl/test-e2e/Plugin/enqueue-arg-order-buffer.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// UNSUPPORTED: hip_nvidia
2-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
3-
// RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER
4-
// RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER
2+
// UNSUPPORTED: accelerator
3+
// RUN: %{build} -o %t.out
4+
// RUN: env SYCL_PI_TRACE=2 %{run} %t.out | FileCheck %s
55

66
#include <iostream>
77
#include <sycl/accessor.hpp>

‎sycl/test-e2e/Plugin/enqueue-arg-order-image.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
// REQUIRES: aspect-ext_intel_legacy_image
22
// UNSUPPORTED: hip
3-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
3+
// RUN: %{build} -o %t.out
44
// Native images are created with host pointers only with host unified memory
55
// support, enforce it for this test.
6-
// RUN: env SYCL_HOST_UNIFIED_MEMORY=1 SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER
7-
// RUN: env SYCL_HOST_UNIFIED_MEMORY=1 SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER
6+
// RUN: env SYCL_HOST_UNIFIED_MEMORY=1 SYCL_PI_TRACE=2 %{run} %t.out | FileCheck %s
87

98
#include <iostream>
109
#include <sycl/accessor.hpp>

‎sycl/test-e2e/Plugin/interop-buffer-cuda.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// REQUIRES: cuda
22

3-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
4-
// RUN: %GPU_RUN_PLACEHOLDER %t.out
3+
// RUN: %{build} -o %t.out
4+
// RUN: %{run} %t.out
55

66
//==--- interop-cuda.cpp - SYCL test for CUDA buffer interop API ----------===//
77
//

‎sycl/test-e2e/Plugin/interop-cuda-experimental.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// REQUIRES: cuda && cuda_dev_kit
22

3-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %cuda_options %s -o %t.out
4-
// RUN: %GPU_RUN_PLACEHOLDER %t.out
3+
// RUN: %{build} %cuda_options -o %t.out
4+
// RUN: %{run} %t.out
55

66
#define SYCL_EXT_ONEAPI_BACKEND_CUDA_EXPERIMENTAL 1
77
#include <sycl/ext/oneapi/experimental/backend/cuda.hpp>

‎sycl/test-e2e/Plugin/interop-experimental-single-TU-SYCL-CUDA-compilation.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %cuda_options -lcudart -lcuda -x cuda %s -o %t.out
2-
// RUN: %GPU_RUN_PLACEHOLDER %t.out
31
// REQUIRES: cuda && cuda_dev_kit
2+
// RUN: %{build} %cuda_options -lcudart -lcuda -x cuda -o %t.out
3+
// RUN: %{run} %t.out
44

55
#include <cuda.h>
66
#include <sycl/sycl.hpp>

‎sycl/test-e2e/Plugin/interop-l0-direct.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// REQUIRES: level_zero, level_zero_dev_kit
2-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
3-
// RUN: env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %GPU_RUN_PLACEHOLDER %t.out
4-
// RUN: env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %GPU_RUN_PLACEHOLDER %t.out
52
// UNSUPPORTED: ze_debug-1,ze_debug4
3+
// RUN: %{build} %level_zero_options -o %t.out
4+
// RUN: env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{run} %t.out
5+
// RUN: env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{run} %t.out
66

77
#include <iostream>
88
#include <level_zero/ze_api.h>

‎sycl/test-e2e/Plugin/interop-level-zero-buffer-multi-dim.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// REQUIRES: level_zero, level_zero_dev_kit
2-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
3-
// RUN: env ONEAPI_DEVICE_SELECTOR='level_zero:*' %GPU_RUN_PLACEHOLDER %t.out
2+
// RUN: %{build} %level_zero_options -o %t.out
3+
// RUN: %{run} %t.out
44

55
// Test 2D and 3D interoperability buffers for the Level Zero backend.
66

‎sycl/test-e2e/Plugin/interop-level-zero-buffer-ownership.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// L0 plugin incorrectly reports memory leaks because it doesn't take into
33
// account direct calls to L0 API.
44
// UNSUPPORTED: ze_debug-1,ze_debug4
5-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
6-
// RUN: env SYCL_PI_LEVEL_ZERO_DISABLE_USM_ALLOCATOR=1 ONEAPI_DEVICE_SELECTOR='level_zero:*' ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out 2>&1 | FileCheck %s
5+
// RUN: %{build} %level_zero_options -o %t.out
6+
// RUN: env SYCL_PI_LEVEL_ZERO_DISABLE_USM_ALLOCATOR=1 ZE_DEBUG=1 %{run} %t.out 2>&1 | FileCheck %s
77

88
// Test for Level Zero buffer interop API.
99
// Check the following cases:

‎sycl/test-e2e/Plugin/interop-level-zero-buffer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// L0 plugin incorrectly reports memory leaks because it doesn't take into
33
// account direct calls to L0 API.
44
// UNSUPPORTED: ze_debug-1,ze_debug4
5-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
6-
// RUN: env ONEAPI_DEVICE_SELECTOR='level_zero:*' ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out
5+
// RUN: %{build} %level_zero_options -o %t.out
6+
// RUN: env ZE_DEBUG=1 %{run} %t.out
77

88
// Test interoperability buffer for the Level Zer backend
99

‎sycl/test-e2e/Plugin/interop-level-zero-get-native-mem.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// L0 plugin incorrectly reports memory leaks because it doesn't take into
33
// account direct calls to L0 API.
44
// UNSUPPORTED: ze_debug-1,ze_debug4
5-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
6-
// RUN: %GPU_RUN_PLACEHOLDER %t.out
5+
// RUN: %{build} %level_zero_options -o %t.out
6+
// RUN: %{run} %t.out
77

88
// Test get_native_mem for the Level Zero backend.
99

‎sycl/test-e2e/Plugin/interop-level-zero-image-get-native-mem.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// REQUIRES: level_zero, level_zero_dev_kit
2-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
3-
// RUN: %GPU_RUN_PLACEHOLDER %t.out 2>&1 | FileCheck %s
2+
// RUN: %{build} %level_zero_options -o %t.out
3+
// RUN: %{run} %t.out 2>&1 | FileCheck %s
44

55
// we use the interop to get the native image handle and then use that to make a
66
// new image and enumerate the pixels.

‎sycl/test-e2e/Plugin/interop-level-zero-image-ownership.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// REQUIRES: level_zero, level_zero_dev_kit
2-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
3-
// RUN: env ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out 2>&1 | FileCheck %s
2+
// RUN: %{build} %level_zero_options -o %t.out
3+
// RUN: env ZE_DEBUG=1 %{run} %t.out 2>&1 | FileCheck %s
44

55
// This test verifies that ownership is working correctly.
66
// If ownership is ::transfer then the ~image destructor will end up calling

‎sycl/test-e2e/Plugin/interop-level-zero-image.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// REQUIRES: level_zero, level_zero_dev_kit
2-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
3-
// RUN: %GPU_RUN_PLACEHOLDER %t.out
2+
// RUN: %{build} %level_zero_options -o %t.out
3+
// RUN: %{run} %t.out
44

55
// This test verifies that make_image is working for 1D, 2D and 3D images.
66
// We instantiate an image with L0, set its body, then use a host accessor to

‎sycl/test-e2e/Plugin/interop-level-zero-interop-task-mem-buffer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// REQUIRES: level_zero, level_zero_dev_kit
2-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
3-
// RUN: %GPU_RUN_PLACEHOLDER %t.out
2+
// RUN: %{build} %level_zero_options -o %t.out
3+
// RUN: %{run} %t.out
44

55
// Test for Level Zero interop_task for buffer.
66
// Level-Zero

‎sycl/test-e2e/Plugin/interop-level-zero-interop-task-mem-image.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// REQUIRES: aspect-ext_intel_legacy_image
22
// REQUIRES: level_zero, level_zero_dev_kit
3-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
4-
// RUN: %GPU_RUN_PLACEHOLDER %t.out
3+
// RUN: %{build} %level_zero_options -o %t.out
4+
// RUN: %{run} %t.out
55

66
// Test for Level Zero interop_task for image.
77
// Level-Zero

‎sycl/test-e2e/Plugin/interop-level-zero-keep-ownership.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// REQUIRES: level_zero, level_zero_dev_kit
2-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %level_zero_options
3-
// RUN: %GPU_RUN_PLACEHOLDER %t.out
2+
// RUN: %{build} -o %t.out %level_zero_options
3+
// RUN: %{run} %t.out
44

55
// Test for Level Zero interop API where SYCL RT doesn't take ownership
66

‎sycl/test-e2e/Plugin/interop-level-zero-thread.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// REQUIRES: level_zero, level_zero_dev_kit
2-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %level_zero_options %threads_lib
3-
// RUN: %BE_RUN_PLACEHOLDER %t.out
2+
// RUN: %{build} -o %t.out %level_zero_options %threads_lib
3+
// RUN: %{run} %t.out
44
//
55
// CHECK: Running iteration 0
66
// CHECK: Running iteration 1

‎sycl/test-e2e/Plugin/interop-level-zero.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// REQUIRES: level_zero, level_zero_dev_kit
2-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
3-
// RUN: env SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %GPU_RUN_PLACEHOLDER %t.out
2+
// RUN: %{build} %level_zero_options -o %t.out
3+
// RUN: env SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{run} %t.out
44
// UNSUPPORTED: ze_debug-1,ze_debug4
55

66
// Test for Level Zero interop API

‎sycl/test-e2e/Plugin/interop-opencl-interop-task-mem.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// REQUIRES: opencl, opencl_icd
22

3-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %opencl_lib
4-
// RUN: %GPU_RUN_PLACEHOLDER %t.out
3+
// RUN: %{build} -o %t.out %opencl_lib
4+
// RUN: %{run} %t.out
55

66
// Test for OpenCL interop_task.
77

‎sycl/test-e2e/Plugin/interop-opencl-make-kernel-bundle.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
// REQUIRES: opencl, opencl_icd
22

3-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %opencl_lib
4-
// RUN: %CPU_RUN_PLACEHOLDER %t.out
5-
// RUN: %GPU_RUN_PLACEHOLDER %t.out
6-
// RUN: %ACC_RUN_PLACEHOLDER %t.out
3+
// RUN: %{build} -o %t.out %opencl_lib
4+
// RUN: %{run} %t.out
75

86
#include <CL/cl.h>
97

‎sycl/test-e2e/Plugin/interop-opencl-make-kernel.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
// REQUIRES: opencl, opencl_icd
22

3-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %opencl_lib
4-
// RUN: %CPU_RUN_PLACEHOLDER %t.out
5-
// RUN: %GPU_RUN_PLACEHOLDER %t.out
6-
// RUN: %ACC_RUN_PLACEHOLDER %t.out
3+
// RUN: %{build} -o %t.out %opencl_lib
4+
// RUN: %{run} %t.out
75

86
// Test for OpenCL make_kernel
97

‎sycl/test-e2e/Plugin/interop-opencl.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
// REQUIRES: opencl
22

3-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
4-
// RUN: env ONEAPI_DEVICE_SELECTOR="opencl:*" %CPU_RUN_PLACEHOLDER %t.out
5-
// RUN: env ONEAPI_DEVICE_SELECTOR="opencl:*" %GPU_RUN_PLACEHOLDER %t.out
6-
// RUN: env ONEAPI_DEVICE_SELECTOR="opencl:*" %ACC_RUN_PLACEHOLDER %t.out
3+
// RUN: %{build} -o %t.out
4+
// RUN: %{run} %t.out
75

86
//==-- interop-opencl.cpp - SYCL test for OpenCL interop API --------------===//
97
//

‎sycl/test-e2e/Plugin/level-zero-event-leak.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// REQUIRES: level_zero, level_zero_dev_kit
22
//
3-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
4-
// RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" ZE_DEBUG=4 %GPU_RUN_PLACEHOLDER %t.out wait 2>&1 %GPU_CHECK_PLACEHOLDER
5-
// RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" ZE_DEBUG=4 %GPU_RUN_PLACEHOLDER %t.out nowait 2>&1 %GPU_CHECK_PLACEHOLDER
3+
// RUN: %{build} %level_zero_options -o %t.out
4+
// RUN: env ZE_DEBUG=4 %{run} %t.out wait 2>&1 | FileCheck %s
5+
// RUN: env ZE_DEBUG=4 %{run} %t.out nowait 2>&1 | FileCheck %s
66
//
7-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -DCHECK_INORDER -o %t.inorder.out
8-
// RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" ZE_DEBUG=4 %GPU_RUN_PLACEHOLDER %t.inorder.out wait 2>&1 %GPU_CHECK_PLACEHOLDER
9-
// RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" ZE_DEBUG=4 %GPU_RUN_PLACEHOLDER %t.inorder.out nowait 2>&1 %GPU_CHECK_PLACEHOLDER
7+
// RUN: %{build} %level_zero_options -DCHECK_INORDER -o %t.inorder.out
8+
// RUN: env ZE_DEBUG=4 %{run} %t.inorder.out wait 2>&1 | FileCheck %s
9+
// RUN: env ZE_DEBUG=4 %{run} %t.inorder.out nowait 2>&1 | FileCheck %s
1010
//
1111
// CHECK-NOT: LEAK
1212

‎sycl/test-e2e/Plugin/level-zero-usm-capabilities.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// REQUIRES: gpu, level_zero, level_zero_dev_kit
2-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
3-
// RUN: %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
2+
// RUN: %{build} %level_zero_options -o %t.out
3+
// RUN: %{run} %t.out 2>&1 | FileCheck %s
44

55
#include <iostream>
66
#include <sycl/sycl.hpp>

‎sycl/test-e2e/Plugin/level_zero_batch_barrier.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// REQUIRES: gpu, level_zero, level_zero_dev_kit
22

3-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
4-
// RUN: env SYCL_PI_TRACE=2 ZE_DEBUG=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
3+
// RUN: %{build} %level_zero_options -o %t.out
4+
// RUN: env SYCL_PI_TRACE=2 ZE_DEBUG=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{run} %t.out 2>&1 | FileCheck %s
55

66
// Test that the wait with a barrier is fully batched, i.e. it doesn't cause
77
// extra submissions.

‎sycl/test-e2e/Plugin/level_zero_batch_event_status.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// See https://github.com/intel/llvm-test-suite/issues/906
22
// REQUIRES: gpu, level_zero
33

4-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
4+
// RUN: %{build} -o %t.out
55

66
// Set batching to 4 explicitly
7-
// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=4 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_PI_TRACE=2 ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out 2>&1 | FileCheck %s
7+
// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=4 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_PI_TRACE=2 ZE_DEBUG=1 %{run} %t.out 2>&1 | FileCheck %s
88

99
// level_zero_batch_test.cpp
1010
//

0 commit comments

Comments
 (0)