Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

Commit b4d842d

Browse files
bso-intelbso-intel
committed
[SYCL] Change pattern to reflect the change in sycl-ls
In intel/llvm#3611, I changed the device type to lower case which was necessary to show the SYCL_DEVICE_FILTER prefix for each device listing from sycl-ls. It caused several tests failures that expected 'GPU' instead of 'gpu'. Signed-off-by: Byoungro So <[email protected]>
1 parent bbd0476 commit b4d842d

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

‎SYCL/Plugin/sycl-ls-gpu-cuda.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// RUN: env SYCL_DEVICE_FILTER=cuda sycl-ls --verbose >%t.cuda.out
44
// RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-CUDA,CHECK-CUSTOM-GPU-CUDA --input-file %t.cuda.out
55

6-
// CHECK-BUILTIN-GPU-CUDA: gpu_selector(){{.*}}GPU :{{.*}}CUDA
7-
// CHECK-CUSTOM-GPU-CUDA: custom_selector(gpu){{.*}}GPU :{{.*}}CUDA
6+
// CHECK-BUILTIN-GPU-CUDA: gpu_selector(){{.*}}gpu :{{.*}}CUDA
7+
// CHECK-CUSTOM-GPU-CUDA: custom_selector(gpu){{.*}}gpu :{{.*}}CUDA
88

99
//==---- sycl-ls-gpu-cuda.cpp - SYCL test for discovered/selected devices --==//
1010
//

‎SYCL/Plugin/sycl-ls-gpu-default-any.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
// RUN: env --unset=SYCL_DEVICE_FILTER sycl-ls --verbose >%t.default.out
44
// RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.default.out
55

6-
// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}GPU : {{.*}}{{Level-Zero|CUDA|OpenCL}}
6+
// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}gpu : {{.*}}{{Level-Zero|CUDA|OpenCL}}
77
// clang-format off
8-
// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}GPU : {{.*}}{{Level-Zero|CUDA|OpenCL}}
8+
// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}gpu : {{.*}}{{Level-Zero|CUDA|OpenCL}}
99
// clang-format on
1010

1111
//==--------------------- sycl-ls-gpu-default-any.cpp ----------------------==//

‎SYCL/Plugin/sycl-ls-gpu-default-level-zero.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// RUN: env --unset=SYCL_DEVICE_FILTER sycl-ls --verbose >%t.default.out
44
// RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.default.out
55

6-
// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}GPU : {{.*}}Level-Zero
7-
// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}GPU : {{.*}}Level-Zero
6+
// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}gpu : {{.*}}Level-Zero
7+
// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}gpu : {{.*}}Level-Zero
88

99
//==------------------ sycl-ls-gpu-default-level-zero.cpp ------------------==//
1010
//

‎SYCL/Plugin/sycl-ls-gpu-level-zero.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// RUN: sycl-ls --verbose >%t.default.out
44
// RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.default.out
55

6-
// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}GPU : {{.*}}Level-Zero
7-
// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}GPU : {{.*}}Level-Zero
6+
// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}gpu : {{.*}}Level-Zero
7+
// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}gpu : {{.*}}Level-Zero
88

99
//==-- sycl-ls-gpu-level-zero.cpp - Test Level-Zero selected gpu device ----==//
1010
//

‎SYCL/Plugin/sycl-ls-gpu-opencl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// RUN: env SYCL_DEVICE_FILTER=opencl sycl-ls --verbose >%t.opencl.out
44
// RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.opencl.out
55

6-
// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}GPU : {{.*}}OpenCL
7-
// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}GPU : {{.*}}OpenCL
6+
// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}gpu : {{.*}}OpenCL
7+
// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}gpu : {{.*}}OpenCL
88

99
//==-- sycl-ls-gpu-opencl.cpp - SYCL test for selected OpenCL GPU device --===//
1010
//

‎SYCL/Plugin/sycl-ls-gpu-sycl-be.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
// RUN: env SYCL_DEVICE_FILTER=opencl sycl-ls --verbose >%t.opencl.out
77
// RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-OPENCL,CHECK-CUSTOM-GPU-OPENCL --input-file %t.opencl.out
88

9-
// CHECK-BUILTIN-GPU-OPENCL: gpu_selector(){{.*}}GPU : OpenCL
10-
// CHECK-CUSTOM-GPU-OPENCL: custom_selector(gpu){{.*}}GPU : OpenCL
9+
// CHECK-BUILTIN-GPU-OPENCL: gpu_selector(){{.*}}gpu : OpenCL
10+
// CHECK-CUSTOM-GPU-OPENCL: custom_selector(gpu){{.*}}gpu : OpenCL
1111

1212
// RUN: env SYCL_DEVICE_FILTER=cuda sycl-ls --verbose >%t.cuda.out
1313
// RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-CUDA,CHECK-CUSTOM-GPU-CUDA --input-file %t.cuda.out
1414

15-
// CHECK-BUILTIN-GPU-CUDA: gpu_selector(){{.*}}GPU : CUDA
16-
// CHECK-CUSTOM-GPU-CUDA: custom_selector(gpu){{.*}}GPU : CUDA
15+
// CHECK-BUILTIN-GPU-CUDA: gpu_selector(){{.*}}gpu : CUDA
16+
// CHECK-CUSTOM-GPU-CUDA: custom_selector(gpu){{.*}}gpu : CUDA
1717

1818
//==---- sycl-ls-gpu-sycl-be.cpp - SYCL test for discovered/selected devices
1919
//--==//

0 commit comments

Comments
 (0)