Skip to content

Commit e148559

Browse files
ayylolayylol
authored
[SYCL][E2E] Remove build-and-run-mode requirements from sycl-ls tests (#16878)
Instead use `%{run-unfiltered-devices}`. Additionally, gets rid of extra output files created by using pipes, and removes a redundant test that never ran, and who's functionality is covered by other tests.
1 parent ac24092 commit e148559

8 files changed

+14
-53
lines changed

‎sycl/test-e2e/Adapters/sycl-ls-gpu-cuda.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
// REQUIRES: gpu, cuda
2-
// REQUIRES: build-and-run-mode
32

4-
// RUN: env ONEAPI_DEVICE_SELECTOR="cuda:*" sycl-ls --verbose >%t.cuda.out
5-
// RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-CUDA,CHECK-CUSTOM-GPU-CUDA --input-file %t.cuda.out
3+
// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="cuda:*" sycl-ls --verbose | \
4+
// RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-CUDA,CHECK-CUSTOM-GPU-CUDA
65

76
// CHECK-BUILTIN-GPU-CUDA: gpu_selector(){{.*}}gpu, {{.*}}CUDA
87
// CHECK-CUSTOM-GPU-CUDA: custom_selector(gpu){{.*}}gpu, {{.*}}CUDA

‎sycl/test-e2e/Adapters/sycl-ls-gpu-default-any.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// REQUIRES: gpu
2-
// REQUIRES: build-and-run-mode
32

43
// TODO: Remove unsetting SYCL_DEVICE_FILTER when feature is dropped
5-
// RUN: env --unset=SYCL_DEVICE_FILTER --unset=ONEAPI_DEVICE_SELECTOR sycl-ls --verbose >%t.default.out
6-
// RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.default.out
4+
// RUN: %{run-unfiltered-devices} env --unset=SYCL_DEVICE_FILTER --unset=ONEAPI_DEVICE_SELECTOR sycl-ls --verbose | \
5+
// RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM
76

87
// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}gpu, {{.*}}{{Level-Zero|CUDA|OpenCL}}
98
// clang-format off

‎sycl/test-e2e/Adapters/sycl-ls-gpu-default-level-zero.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// REQUIRES: gpu, level-zero
2-
// REQUIRES: build-and-run-mode
32

43
// TODO: Remove unsetting SYCL_DEVICE_FILTER when feature is dropped
5-
// RUN: env --unset=SYCL_DEVICE_FILTER --unset=ONEAPI_DEVICE_SELECTOR sycl-ls --verbose >%t.default.out
6-
// RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.default.out
4+
// RUN: %{run-unfiltered-devices} env --unset=SYCL_DEVICE_FILTER --unset=ONEAPI_DEVICE_SELECTOR sycl-ls --verbose | \
5+
// RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM
76

87
// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}gpu, {{.*}}Level-Zero
98
// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}gpu, {{.*}}Level-Zero

‎sycl/test-e2e/Adapters/sycl-ls-gpu-hip.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
// REQUIRES: gpu, hip, sycl-ls
2-
// REQUIRES: build-and-run-mode
32

4-
// RUN: env ONEAPI_DEVICE_SELECTOR="hip:*" sycl-ls --verbose >%t.hip.out
5-
// RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-HIP,CHECK-CUSTOM-GPU-HIP --input-file %t.hip.out
3+
// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="hip:*" sycl-ls --verbose | \
4+
// RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-HIP,CHECK-CUSTOM-GPU-HIP
65

76
// CHECK-BUILTIN-GPU-HIP: gpu_selector(){{.*}}gpu, {{.*}}HIP
87
// CHECK-CUSTOM-GPU-HIP: custom_selector(gpu){{.*}}gpu, {{.*}}HIP

‎sycl/test-e2e/Adapters/sycl-ls-gpu-level-zero.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
// REQUIRES: gpu, level_zero
2-
// REQUIRES: build-and-run-mode
32

4-
// RUN: sycl-ls --verbose >%t.default.out
5-
// RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.default.out
3+
// RUN: %{run-unfiltered-devices} sycl-ls --verbose | \
4+
// RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM
65

76
// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}gpu, {{.*}}Level-Zero
87
// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}gpu, {{.*}}Level-Zero

‎sycl/test-e2e/Adapters/sycl-ls-gpu-opencl.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
// REQUIRES: gpu, opencl
2-
// REQUIRES: build-and-run-mode
32

4-
// RUN: env ONEAPI_DEVICE_SELECTOR="opencl:*" sycl-ls --verbose >%t.opencl.out
5-
// RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.opencl.out
3+
// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="opencl:*" sycl-ls --verbose | \
4+
// RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM
65

76
// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}gpu, {{.*}}OpenCL
87
// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}gpu, {{.*}}OpenCL

‎sycl/test-e2e/Adapters/sycl-ls-gpu-sycl-be.cpp

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎sycl/test-e2e/Adapters/sycl-ls-uuid-subdevs.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
/* Test to check that sycl-ls is outputting UUID and number of sub and sub-sub
2-
// REQUIRES: build-and-run-mode
32
* devices. */
43
// REQUIRES: gpu, level_zero
54

65
// As of now, ZEX_NUMBER_OF_CCS is not working with FLAT hierachy,
76
// which is the new default on PVC.
87

9-
// RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" env ZE_FLAT_DEVICE_HIERARCHY=COMPOSITE env ZEX_NUMBER_OF_CCS=0:4 sycl-ls --verbose >%t.default.out
10-
// RUN: FileCheck %s --input-file %t.default.out
8+
// RUN: %{run-unfiltered-devices} env ONEAPI_DEVICE_SELECTOR="level_zero:*" env ZE_FLAT_DEVICE_HIERARCHY=COMPOSITE env ZEX_NUMBER_OF_CCS=0:4 sycl-ls --verbose | \
9+
// RUN: FileCheck %s
1110

1211
// CHECK: {{.*}}UUID : {{.*}}
1312
// CHECK: {{.*}}Num SubDevices : {{.*}}

0 commit comments

Comments
 (0)