Skip to content

Commit 317c6fd

Browse files
AlexeySachkovAlexeySachkov
authored
[SYCL][NFC] Drop output from FilterSelector E2E tests (#11926)
Removed most uses of `std::cout` from `FilterSelector` E2E tests. There is no need in positive or informational output in those tests: it is not displayed in CI logs when tests pass, it is not checked by tools like `FileCheck`, etc. Expectation is that less I/O will allow tests to pass quicker
1 parent 3d5e41f commit 317c6fd

File tree

8 files changed

+50
-120
lines changed

8 files changed

+50
-120
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ int main() {
2020

2121
Devs = device::get_devices();
2222

23-
std::cout << "# Devices found: " << Devs.size() << std::endl;
24-
2523
if (Devs.size() > 1) {
2624
filter_selector filter("1");
2725

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

Lines changed: 38 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ int main() {
2626
Accels = device::get_devices(sycl::info::device_type::accelerator);
2727
Devs = device::get_devices();
2828

29-
std::cout << "# CPU Devices found: " << CPUs.size() << std::endl;
30-
std::cout << "# GPU Devices found: " << GPUs.size() << std::endl;
31-
std::cout << "# Accelerators found: " << Accels.size() << std::endl;
32-
std::cout << "# Devices found: " << Devs.size() << std::endl;
33-
3429
bool HasLevelZeroDevices = false;
3530
bool HasOpenCLDevices = false;
3631
bool HasCUDADevices = false;
@@ -60,159 +55,128 @@ int main() {
6055
}
6156
}
6257

63-
std::cout << "HasLevelZeroDevices = " << HasLevelZeroDevices << std::endl;
64-
std::cout << "HasOpenCLDevices = " << HasOpenCLDevices << std::endl;
65-
std::cout << "HasCUDADevices = " << HasCUDADevices << std::endl;
66-
std::cout << "HasHIPDevices = " << HasHIPDevices << std::endl;
67-
std::cout << "HasOpenCLGPU = " << HasOpenCLGPU << std::endl;
68-
std::cout << "HasLevelZeroGPU = " << HasLevelZeroGPU << std::endl;
69-
7058
if (!CPUs.empty()) {
71-
std::cout << "Test 'cpu'";
7259
device d1(filter_selector("cpu"));
73-
assert(d1.is_cpu());
74-
std::cout << "...PASS" << std::endl;
60+
assert(d1.is_cpu() && "filter_selector(\"cpu\") failed");
7561
}
7662

7763
if (!GPUs.empty()) {
78-
std::cout << "Test 'gpu'";
7964
device d2(filter_selector("gpu"));
80-
assert(d2.is_gpu());
81-
std::cout << "...PASS" << std::endl;
65+
assert(d2.is_gpu() && "filter_selector(\"gpu\") failed");
8266
}
8367

8468
if (!CPUs.empty() || !GPUs.empty()) {
85-
std::cout << "Test 'cpu,gpu'";
8669
device d3(filter_selector("cpu,gpu"));
87-
assert((d3.is_gpu() || d3.is_cpu()));
88-
std::cout << "...PASS" << std::endl;
70+
assert((d3.is_gpu() || d3.is_cpu()) &&
71+
"filter_selector(\"cpu,gpu\") failed");
8972
}
9073

9174
if (HasOpenCLDevices) {
92-
std::cout << "Test 'opencl'";
9375
device d4(filter_selector("opencl"));
94-
assert(d4.get_platform().get_backend() == backend::opencl);
95-
std::cout << "...PASS" << std::endl;
76+
assert(d4.get_platform().get_backend() == backend::opencl &&
77+
"filter_selector(\"opencl\") failed");
9678

9779
if (!CPUs.empty()) {
98-
std::cout << "Test 'opencl:cpu'";
9980
device d5(filter_selector("opencl:cpu"));
100-
assert(d5.is_cpu() && d5.get_platform().get_backend() == backend::opencl);
101-
std::cout << "...PASS" << std::endl;
81+
assert(d5.is_cpu() &&
82+
d5.get_platform().get_backend() == backend::opencl &&
83+
"filter_selector(\"opencl:cpu\") failed");
10284

103-
std::cout << "Test 'opencl:cpu:0'";
10485
device d6(filter_selector("opencl:cpu:0"));
105-
assert(d6.is_cpu() && d6.get_platform().get_backend() == backend::opencl);
106-
std::cout << "...PASS" << std::endl;
86+
assert(d6.is_cpu() &&
87+
d6.get_platform().get_backend() == backend::opencl &&
88+
"filter_selector(\"opencl:cpu:0\") failed");
10789
}
10890

10991
if (HasOpenCLGPU) {
110-
std::cout << "Test 'opencl:gpu'" << std::endl;
11192
device d7(filter_selector("opencl:gpu"));
112-
assert(d7.is_gpu() && d7.get_platform().get_backend() == backend::opencl);
93+
assert(d7.is_gpu() &&
94+
d7.get_platform().get_backend() == backend::opencl &&
95+
"filter_selector(\"opencl:gpu\") failed");
11396
}
11497
}
11598

116-
std::cout << "Test '0'";
11799
device d8(filter_selector("0"));
118-
std::cout << "...PASS" << std::endl;
119100

120101
try {
121102
// pick something crazy
122103
device d9(filter_selector("gpu:999"));
123-
std::cout << "d9 = " << d9.get_info<sycl::info::device::name>()
124-
<< std::endl;
125104
} catch (const sycl::runtime_error &e) {
126105
const char *ErrorMesg =
127106
"Could not find a device that matches the specified filter(s)!";
128-
assert(std::string{e.what()}.find(ErrorMesg) == 0);
129-
std::cout << "Selector failed as expected! OK" << std::endl;
107+
assert(std::string{e.what()}.find(ErrorMesg) == 0 &&
108+
"filter_selector(\"gpu:999\") unexpectedly selected a device");
130109
}
131110

132111
try {
133112
// pick something crazy
134113
device d10(filter_selector("bob:gpu"));
135-
std::cout << "d10 = " << d10.get_info<sycl::info::device::name>()
136-
<< std::endl;
137114
} catch (const sycl::runtime_error &e) {
138115
const char *ErrorMesg = "Invalid filter string!";
139-
assert(std::string{e.what()}.find(ErrorMesg) == 0);
140-
std::cout << "Selector failed as expected! OK" << std::endl;
116+
assert(std::string{e.what()}.find(ErrorMesg) == 0 &&
117+
"filter_selector(\"bob:gpu\") unexpectedly selected a device");
141118
}
142119

143120
try {
144121
// pick something crazy
145122
device d11(filter_selector("opencl:bob"));
146-
std::cout << "d11 = " << d11.get_info<sycl::info::device::name>()
147-
<< std::endl;
148123
} catch (const sycl::runtime_error &e) {
149124
const char *ErrorMesg = "Invalid filter string!";
150-
assert(std::string{e.what()}.find(ErrorMesg) == 0);
151-
std::cout << "Selector failed as expected! OK" << std::endl;
125+
assert(std::string{e.what()}.find(ErrorMesg) == 0 &&
126+
"filter_selector(\"opencl:bob\") unexpectedly selected a device");
152127
}
153128

154129
if (HasLevelZeroDevices && HasLevelZeroGPU) {
155-
std::cout << "Test 'level_zero'";
156130
device d12(filter_selector("level_zero"));
157-
assert(d12.get_platform().get_backend() == backend::ext_oneapi_level_zero);
158-
std::cout << "...PASS" << std::endl;
131+
assert(d12.get_platform().get_backend() == backend::ext_oneapi_level_zero &&
132+
"filter_selector(\"level_zero\") failed");
159133

160-
std::cout << "Test 'level_zero:gpu'";
161134
device d13(filter_selector("level_zero:gpu"));
162135
assert(d13.is_gpu() &&
163-
d13.get_platform().get_backend() == backend::ext_oneapi_level_zero);
164-
std::cout << "...PASS" << std::endl;
136+
d13.get_platform().get_backend() == backend::ext_oneapi_level_zero &&
137+
"filter_selector(\"level_zero:gpu\") failed");
165138

166139
if (HasOpenCLDevices && !CPUs.empty()) {
167-
std::cout << "Test 'level_zero:gpu,cpu'";
168140
device d14(filter_selector("level_zero:gpu,cpu"));
169-
assert((d14.is_gpu() || d14.is_cpu()));
170-
std::cout << "...PASS 1/2" << std::endl;
141+
assert((d14.is_gpu() || d14.is_cpu()) &&
142+
"filter_selector(\"level_zero:gpu,cpu\") failed");
171143
if (d14.is_gpu()) {
172144
assert(d14.get_platform().get_backend() ==
173-
backend::ext_oneapi_level_zero);
174-
std::cout << "...PASS 2/2" << std::endl;
145+
backend::ext_oneapi_level_zero &&
146+
"filter_selector(\"level_zero:gpu,cpu\") failed");
175147
}
176148
}
177149
}
178150

179151
if (Devs.size() > 1) {
180-
std::cout << "Test '1'";
181152
device d15(filter_selector("1"));
182-
std::cout << "...PASS" << std::endl;
183153
}
184154

185155
if (HasCUDADevices) {
186-
std::cout << "Test 'cuda'";
187156
device d16(filter_selector("cuda"));
188-
assert(d16.get_platform().get_backend() == backend::ext_oneapi_cuda);
189-
std::cout << "...PASS" << std::endl;
157+
assert(d16.get_platform().get_backend() == backend::ext_oneapi_cuda &&
158+
"filter_selector(\"cuda\") failed");
190159

191-
std::cout << "Test 'cuda:gpu'";
192160
device d17(filter_selector("cuda:gpu"));
193161
assert(d17.is_gpu() &&
194-
d17.get_platform().get_backend() == backend::ext_oneapi_cuda);
195-
std::cout << "...PASS" << std::endl;
162+
d17.get_platform().get_backend() == backend::ext_oneapi_cuda &&
163+
"filter_selector(\"cuda:gpu\") failed");
196164
}
197165

