Skip to content

Commit 868a812

Browse files
aelovikov-intelaelovikov-intel
authored
[SYCL][Test E2E] Use %{build}/%{run} in DeprecatedFeatures tests (#9340)
1 parent 9cf7ee4 commit 868a812

11 files changed

+21
-36
lines changed

‎sycl/test-e2e/DeprecatedFeatures/deprecated.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
// RUN: %clangxx -D__SYCL_INTERNAL_API -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
2-
// RUN: %CPU_RUN_PLACEHOLDER %t.out
3-
// RUN: %GPU_RUN_PLACEHOLDER %t.out
4-
// RUN: %ACC_RUN_PLACEHOLDER %t.out
1+
// RUN: %{build} -D__SYCL_INTERNAL_API -o %t.out
2+
// RUN: %{run} %t.out
53

64
//==------------- deprecated.cpp - SYCL 2020 deprecation test --------------==//
75
//

‎sycl/test-e2e/DeprecatedFeatures/deprecated_intel_ext_device.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
// RUN: %clangxx -fsycl %s -o %t.out
2-
// RUN: env ONEAPI_DEVICE_SELECTOR=level_zero:gpu %t.out
3-
// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:gpu %t.out
4-
//
51
// REQUIRES: gpu
6-
// UNSUPPORTED: hip
2+
// REQUIRES: opencl || level_zero
3+
// RUN: %{build} -o %t.out
4+
// RUN: %{run} %t.out
5+
//
76
// Temporarily disable on L0 due to fails in CI
87
// UNSUPPORTED: level_zero
98

‎sycl/test-e2e/DeprecatedFeatures/deprecated_sycl_device_filter.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx -fsycl %s -o %t.out
1+
// RUN: %{build} -o %t.out
22
// RUN: env SYCL_DEVICE_FILTER='*' %t.out &> %t.log
33
// RUN: FileCheck %s < %t.log
44
//

‎sycl/test-e2e/DeprecatedFeatures/device_platform_interop.cpp‎

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

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

86
//==------------------- device_platform_interop.cpp ------------------------==//
97
// The test for SYCL device and platform interop constructors

‎sycl/test-e2e/DeprecatedFeatures/kernel_interop.cpp‎

Lines changed: 2 additions & 4 deletions
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 -D__SYCL_INTERNAL_API %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} -D__SYCL_INTERNAL_API -o %t.out %opencl_lib
4+
// RUN: %{run} %t.out
75

86
//==--------------- kernel_interop.cpp - SYCL kernel ocl interop test ------==//
97
//

‎sycl/test-e2e/DeprecatedFeatures/opencl_interop.cpp‎

Lines changed: 2 additions & 4 deletions
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 -D__SYCL_INTERNAL_API %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} -D__SYCL_INTERNAL_API -o %t.out %opencl_lib
4+
// RUN: %{run} %t.out
75

86
#include <cassert>
97
#include <exception>

‎sycl/test-e2e/DeprecatedFeatures/platform.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -D__SYCL_INTERNAL_API %s -o %t.out
1+
// RUN: %{build} -D__SYCL_INTERNAL_API -o %t.out
22
// RUN: %BE_RUN_PLACEHOLDER %t.out
33
//==--------------- platform.cpp - SYCL platform test ----------------------==//
44
//

‎sycl/test-e2e/DeprecatedFeatures/queue_old_interop.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -D__SYCL_INTERNAL_API %s -o %t.out
1+
// RUN: %{build} -D__SYCL_INTERNAL_API -o %t.out
22
// RUN: %BE_RUN_PLACEHOLDER %t.out
33
//
44
// hip_nvidia has problems constructing queues due to `No device of requested

‎sycl/test-e2e/DeprecatedFeatures/sampler_ocl.cpp‎

Lines changed: 2 additions & 4 deletions
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 -D__SYCL_INTERNAL_API -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} -D__SYCL_INTERNAL_API -o %t.out %opencl_lib
4+
// RUN: %{run} %t.out
75

86
//==--------------- sampler.cpp - SYCL sampler basic test ------------------==//
97
//

‎sycl/test-e2e/DeprecatedFeatures/set_arg_interop.cpp‎

Lines changed: 2 additions & 4 deletions
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 -D__SYCL_INTERNAL_API -o %t.out %opencl_lib -O3
4-
// RUN: %CPU_RUN_PLACEHOLDER %t.out
5-
// RUN: %GPU_RUN_PLACEHOLDER %t.out
6-
// RUN: %ACC_RUN_PLACEHOLDER %t.out
3+
// RUN: %{build} -D__SYCL_INTERNAL_API -o %t.out %opencl_lib -O3
4+
// RUN: %{run} %t.out
75

86
#include <sycl/sycl.hpp>
97

0 commit comments

Comments
 (0)