Skip to content

Commit 7d2fe90

Browse files
ayylolayylol
authored
[SYCL][E2E] Add missing %{run-unfiltered-devices} to e2e tests (#15636)
A number of tests execute without using either the `%{run}` or `%{run-unfiltered-devices}` expansion. This patch adds `%{run-unfiltered-devices}` to these test (and `%{run}` to one test).
1 parent 4797d65 commit 7d2fe90

Some content is hidden

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

42 files changed

+60
-60
lines changed

‎sycl/test-e2e/Basic/AMX_aspect.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: %t.out
2+
// RUN: %{run-unfiltered-devices} %t.out
33
//
44

55
//==--------------- AMX_aspect.cpp - SYCL device test

‎sycl/test-e2e/Basic/context-with-multiple-devices.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// REQUIRES: accelerator, opencl-aot
22

33
// RUN: %clangxx -fsycl -fintelfpga %s -o %t2.out
4-
// RUN: env CL_CONFIG_CPU_EMULATE_DEVICES=2 %t2.out
4+
// RUN: %{run-unfiltered-devices} env CL_CONFIG_CPU_EMULATE_DEVICES=2 %t2.out
55

66
#include <sycl/detail/core.hpp>
77

‎sycl/test-e2e/Basic/interop/construction_ocl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// REQUIRES: opencl, opencl_icd
22
// RUN: %{build} %opencl_lib -o %t.ocl.out
3-
// RUN: env ONEAPI_DEVICE_SELECTOR="opencl:*" %t.ocl.out
3+
// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="opencl:*" %t.ocl.out
44

55
#include <CL/cl.h>
66
#include <sycl/backend.hpp>

‎sycl/test-e2e/Basic/interop/construction_ze.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// REQUIRES: level_zero, level_zero_dev_kit
22
// RUN: %{build} %level_zero_options -o %t.ze.out
3-
// RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" %t.ze.out
3+
// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="level_zero:*" %t.ze.out
44

55
#include <level_zero/ze_api.h>
66

‎sycl/test-e2e/Basic/interop/make_kernel_subdevice_l0.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// REQUIRES: level_zero, opencl, level_zero_dev_kit
22
// RUN: %{build} %level_zero_options -lOpenCL -o %t.ze.out
3-
// RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" %t.ze.out
3+
// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="level_zero:*" %t.ze.out
44

55
#include <cstdlib>
66
#include <iostream>

‎sycl/test-e2e/Basic/query.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="*:gpu" %t.out
2+
// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="*:gpu" %t.out
33

44
// REQUIRES: gpu-intel-dg1
55
#include "query.hpp"

‎sycl/test-e2e/CompositeDevice/device_selector_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %clangxx -fsycl %s -o %t.out
2-
// RUN: env ONEAPI_DEVICE_SELECTOR=level_zero:0 ZE_FLAT_DEVICE_HIERARCHY=COMBINED %t.out
2+
// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR=level_zero:0 ZE_FLAT_DEVICE_HIERARCHY=COMBINED %t.out
33
// REQUIRES: level_zero
44

55
#include <sycl/detail/core.hpp>

‎sycl/test-e2e/Config/config.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
//===----------------------------------------------------------------------===//
88
// RUN: %{build} %debug_option %O0 -o %t.out
99
// RUN: echo SYCL_PRINT_EXECUTION_GRAPH=always > %t.cfg
10-
// RUN: env SYCL_CONFIG_FILE_NAME=%t.cfg %t.out
10+
// RUN: %{run-unfiltered-devices} env SYCL_CONFIG_FILE_NAME=%t.cfg %t.out
1111
// RUN: cat *.dot > /dev/null
1212
// RUN: rm *.dot
13-
// RUN: env SYCL_PRINT_EXECUTION_GRAPH=always %t.out
13+
// RUN: %{run-unfiltered-devices} env SYCL_PRINT_EXECUTION_GRAPH=always %t.out
1414
// RUN: cat *.dot > /dev/null
1515
// RUN: rm *.dot
16-
// RUN: %t.out
16+
// RUN: %{run-unfiltered-devices} %t.out
1717
// RUN: not cat *.dot > /dev/null
1818

1919
#include <sycl/detail/core.hpp>

‎sycl/test-e2e/Config/default-context.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %{build} -o %t.out
22
// RUN: %{run} %t.out
3-
// RUN: env SYCL_ENABLE_DEFAULT_CONTEXTS=1 %t.out
4-
// RUN: env SYCL_ENABLE_DEFAULT_CONTEXTS=0 %t.out 1
3+
// RUN: %{run-unfiltered-devices} env SYCL_ENABLE_DEFAULT_CONTEXTS=1 %t.out
4+
// RUN: %{run-unfiltered-devices} env SYCL_ENABLE_DEFAULT_CONTEXTS=0 %t.out 1
55

66
#include <sycl/detail/core.hpp>
77

@@ -19,4 +19,4 @@ int main(int argc, char *argv[]) {
1919
assert(q1.get_context() == q2.get_context());
2020
else
2121
assert(q1.get_context() != q2.get_context());
22-
}
22+
}

‎sycl/test-e2e/ESIMD/hardware_dispatch.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// XFAIL: igc-dev
99
// REQUIRES: ocloc && arch-intel_gpu_tgllp
1010
// RUN: %clangxx -fsycl -fsycl-targets=intel_gpu_tgllp %s -o %t.out
11-
// RUN: %t.out
11+
// RUN: %{run-unfiltered-devices} %t.out
1212

1313
// This is basic test to test hardware dispatch functionality with ESIMD.
1414

0 commit comments

Comments
 (0)