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

Commit 68733c1

Browse files
steffenlarsenAlexeySachkov
steffenlarsen
and
AlexeySachkov
authored
[SYCL] Remove host run and dependencies from SYCL/Config tests (#1200)
This commit removes the host run and any assumptions and operations related to the host device from the tests in SYCL/Config. Co-authored-by: Sachkov, Alexey <alexey.sachkov@intel.com> Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>
1 parent 7b348b3 commit 68733c1

File tree

1 file changed

+145
-163
lines changed

1 file changed

+145
-163
lines changed

‎SYCL/Config/select_device.cpp‎

Lines changed: 145 additions & 163 deletions
Original file line numberDiff line numberDiff line change
@@ -180,38 +180,35 @@ int main() {
180180
fs.open("select_device_config.txt");
181181
if (fs.is_open()) {
182182
for (const auto &plt : platform::get_platforms()) {
183-
if (!plt.has(aspect::host)) {
184-
for (const auto &dev : plt.get_devices()) {
185-
if (dev.has(aspect::gpu)) {
186-
std::string name = dev.get_info<info::device::name>();
187-
addEscapeSymbolToSpecialCharacters(name);
188-
std::string ver = dev.get_info<info::device::driver_version>();
189-
if ((plt.get_backend() == backend::opencl) &&
190-
(sycl_be.find("opencl") != std::string::npos)) {
191-
fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
192-
<< "}}" << std::endl;
193-
passed = true;
194-
break;
195-
} else if ((plt.get_backend() ==
196-
backend::ext_oneapi_level_zero) &&
197-
(sycl_be.find("level_zero") != std::string::npos)) {
198-
fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
199-
<< "}}" << std::endl;
200-
passed = true;
201-
break;
202-
} else if ((plt.get_backend() == backend::ext_oneapi_cuda) &&
203-
(sycl_be.find("cuda") != std::string::npos)) {
204-
fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
205-
<< "}}" << std::endl;
206-
passed = true;
207-
break;
208-
} else if ((plt.get_backend() == backend::ext_oneapi_hip) &&
209-
(sycl_be.find("hip") != std::string::npos)) {
210-
fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
211-
<< "}}" << std::endl;
212-
passed = true;
213-
break;
214-
}
183+
for (const auto &dev : plt.get_devices()) {
184+
if (dev.has(aspect::gpu)) {
185+
std::string name = dev.get_info<info::device::name>();
186+
addEscapeSymbolToSpecialCharacters(name);
187+
std::string ver = dev.get_info<info::device::driver_version>();
188+
if ((plt.get_backend() == backend::opencl) &&
189+
(sycl_be.find("opencl") != std::string::npos)) {
190+
fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
191+
<< "}}" << std::endl;
192+
passed = true;
193+
break;
194+
} else if ((plt.get_backend() == backend::ext_oneapi_level_zero) &&
195+
(sycl_be.find("level_zero") != std::string::npos)) {
196+
fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
197+
<< "}}" << std::endl;
198+
passed = true;
199+
break;
200+
} else if ((plt.get_backend() == backend::ext_oneapi_cuda) &&
201+
(sycl_be.find("cuda") != std::string::npos)) {
202+
fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
203+
<< "}}" << std::endl;
204+
passed = true;
205+
break;
206+
} else if ((plt.get_backend() == backend::ext_oneapi_hip) &&
207+
(sycl_be.find("hip") != std::string::npos)) {
208+
fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
209+
<< "}}" << std::endl;
210+
passed = true;
211+
break;
215212
}
216213
}
217214
}
@@ -313,25 +310,23 @@ int main() {
313310
fs.open("select_device_config.txt");
314311
if (fs.is_open()) {
315312
for (const auto &plt : platform::get_platforms()) {
316-
if (!plt.has(aspect::host)) {
317-
for (const auto &dev : plt.get_devices()) {
318-
if (dev.has(aspect::gpu)) {
319-
std::string name = dev.get_info<info::device::name>();
320-
addEscapeSymbolToSpecialCharacters(name);
321-
std::string ver("98.76.54321");
322-
if (((plt.get_backend() == backend::opencl) &&
323-
(sycl_be.find("opencl") != std::string::npos)) ||
324-
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
325-
(sycl_be.find("level_zero") != std::string::npos)) ||
326-
((plt.get_backend() == backend::ext_oneapi_cuda) &&
327-
(sycl_be.find("cuda") != std::string::npos)) ||
328-
((plt.get_backend() == backend::ext_oneapi_hip) &&
329-
(sycl_be.find("hip") != std::string::npos))) {
330-
fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
331-
<< "}}" << std::endl;
332-
passed = true;
333-
break;
334-
}
313+
for (const auto &dev : plt.get_devices()) {
314+
if (dev.has(aspect::gpu)) {
315+
std::string name = dev.get_info<info::device::name>();
316+
addEscapeSymbolToSpecialCharacters(name);
317+
std::string ver("98.76.54321");
318+
if (((plt.get_backend() == backend::opencl) &&
319+
(sycl_be.find("opencl") != std::string::npos)) ||
320+
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
321+
(sycl_be.find("level_zero") != std::string::npos)) ||
322+
((plt.get_backend() == backend::ext_oneapi_cuda) &&
323+
(sycl_be.find("cuda") != std::string::npos)) ||
324+
((plt.get_backend() == backend::ext_oneapi_hip) &&
325+
(sycl_be.find("hip") != std::string::npos))) {
326+
fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
327+
<< "}}" << std::endl;
328+
passed = true;
329+
break;
335330
}
336331
}
337332
}
@@ -446,45 +441,40 @@ int main() {
446441
fs.open("select_device_config.txt");
447442
if (fs.is_open()) {
448443
for (const auto &plt : platform::get_platforms()) {
449-
if (!plt.has(aspect::host)) {
450-
for (const auto &dev : plt.get_devices()) {
451-
if (dev.has(aspect::gpu)) {
452-
std::string name = dev.get_info<info::device::name>();
453-
addEscapeSymbolToSpecialCharacters(name);
454-
std::string ver = dev.get_info<info::device::driver_version>();
455-
size_t pos = 0;
456-
if (((plt.get_backend() == backend::opencl) &&
457-
(sycl_be.find("opencl") != std::string::npos)) ||
458-
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
459-
(sycl_be.find("level_zero") != std::string::npos))) {
460-
if ((pos = ver.find(".")) == std::string::npos) {
461-
throw std::runtime_error(
462-
"Malformed syntax in version string");
463-
}
464-
pos++;
465-
size_t start = pos;
466-
if ((pos = ver.find(".", pos)) == std::string::npos) {
467-
throw std::runtime_error(
468-
"Malformed syntax in version string");
469-
}
470-
ver.replace(start, pos - start, "*");
471-
} else if (((plt.get_backend() == backend::ext_oneapi_cuda) &&
472-
(sycl_be.find("cuda") != std::string::npos)) ||
473-
((plt.get_backend() == backend::ext_oneapi_hip) &&
474-
(sycl_be.find("hip") != std::string::npos))) {
475-
if ((pos = ver.find(".")) == std::string::npos) {
476-
throw std::runtime_error(
477-
"Malformed syntax in version string");
478-
}
479-
pos++;
480-
ver.replace(pos, ver.length(), "*");
444+
for (const auto &dev : plt.get_devices()) {
445+
if (dev.has(aspect::gpu)) {
446+
std::string name = dev.get_info<info::device::name>();
447+
addEscapeSymbolToSpecialCharacters(name);
448+
std::string ver = dev.get_info<info::device::driver_version>();
449+
size_t pos = 0;
450+
if (((plt.get_backend() == backend::opencl) &&
451+
(sycl_be.find("opencl") != std::string::npos)) ||
452+
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
453+
(sycl_be.find("level_zero") != std::string::npos))) {
454+
if ((pos = ver.find(".")) == std::string::npos) {
455+
throw std::runtime_error("Malformed syntax in version string");
481456
}
482-
483-
fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
484-
<< "}}" << std::endl;
485-
passed = true;
486-
break;
457+
pos++;
458+
size_t start = pos;
459+
if ((pos = ver.find(".", pos)) == std::string::npos) {
460+
throw std::runtime_error("Malformed syntax in version string");
461+
}
462+
ver.replace(start, pos - start, "*");
463+
} else if (((plt.get_backend() == backend::ext_oneapi_cuda) &&
464+
(sycl_be.find("cuda") != std::string::npos)) ||
465+
((plt.get_backend() == backend::ext_oneapi_hip) &&
466+
(sycl_be.find("hip") != std::string::npos))) {
467+
if ((pos = ver.find(".")) == std::string::npos) {
468+
throw std::runtime_error("Malformed syntax in version string");
469+
}
470+
pos++;
471+
ver.replace(pos, ver.length(), "*");
487472
}
473+
474+
fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
475+
<< "}}" << std::endl;
476+
passed = true;
477+
break;
488478
}
489479
}
490480
}
@@ -527,23 +517,21 @@ int main() {
527517
fs.open("select_device_config.txt");
528518
if (fs.is_open()) {
529519
for (const auto &plt : platform::get_platforms()) {
530-
if (!plt.has(aspect::host)) {
531-
for (const auto &dev : plt.get_devices()) {
532-
if (dev.has(aspect::gpu)) {
533-
std::string name = dev.get_info<info::device::name>();
534-
addEscapeSymbolToSpecialCharacters(name);
535-
if (((plt.get_backend() == backend::opencl) &&
536-
(sycl_be.find("opencl") != std::string::npos)) ||
537-
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
538-
(sycl_be.find("level_zero") != std::string::npos)) ||
539-
((plt.get_backend() == backend::ext_oneapi_cuda) &&
540-
(sycl_be.find("cuda") != std::string::npos)) ||
541-
((plt.get_backend() == backend::ext_oneapi_hip) &&
542-
(sycl_be.find("hip") != std::string::npos))) {
543-
fs << "DeviceName:{{" << name << "}}" << std::endl;
544-
passed = true;
545-
break;
546-
}
520+
for (const auto &dev : plt.get_devices()) {
521+
if (dev.has(aspect::gpu)) {
522+
std::string name = dev.get_info<info::device::name>();
523+
addEscapeSymbolToSpecialCharacters(name);
524+
if (((plt.get_backend() == backend::opencl) &&
525+
(sycl_be.find("opencl") != std::string::npos)) ||
526+
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
527+
(sycl_be.find("level_zero") != std::string::npos)) ||
528+
((plt.get_backend() == backend::ext_oneapi_cuda) &&
529+
(sycl_be.find("cuda") != std::string::npos)) ||
530+
((plt.get_backend() == backend::ext_oneapi_hip) &&
531+
(sycl_be.find("hip") != std::string::npos))) {
532+
fs << "DeviceName:{{" << name << "}}" << std::endl;
533+
passed = true;
534+
break;
547535
}
548536
}
549537
}
@@ -636,29 +624,27 @@ int main() {
636624
std::stringstream ss;
637625
int count = 0;
638626
for (const auto &plt : platform::get_platforms()) {
639-
if (!plt.has(aspect::host)) {
640-
for (const auto &dev : plt.get_devices()) {
641-
if (dev.has(aspect::gpu)) {
642-
std::string name = dev.get_info<info::device::name>();
643-
addEscapeSymbolToSpecialCharacters(name);
644-
std::string ver = dev.get_info<info::device::driver_version>();
645-
if (((plt.get_backend() == backend::opencl) &&
646-
(sycl_be.find("opencl") != std::string::npos)) ||
647-
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
648-
(sycl_be.find("level_zero") != std::string::npos)) ||
649-
((plt.get_backend() == backend::ext_oneapi_cuda) &&
650-
(sycl_be.find("cuda") != std::string::npos)) ||
651-
((plt.get_backend() == backend::ext_oneapi_hip) &&
652-
(sycl_be.find("hip") != std::string::npos))) {
653-
if (count > 0) {
654-
ss << " | ";
655-
}
656-
ss << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
657-
<< "}}";
658-
count++;
659-
passed = true;
660-
break;
627+
for (const auto &dev : plt.get_devices()) {
628+
if (dev.has(aspect::gpu)) {
629+
std::string name = dev.get_info<info::device::name>();
630+
addEscapeSymbolToSpecialCharacters(name);
631+
std::string ver = dev.get_info<info::device::driver_version>();
632+
if (((plt.get_backend() == backend::opencl) &&
633+
(sycl_be.find("opencl") != std::string::npos)) ||
634+
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
635+
(sycl_be.find("level_zero") != std::string::npos)) ||
636+
((plt.get_backend() == backend::ext_oneapi_cuda) &&
637+
(sycl_be.find("cuda") != std::string::npos)) ||
638+
((plt.get_backend() == backend::ext_oneapi_hip) &&
639+
(sycl_be.find("hip") != std::string::npos))) {
640+
if (count > 0) {
641+
ss << " | ";
661642
}
643+
ss << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
644+
<< "}}";
645+
count++;
646+
passed = true;
647+
break;
662648
}
663649
}
664650
}
@@ -703,23 +689,21 @@ int main() {
703689
fs.open("select_device_config.txt");
704690
if (fs.is_open()) {
705691
for (const auto &plt : platform::get_platforms()) {
706-
if (!plt.has(aspect::host)) {
707-
for (const auto &dev : plt.get_devices()) {
708-
if (dev.has(aspect::gpu)) {
709-
std::string name = dev.get_info<info::device::name>();
710-
addEscapeSymbolToSpecialCharacters(name);
711-
if (((plt.get_backend() == backend::opencl) &&
712-
(sycl_be.find("opencl") != std::string::npos)) ||
713-
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
714-
(sycl_be.find("level_zero") != std::string::npos)) ||
715-
((plt.get_backend() == backend::ext_oneapi_cuda) &&
716-
(sycl_be.find("cuda") != std::string::npos)) ||
717-
((plt.get_backend() == backend::ext_oneapi_hip) &&
718-
(sycl_be.find("hip") != std::string::npos))) {
719-
fs << "DeviceName:HAHA{{" << name << "}}" << std::endl;
720-
passed = true;
721-
break;
722-
}
692+
for (const auto &dev : plt.get_devices()) {
693+
if (dev.has(aspect::gpu)) {
694+
std::string name = dev.get_info<info::device::name>();
695+
addEscapeSymbolToSpecialCharacters(name);
696+
if (((plt.get_backend() == backend::opencl) &&
697+
(sycl_be.find("opencl") != std::string::npos)) ||
698+
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
699+
(sycl_be.find("level_zero") != std::string::npos)) ||
700+
((plt.get_backend() == backend::ext_oneapi_cuda) &&
701+
(sycl_be.find("cuda") != std::string::npos)) ||
702+
((plt.get_backend() == backend::ext_oneapi_hip) &&
703+
(sycl_be.find("hip") != std::string::npos))) {
704+
fs << "DeviceName:HAHA{{" << name << "}}" << std::endl;
705+
passed = true;
706+
break;
723707
}
724708
}
725709
}
@@ -833,25 +817,23 @@ int main() {
833817
fs.open("select_device_config.txt");
834818
if (fs.is_open()) {
835819
for (const auto &plt : platform::get_platforms()) {
836-
if (!plt.has(aspect::host)) {
837-
for (const auto &dev : plt.get_devices()) {
838-
if (dev.has(aspect::gpu)) {
839-
std::string name = dev.get_info<info::device::name>();
840-
addEscapeSymbolToSpecialCharacters(name);
841-
std::string ver = dev.get_info<info::device::driver_version>();
842-
if (((plt.get_backend() == backend::opencl) &&
843-
(sycl_be.find("opencl") != std::string::npos)) ||
844-
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
845-
(sycl_be.find("level_zero") != std::string::npos)) ||
846-
((plt.get_backend() == backend::ext_oneapi_cuda) &&
847-
(sycl_be.find("cuda") != std::string::npos)) ||
848-
((plt.get_backend() == backend::ext_oneapi_hip) &&
849-
(sycl_be.find("hip") != std::string::npos))) {
850-
fs << "DeviceName:{{" << name << "}},DriverVersion:HAHA{{"
851-
<< ver << "}}" << std::endl;
852-
passed = true;
853-
break;
854-
}
820+
for (const auto &dev : plt.get_devices()) {
821+
if (dev.has(aspect::gpu)) {
822+
std::string name = dev.get_info<info::device::name>();
823+
addEscapeSymbolToSpecialCharacters(name);
824+
std::string ver = dev.get_info<info::device::driver_version>();
825+
if (((plt.get_backend() == backend::opencl) &&
826+
(sycl_be.find("opencl") != std::string::npos)) ||
827+
((plt.get_backend() == backend::ext_oneapi_level_zero) &&
828+
(sycl_be.find("level_zero") != std::string::npos)) ||
829+
((plt.get_backend() == backend::ext_oneapi_cuda) &&
830+
(sycl_be.find("cuda") != std::string::npos)) ||
831+
((plt.get_backend() == backend::ext_oneapi_hip) &&
832+
(sycl_be.find("hip") != std::string::npos))) {
833+
fs << "DeviceName:{{" << name << "}},DriverVersion:HAHA{{" << ver
834+
<< "}}" << std::endl;
835+
passed = true;
836+
break;
855837
}
856838
}
857839
}

0 commit comments

Comments
 (0)