Skip to content

Commit 195a437

Browse files
aelovikov-intelaelovikov-intel
authored
[SYCL][E2E] Use %{run*} placeholder in tests (#10470)
Needed to properly handle run_launcher.
1 parent daea2ba commit 195a437

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

‎sycl/test-e2e/FilterSelector/filter_list_cpu_gpu_acc.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010

1111
// RUN: %clangxx -fsycl %S/Inputs/filter_list_queries.cpp -o %t.out
1212

13-
// RUN: env ONEAPI_DEVICE_SELECTOR="*:acc" %t.out | FileCheck %s --check-prefixes=CHECK-ACC-ONLY
14-
// RUN: env ONEAPI_DEVICE_SELECTOR="*:gpu" %t.out | FileCheck %s --check-prefixes=CHECK-GPU-ONLY
15-
// RUN: env ONEAPI_DEVICE_SELECTOR="*:cpu" %t.out | FileCheck %s --check-prefixes=CHECK-CPU-ONLY
13+
// RUN: env ONEAPI_DEVICE_SELECTOR="*:acc" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-ACC-ONLY
14+
// RUN: env ONEAPI_DEVICE_SELECTOR="*:gpu" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-GPU-ONLY
15+
// RUN: env ONEAPI_DEVICE_SELECTOR="*:cpu" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-CPU-ONLY
1616
//
17-
// RUN: env ONEAPI_DEVICE_SELECTOR="*:acc,gpu" %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU
18-
// RUN: env ONEAPI_DEVICE_SELECTOR="*:acc,cpu" %t.out | FileCheck %s --check-prefixes=CHECK-ACC-CPU
17+
// RUN: env ONEAPI_DEVICE_SELECTOR="*:acc,gpu" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU
18+
// RUN: env ONEAPI_DEVICE_SELECTOR="*:acc,cpu" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-ACC-CPU
1919
//
20-
// RUN: env ONEAPI_DEVICE_SELECTOR="*:cpu,acc,gpu" %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU-CPU
20+
// RUN: env ONEAPI_DEVICE_SELECTOR="*:cpu,acc,gpu" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU-CPU
2121
//
2222
// CHECK-ACC-ONLY: Device: acc
2323
// CHECK-ACC-ONLY-NOT: Device: cpu

‎sycl/test-e2e/FilterSelector/select_device.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// RUN: %{build} -o %t.out
2-
// RUN: env ONEAPI_DEVICE_SELECTOR="*:*" %t.out
3-
// RUN: env ONEAPI_DEVICE_SELECTOR="*:cpu" %t.out
4-
// RUN: env ONEAPI_DEVICE_SELECTOR=level_zero:gpu %t.out
5-
// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:gpu %t.out
6-
// RUN: env ONEAPI_DEVICE_SELECTOR='*:cpu;level_zero:gpu' %t.out
7-
// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:acc %t.out
2+
// RUN: env ONEAPI_DEVICE_SELECTOR="*:*" %{run-unfiltered-devices} %t.out
3+
// RUN: env ONEAPI_DEVICE_SELECTOR="*:cpu" %{run-unfiltered-devices} %t.out
4+
// RUN: env ONEAPI_DEVICE_SELECTOR=level_zero:gpu %{run-unfiltered-devices} %t.out
5+
// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:gpu %{run-unfiltered-devices} %t.out
6+
// RUN: env ONEAPI_DEVICE_SELECTOR='*:cpu;level_zero:gpu' %{run-unfiltered-devices} %t.out
7+
// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:acc %{run-unfiltered-devices} %t.out
88
//
99
// Checks if only specified device types can be acquired from select_device
1010
// when ONEAPI_DEVICE_SELECTOR is set

‎sycl/test-e2e/FilterSelector/select_device_acc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %{build} -o %t.out
2-
// RUN: env ONEAPI_DEVICE_SELECTOR='*:acc' %t.out
2+
// RUN: env ONEAPI_DEVICE_SELECTOR='*:acc' %{run-unfiltered-devices} %t.out
33
//
44
// Checks if only specified device types can be acquired from select_device
55
// when ONEAPI_DEVICE_SELECTOR is set

‎sycl/test-e2e/FilterSelector/select_device_cpu.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %{build} -o %t.out
2-
// RUN: env ONEAPI_DEVICE_SELECTOR='*:cpu' %t.out
2+
// RUN: env ONEAPI_DEVICE_SELECTOR='*:cpu' %{run-unfiltered-devices} %t.out
33
//
44
// Checks if only specified device types can be acquired from select_device
55
// when ONEAPI_DEVICE_SELECTOR is set

‎sycl/test-e2e/FilterSelector/select_device_cuda.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %{build} -o %t.out
2-
// RUN: env ONEAPI_DEVICE_SELECTOR=cuda:gpu %t.out
2+
// RUN: env ONEAPI_DEVICE_SELECTOR=cuda:gpu %{run-unfiltered-devices} %t.out
33
//
44
// Checks if only specified device types can be acquired from select_device
55
// when ONEAPI_DEVICE_SELECTOR is set.

‎sycl/test-e2e/FilterSelector/select_device_level_zero.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %{build} -o %t.out
2-
// RUN: env ONEAPI_DEVICE_SELECTOR=level_zero:gpu %t.out
2+
// RUN: env ONEAPI_DEVICE_SELECTOR=level_zero:gpu %{run-unfiltered-devices} %t.out
33
//
44
// Checks if only specified device types can be acquired from select_device
55
// when ONEAPI_DEVICE_SELECTOR is set

‎sycl/test-e2e/FilterSelector/select_device_opencl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %{build} -o %t.out
2-
// RUN: env ONEAPI_DEVICE_SELECTOR='opencl:*' %t.out
2+
// RUN: env ONEAPI_DEVICE_SELECTOR='opencl:*' %{run-unfiltered-devices} %t.out
33
//
44
// Checks if only specified device types can be acquired from select_device
55
// when ONEAPI_DEVICE_SELECTOR is set

0 commit comments

Comments
 (0)