198166
if (!Accels.empty()) {
199-
std::cout << "Test 'accelerator'";
200167
device d18(filter_selector("accelerator"));
201-
assert(d18.is_accelerator());
202-
std::cout << "...PASS" << std::endl;
168+
assert(d18.is_accelerator() && "filter_selector(\"accelerator\") failed");
203169
}
204170

205171
if (HasHIPDevices) {
206-
std::cout << "Test 'hip'";
207172
device d19(ext::oneapi::filter_selector("hip"));
208-
assert(d19.get_platform().get_backend() == backend::ext_oneapi_hip);
209-
std::cout << "...PASS" << std::endl;
173+
assert(d19.get_platform().get_backend() == backend::ext_oneapi_hip &&
174+
"filter_selector(\"hip\") failed");
210175

211-
std::cout << "test 'hip:gpu'";
212176
device d20(ext::oneapi::filter_selector("hip:gpu"));
213177
assert(d20.is_gpu() &&
214-
d20.get_platform().get_backend() == backend::ext_oneapi_hip);
215-
std::cout << "...PASS" << std::endl;
178+
d20.get_platform().get_backend() == backend::ext_oneapi_hip &&
179+
"filter_selector(\"hip:gpu\") failed");
216180
}
217181

218182
return 0;

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ int main() {
2323
const char *envVal = std::getenv("ONEAPI_DEVICE_SELECTOR");
2424
std::string forcedPIs;
2525
if (envVal) {
26-
std::cout << "ONEAPI_DEVICE_SELECTOR=" << envVal << std::endl;
2726
forcedPIs = envVal;
2827
}
2928
if (!envVal || forcedPIs == "*" ||
@@ -32,29 +31,23 @@ int main() {
3231
device d = ds.select_device();
3332
string name = d.get_platform().get_info<info::platform::name>();
3433
assert(name.find("Level-Zero") != string::npos);
35-
std::cout << "Level-zero GPU Device is found: " << std::boolalpha
36-
<< d.is_gpu() << std::endl;
3734
}
3835
if (envVal && forcedPIs != "*" &&
3936
forcedPIs.find("opencl:gpu") != std::string::npos) {
4037
gpu_selector gs;
4138
device d = gs.select_device();
4239
string name = d.get_platform().get_info<info::platform::name>();
4340
assert(name.find("OpenCL") != string::npos);
44-
std::cout << "OpenCL GPU Device is found: " << std::boolalpha << d.is_gpu()
45-
<< std::endl;
4641
}
4742
if (!envVal || forcedPIs == "*" ||
4843
forcedPIs.find("cpu") != std::string::npos) {
4944
cpu_selector cs;
5045
device d = cs.select_device();
51-
std::cout << "CPU device is found: " << d.is_cpu() << std::endl;
5246
}
5347
if (!envVal || forcedPIs == "*" ||
5448
forcedPIs.find("acc") != std::string::npos) {
5549
accelerator_selector as;
5650
device d = as.select_device();
57-
std::cout << "ACC device is found: " << d.is_accelerator() << std::endl;
5851
}
5952
if (envVal && (forcedPIs.find("cpu") == std::string::npos &&
6053
forcedPIs.find("opencl") == std::string::npos &&
@@ -63,10 +56,10 @@ int main() {
6356
cpu_selector cs;
6457
device d = cs.select_device();
6558
} catch (...) {
66-
std::cout << "Expectedly, CPU device is not found." << std::endl;
6759
return 0; // expected
6860
}
69-
std::cerr << "Error: CPU device is found" << std::endl;
61+
std::cerr << "Error: CPU device is found, even though it shouldn't be"
62+
<< std::endl;
7063
return -1;
7164
}
7265

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,14 @@ int main() {
1818
const char *envVal = std::getenv("ONEAPI_DEVICE_SELECTOR");
1919
std::string forcedPIs;
2020
if (envVal) {
21-
std::cout << "ONEAPI_DEVICE_SELECTOR=" << envVal << std::endl;
2221
forcedPIs = envVal;
2322
}
2423
{
2524
default_selector ds;
2625
device d = ds.select_device();
2726
string name = d.get_platform().get_info<info::platform::name>();
28-
assert(name.find("OpenCL") != string::npos);
29-
std::cout << "ACC Device is found: " << std::boolalpha << d.is_accelerator()
30-
<< std::endl;
27+
assert(name.find("OpenCL") != string::npos &&
28+
"default selector failed to find acc device");
3129
}
3230
{
3331
gpu_selector gs;
@@ -37,7 +35,6 @@ int main() {
3735
<< d.is_gpu() << std::endl;
3836
return -1;
3937
} catch (...) {
40-
std::cout << "Expectedly, GPU device is not found." << std::endl;
4138
}
4239
}
4340
{
@@ -48,15 +45,14 @@ int main() {
4845
<< d.is_cpu() << std::endl;
4946
return -1;
5047
} catch (...) {
51-
std::cout << "Expectedly, CPU device is not found." << std::endl;
5248
}
5349
}
5450
{
5551
accelerator_selector as;
5652
device d = as.select_device();
5753
string name = d.get_platform().get_info<info::platform::name>();
58-
assert(name.find("OpenCL") != string::npos);
59-
std::cout << "ACC device is found: " << d.is_accelerator() << std::endl;
54+
assert(name.find("OpenCL") != string::npos &&
55+
"accelerator_selector failed to find acc device");
6056
}
6157

6258
return 0;

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,14 @@ int main() {
1818
const char *envVal = std::getenv("ONEAPI_DEVICE_SELECTOR");
1919
std::string forcedPIs;
2020
if (envVal) {
21-
std::cout << "ONEAPI_DEVICE_SELECTOR=" << envVal << std::endl;
2221
forcedPIs = envVal;
2322
}
2423
{
2524
default_selector ds;
2625
device d = ds.select_device();
2726
string name = d.get_platform().get_info<info::platform::name>();
28-
assert(name.find("OpenCL") != string::npos);
29-
std::cout << "CPU Device is found: " << std::boolalpha << d.is_cpu()
30-
<< std::endl;
27+
assert(name.find("OpenCL") != string::npos &&
28+
"default_selector failed to find cpu device");
3129
}
3230
{
3331
gpu_selector gs;
@@ -37,13 +35,11 @@ int main() {
3735
<< std::endl;
3836
return -1;
3937
} catch (...) {
40-
std::cout << "Expectedly, GPU device is not found." << std::endl;
4138
}
4239
}
4340
{
4441
cpu_selector cs;
4542
device d = cs.select_device();
46-
std::cout << "CPU device is found: " << d.is_cpu() << std::endl;
4743
}
4844
{
4945
accelerator_selector as;
@@ -53,7 +49,6 @@ int main() {
5349
<< std::endl;
5450
return -1;
5551
} catch (...) {
56-
std::cout << "Expectedly, ACC device is not found." << std::endl;
5752
}
5853
}
5954

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ int main() {
1818
const char *envVal = getenv("ONEAPI_DEVICE_SELECTOR");
1919
string forcedPIs;
2020
if (envVal) {
21-
cout << "ONEAPI_DEVICE_SELECTOR=" << envVal << std::endl;
2221
forcedPIs = envVal;
2322
}
2423

@@ -27,15 +26,12 @@ int main() {
2726
device d = ds.select_device();
2827
string name = d.get_platform().get_info<info::platform::name>();
2928
assert(name.find("CUDA") != string::npos);
30-
cout << "CUDA GPU Device is found: " << boolalpha << d.is_gpu()
31-
<< std::endl;
3229
}
3330
{
3431
gpu_selector gs;
3532
device d = gs.select_device();
3633
string name = d.get_platform().get_info<info::platform::name>();
3734
assert(name.find("CUDA") != string::npos);
38-
cout << name << " is found: " << boolalpha << d.is_gpu() << std::endl;
3935
}
4036
{
4137
cpu_selector cs;
@@ -44,7 +40,6 @@ int main() {
4440
cerr << "CPU device is found in error: " << d.is_cpu() << std::endl;
4541
return -1;
4642
} catch (...) {
47-
cout << "Expectedly, cpu device is not found." << std::endl;
4843
}
4944
}
5045
{
@@ -54,7 +49,6 @@ int main() {
5449
cerr << "ACC device is found in error: " << d.is_accelerator()
5550
<< std::endl;
5651
} catch (...) {
57-
cout << "Expectedly, ACC device is not found." << std::endl;
5852
}
5953
}
6054

0 commit comments

Comments
 (0)