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

Commit 0ad1054

Browse files
bso-intelbso-intel
authored
[SYCL] Change pattern to reflect the change in sycl-ls (#256)
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'.
1 parent 53dcda4 commit 0ad1054

13 files changed

+108
-69
lines changed

‎SYCL/Basic/host_platform_avail.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// RUN: %HOST_RUN_PLACEHOLDER %t1.out
33
// RUN: %CPU_RUN_PLACEHOLDER %t1.out
44
// RUN: %GPU_RUN_PLACEHOLDER %t1.out
5-
// RUN: %ACC_RUN_PLACEHOLDER %t1.out
5+
// RUN: env SYCL_DEVICE_FILTER=acc,host %t1.out
66

77
//==------ host_platform_avail.cpp - Host Platform Availability test -------==//
88
//

‎SYCL/FilterSelector/filter_list_cpu_gpu_acc.cpp

Lines changed: 65 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,71 @@
66
//
77
//===---------------------------------------------------------------------===//
88

9-
// REQUIRES: opencl, cpu, gpu, accelerator
9+
// REQUIRES: cpu, gpu, accelerator, host
1010

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

13-
// RUN: env SYCL_DEVICE_FILTER="*" %t.out | FileCheck %s --check-prefixes=CHECK-CPU,CHECK-GPU,CHECK-ACC,CHECK-HOST
14-
// RUN: env SYCL_DEVICE_FILTER=opencl,host %t.out | FileCheck %s --check-prefixes=CHECK-CPU,CHECK-GPU,CHECK-ACC,CHECK-HOST
15-
// RUN: env SYCL_DEVICE_FILTER=cpu,host %t.out | FileCheck %s --check-prefixes=CHECK-CPU,CHECK-GPU-NOT,CHECK-ACC-NOT,CHECK-HOST
16-
// RUN: env SYCL_DEVICE_FILTER=acc,host %t.out | FileCheck %s --check-prefixes=CHECK-CPU-NOT,CHECK-GPU-NOT,CHECK-ACC,CHECK-HOST
17-
// RUN: env SYCL_DEVICE_FILTER=host %t.out | FileCheck %s --check-prefixes=CHECK-CPU-NOT,CHECK-GPU-NOT,CHECK-ACC-NOT,CHECK-HOST
18-
// RUN: env SYCL_DEVICE_FILTER=gpu,host %t.out | FileCheck %s --check-prefixes=CHECK-CPU-NOT,CHECK-GPU,CHECK-ACC-NOT,CHECK-HOST
19-
// RUN: env SYCL_DEVICE_FILTER=cpu,acc,host %t.out | FileCheck %s --check-prefixes=CHECK-CPU,CHECK-GPU-NOT,CHECK-ACC,CHECK-HOST
20-
// RUN: env SYCL_DEVICE_FILTER=cpu:0,acc:1,host %t.out | FileCheck %s --check-prefixes=CHECK-CPU,CHECK-GPU-NOT,CHECK-ACC-NOT,CHECK-HOST
21-
// RUN: env CL_CONFIG_CPU_EMULATE_DEVICES=2 SYCL_DEVICE_FILTER=cpu:0,acc:1,host %t.out | FileCheck %s --check-prefixes=CHECK-CPU,CHECK-GPU-NOT,CHECK-ACC,CHECK-HOST
22-
// RUN: env SYCL_DEVICE_FILTER=cuda:cpu,opencl:gpu:0,level_zero:acc:1,host %t.out | FileCheck %s --check-prefixes=CHECK-CPU-NOT,CHECK-GPU-NOT,CHECK-ACC-NOT,CHECK-HOST
23-
//
24-
// CHECK-ACC: Device: acc
25-
// CHECK-CPU: Device: cpu
26-
// CHECK-GPU: Device: gpu
27-
// CHECK-HOST: Device: host
13+
// RUN: env SYCL_DEVICE_FILTER=acc %t.out | FileCheck %s --check-prefixes=CHECK-ACC-ONLY
14+
// RUN: env SYCL_DEVICE_FILTER=gpu %t.out | FileCheck %s --check-prefixes=CHECK-GPU-ONLY
15+
// RUN: env SYCL_DEVICE_FILTER=cpu %t.out | FileCheck %s --check-prefixes=CHECK-CPU-ONLY
16+
// RUN: env SYCL_DEVICE_FILTER=host %t.out | FileCheck %s --check-prefixes=CHECK-HOST-ONLY
17+
//
18+
// RUN: env SYCL_DEVICE_FILTER=acc,gpu %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU
19+
// RUN: env SYCL_DEVICE_FILTER=cpu,host %t.out | FileCheck %s --check-prefixes=CHECK-CPU-HOST
20+
// RUN: env SYCL_DEVICE_FILTER=acc,cpu %t.out | FileCheck %s --check-prefixes=CHECK-ACC-CPU
21+
// RUN: env SYCL_DEVICE_FILTER=gpu,host %t.out | FileCheck %s --check-prefixes=CHECK-GPU-HOST
22+
//
23+
// RUN: env SYCL_DEVICE_FILTER=cpu,acc,host %t.out | FileCheck %s --check-prefixes=CHECK-ACC-CPU-HOST
24+
// RUN: env SYCL_DEVICE_FILTER=cpu,acc,gpu %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU-CPU
25+
// RUN: env CL_CONFIG_CPU_EMULATE_DEVICES=2 SYCL_DEVICE_FILTER=cpu,acc,host %t.out | FileCheck %s --check-prefixes=CHECK-ACC-CPU-HOST
26+
// RUN: env SYCL_DEVICE_FILTER=cuda:cpu,opencl:gpu,level_zero:acc,host %t.out | FileCheck %s --check-prefixes=CHECK-GPU-HOST
27+
//
28+
// CHECK-ACC-ONLY: Device: acc
29+
// CHECK-ACC-ONLY-NOT: Device: cpu
30+
// CHECK-ACC-ONLY-NOT: Device: gpu
31+
// CHECK-ACC-ONLY-NOT: Device: host
32+
//
33+
// CHECK-GPU-ONLY-NOT: Device: acc
34+
// CHECK-GPU-ONLY: Device: gpu
35+
// CHECK-GPU-ONLY-NOT: Device: cpu
36+
// CHECK-GPU-ONLY-NOT: Device: host
37+
//
38+
// CHECK-CPU-ONLY-NOT: Device: acc
39+
// CHECK-CPU-ONLY: Device: cpu
40+
// CHECK-CPU-ONLY-NOT: Device: gpu
41+
// CHECK-CPU-ONLY-NOT: Device: host
42+
//
43+
// CHECK-HOST-ONLY-NOT: Device: acc
44+
// CHECK-HOST-ONLY-NOT: Device: gpu
45+
// CHECK-HOST-ONLY-NOT: Device: cpu
46+
// CHECK-HOST-ONLY: Device: host
47+
//
48+
// CHECK-ACC-GPU: Device: acc
49+
// CHECK-ACC-GPU-NEXT: Device: gpu
50+
// CHECK-ACC-GPU-NOT: Device: cpu
51+
// CHECK-ACC-GPU-NOT: Device: host
52+
//
53+
// CHECK-CPU-HOST-NOT: Device: acc
54+
// CHECK-CPU-HOST-NOT: Device: gpu
55+
// CHECK-CPU-HOST: Device: cpu
56+
// CHECK-CPU-HOST: Device: host
57+
//
58+
// CHECK-ACC-CPU: Device: acc
59+
// CHECK-ACC-CPU-NEXT: Device: cpu
60+
// CHECK-ACC-CPU-NOT: Device: gpu
61+
// CHECK-ACC-CPU-NOT: Device: host
62+
//
63+
// CHECK-GPU-HOST-NOT: Device: acc
64+
// CHECK-GPU-HOST: Device: gpu
65+
// CHECK-GPU-HOST-NOT: Device: cpu
66+
// CHECK-GPU-HOST: Device: host
67+
//
68+
// CHECK-ACC-CPU-HOST: Device: acc
69+
// CHECK-ACC-CPU-HOST: Device: cpu
70+
// CHECK-ACC-CPU-HOST-NOT: Device: gpu
71+
// CHECK-ACC-CPU-HOST: Device: host
72+
//
73+
// CHECK-ACC-GPU-CPU: Device: acc
74+
// CHECK-ACC-GPU-CPU-DAG: Device: gpu
75+
// CHECK-ACC-GPU-CPU-DAG: Device: cpu
76+
// CHECK-ACC-GPU-CPU-NOT: Device: host

‎SYCL/FilterSelector/reuse.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
#include <CL/sycl.hpp>
1616

1717
using namespace cl::sycl;
18-
// TODO: change to 'using namespace cl::sycl::oneapi' after PR intel/llvm:4014
19-
// is merged
2018
using namespace cl::sycl::ext::oneapi;
2119

2220
int main() {
@@ -27,17 +25,15 @@ int main() {
2725
std::cout << "# Devices found: " << Devs.size() << std::endl;
2826

2927
if (Devs.size() > 1) {
30-
// TODO: change all occurrences of filter_selector to 'filter_selector' or
31-
// 'oneapi::filter_selector' after PR intel/llvm:4014 is merged
32-
ext::oneapi::filter_selector filter("1");
28+
filter_selector filter("1");
3329

3430
device d1(filter);
3531
device d2(filter);
3632

3733
assert(d1 == d2);
3834

39-
ext::oneapi::filter_selector f1("0");
40-
ext::oneapi::filter_selector f2("1");
35+
filter_selector f1("0");
36+
filter_selector f2("1");
4137
device d3(f1);
4238
device d4(f2);
4339

‎SYCL/FilterSelector/select.cpp

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
#include <CL/sycl.hpp>
1919

2020
using namespace cl::sycl;
21-
// TODO: change to 'using namespace cl::sycl::oneapi' after PR intel/llvm:4014
22-
// is merged
2321
using namespace cl::sycl::ext::oneapi;
2422

2523
int main() {
@@ -76,62 +74,60 @@ int main() {
7674

7775
if (!CPUs.empty()) {
7876
std::cout << "Test 'cpu'";
79-
// TODO: change all occurrences of filter_selector to 'filter_selector' or
80-
// 'oneapi::filter_selector' after PR intel/llvm:4014 is merged
81-
device d1(ext::oneapi::filter_selector("cpu"));
77+
device d1(filter_selector("cpu"));
8278
assert(d1.is_cpu());
8379
std::cout << "...PASS" << std::endl;
8480
}
8581

8682
if (!GPUs.empty()) {
8783
std::cout << "Test 'gpu'";
88-
device d2(ext::oneapi::filter_selector("gpu"));
84+
device d2(filter_selector("gpu"));
8985
assert(d2.is_gpu());
9086
std::cout << "...PASS" << std::endl;
9187
}
9288

9389
if (!CPUs.empty() || !GPUs.empty()) {
9490
std::cout << "Test 'cpu,gpu'";
95-
device d3(ext::oneapi::filter_selector("cpu,gpu"));
91+
device d3(filter_selector("cpu,gpu"));
9692
assert((d3.is_gpu() || d3.is_cpu()));
9793
std::cout << "...PASS" << std::endl;
9894
}
9995

10096
if (HasOpenCLDevices) {
10197
std::cout << "Test 'opencl'";
102-
device d4(ext::oneapi::filter_selector("opencl"));
98+
device d4(filter_selector("opencl"));
10399
assert(d4.get_platform().get_backend() == backend::opencl);
104100
std::cout << "...PASS" << std::endl;
105101

106102
if (!CPUs.empty()) {
107103
std::cout << "Test 'opencl:cpu'";
108-
device d5(ext::oneapi::filter_selector("opencl:cpu"));
104+
device d5(filter_selector("opencl:cpu"));
109105
assert(d5.is_cpu() && d5.get_platform().get_backend() == backend::opencl);
110106
std::cout << "...PASS" << std::endl;
111107

112108
std::cout << "Test 'opencl:cpu:0'";
113-
device d6(ext::oneapi::filter_selector("opencl:cpu:0"));
109+
device d6(filter_selector("opencl:cpu:0"));
114110
assert(d6.is_cpu() && d6.get_platform().get_backend() == backend::opencl);
115111
std::cout << "...PASS" << std::endl;
116112
}
117113

118114
if (HasOpenCLGPU) {
119115
std::cout << "Test 'opencl:gpu'" << std::endl;
120-
device d7(ext::oneapi::filter_selector("opencl:gpu"));
116+
device d7(filter_selector("opencl:gpu"));
121117
assert(d7.is_gpu() && d7.get_platform().get_backend() == backend::opencl);
122118
}
123119
}
124120

125121
std::cout << "Test '0'";
126-
device d8(ext::oneapi::filter_selector("0"));
122+
device d8(filter_selector("0"));
127123
std::cout << "...PASS" << std::endl;
128124

129125
std::string ErrorMesg(
130126
"Could not find a device that matches the specified filter(s)!");
131127

132128
try {
133129
// pick something crazy
134-
device d9(ext::oneapi::filter_selector("gpu:999"));
130+
device d9(filter_selector("gpu:999"));
135131
std::cout << "d9 = " << d9.get_info<info::device::name>() << std::endl;
136132
} catch (const sycl::runtime_error &e) {
137133
assert(ErrorMesg.find_first_of(e.what()) == 0);
@@ -140,7 +136,7 @@ int main() {
140136

141137
try {
142138
// pick something crazy
143-
device d10(ext::oneapi::filter_selector("bob:gpu"));
139+
device d10(filter_selector("bob:gpu"));
144140
std::cout << "d10 = " << d10.get_info<info::device::name>() << std::endl;
145141
} catch (const sycl::runtime_error &e) {
146142
assert(ErrorMesg.find_first_of(e.what()) == 0);
@@ -149,7 +145,7 @@ int main() {
149145

150146
try {
151147
// pick something crazy
152-
device d11(ext::oneapi::filter_selector("opencl:bob"));
148+
device d11(filter_selector("opencl:bob"));
153149
std::cout << "d11 = " << d11.get_info<info::device::name>() << std::endl;
154150
} catch (const sycl::runtime_error &e) {
155151
assert(ErrorMesg.find_first_of(e.what()) == 0);
@@ -158,19 +154,19 @@ int main() {
158154

159155
if (HasLevelZeroDevices && HasLevelZeroGPU) {
160156
std::cout << "Test 'level_zero'";
161-
device d12(ext::oneapi::filter_selector("level_zero"));
157+
device d12(filter_selector("level_zero"));
162158
assert(d12.get_platform().get_backend() == backend::level_zero);
163159
std::cout << "...PASS" << std::endl;
164160

165161
std::cout << "Test 'level_zero:gpu'";
166-
device d13(ext::oneapi::filter_selector("level_zero:gpu"));
162+
device d13(filter_selector("level_zero:gpu"));
167163
assert(d13.is_gpu() &&
168164
d13.get_platform().get_backend() == backend::level_zero);
169165
std::cout << "...PASS" << std::endl;
170166

171167
if (HasOpenCLDevices && !CPUs.empty()) {
172168
std::cout << "Test 'level_zero:gpu,cpu'";
173-
device d14(ext::oneapi::filter_selector("level_zero:gpu,cpu"));
169+
device d14(filter_selector("level_zero:gpu,cpu"));
174170
assert((d14.is_gpu() || d14.is_cpu()));
175171
std::cout << "...PASS 1/2" << std::endl;
176172
if (d14.is_gpu()) {
@@ -182,25 +178,25 @@ int main() {
182178

183179
if (Devs.size() > 1) {
184180
std::cout << "Test '1'";
185-
device d15(ext::oneapi::filter_selector("1"));
181+
device d15(filter_selector("1"));
186182
std::cout << "...PASS" << std::endl;
187183
}
188184

189185
if (HasCUDADevices) {
190186
std::cout << "Test 'cuda'";
191-
device d16(ext::oneapi::filter_selector("cuda"));
187+
device d16(filter_selector("cuda"));
192188
assert(d16.get_platform().get_backend() == backend::cuda);
193189
std::cout << "...PASS" << std::endl;
194190

195191
std::cout << "Test 'cuda:gpu'";
196-
device d17(ext::oneapi::filter_selector("cuda:gpu"));
192+
device d17(filter_selector("cuda:gpu"));
197193
assert(d17.is_gpu() && d17.get_platform().get_backend() == backend::cuda);
198194
std::cout << "...PASS" << std::endl;
199195
}
200196

201197
if (!Accels.empty()) {
202198
std::cout << "Test 'accelerator'";
203-
device d18(ext::oneapi::filter_selector("accelerator"));
199+
device d18(filter_selector("accelerator"));
204200
assert(d18.is_accelerator());
205201
std::cout << "...PASS" << std::endl;
206202
}

‎SYCL/FilterSelector/select_device.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// RUN: env SYCL_DEVICE_FILTER=level_zero:gpu %t.out
55
// RUN: env SYCL_DEVICE_FILTER=opencl:gpu %t.out
66
// RUN: env SYCL_DEVICE_FILTER=cpu,level_zero:gpu %t.out
7-
// RUN: env SYCL_DEVICE_FILTER=opencl:acc:0 %t.out
7+
// RUN: env SYCL_DEVICE_FILTER=opencl:acc %t.out
88
//
99
// Checks if only specified device types can be acquired from select_device
1010
// when SYCL_DEVICE_FILTER is set

‎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
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
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-hip.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=hip sycl-ls --verbose >%t.hip.out
44
// RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-HIP,CHECK-CUSTOM-GPU-HIP --input-file %t.hip.out
55

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

99
//==---- sycl-ls-gpu-hip.cpp - SYCL test for discovered/selected devices --==//
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
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
// RUN: env SYCL_DEVICE_FILTER=hip sycl-ls --verbose >%t.hip.out
1919
// RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-HIP,CHECK-CUSTOM-GPU-HIP --input-file %t.hip.out
2020

21-
// CHECK-BUILTIN-GPU-HIP: gpu_selector(){{.*}}GPU : HIP
22-
// CHECK-CUSTOM-GPU-HIP: custom_selector(gpu){{.*}}GPU : HIP
21+
// CHECK-BUILTIN-GPU-HIP: gpu_selector(){{.*}}gpu, {{.*}}HIP
22+
// CHECK-CUSTOM-GPU-HIP: custom_selector(gpu){{.*}}gpu, {{.*}}HIP
2323

2424
//==---- sycl-ls-gpu-sycl-be.cpp - SYCL test for discovered/selected devices
2525
//--==//

‎SYCL/Regression/device_num.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,12 @@ int main() {
8282
printDeviceType(d);
8383
assert(targetDevice == d &&
8484
"The selected device is not the target device specified.");
85-
}
86-
// HOST device is always available regardless of SYCL_DEVICE_FILTER
87-
{
85+
} else if (targetDevice.is_host()) {
8886
host_selector hs;
8987
device d = hs.select_device();
9088
std::cout << "host_selector selected ";
9189
printDeviceType(d);
92-
assert(d.is_host() && "The selected device is not a host device.");
90+
assert(targetDevice == d && "The selected device is not a host device.");
9391
}
9492
}
9593
return 0;

0 commit comments

Comments
 (0)