Skip to content

Commit 650d475

Browse files
glyons-intelglyons-intel
committed
Incorporated code review comments
Signed-off-by: Gail Lyons <[email protected]>
1 parent 55b0857 commit 650d475

File tree

1 file changed

+47
-80
lines changed

1 file changed

+47
-80
lines changed

‎sycl/test/config/select_device.cpp‎

Lines changed: 47 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ static void replaceSpecialCharacters(std::string &str) {
8181
std::string rparen(")");
8282
std::string esclparen("\\(");
8383
std::string escrparen("\\)");
84+
std::string period(".");
85+
std::string escperiod("\\.");
8486

8587
size_t pos = 0;
8688
while ((pos = str.find(lparen, pos)) != std::string::npos) {
@@ -92,6 +94,11 @@ static void replaceSpecialCharacters(std::string &str) {
9294
str.replace(pos, rparen.size(), escrparen);
9395
pos += escrparen.size();
9496
}
97+
pos = 0;
98+
while ((pos = str.find(period, pos)) != std::string::npos) {
99+
str.replace(pos, period.size(), escperiod);
100+
pos += escperiod.size();
101+
}
95102
}
96103

97104
static std::vector<DevDescT> getAllowListDesc(std::string allowList) {
@@ -256,14 +263,10 @@ int main() {
256263
std::string name = plt.get_info<info::platform::name>();
257264
replaceSpecialCharacters(name);
258265
std::string ver = plt.get_info<info::platform::version>();
259-
if ((plt.get_backend() == backend::opencl) &&
260-
(sycl_be.find("OPENCL") != std::string::npos)) {
261-
fs << "PlatformName:{{" << name << "}},PlatformVersion:{{" << ver
262-
<< "}}" << std::endl;
263-
passed = true;
264-
break;
265-
} else if ((plt.get_backend() == backend::level_zero) &&
266-
(sycl_be.find("LEVEL_ZERO") != std::string::npos)) {
266+
if (((plt.get_backend() == backend::opencl) &&
267+
(sycl_be.find("OPENCL") != std::string::npos)) ||
268+
((plt.get_backend() == backend::level_zero) &&
269+
(sycl_be.find("LEVEL_ZERO") != std::string::npos))) {
267270
fs << "PlatformName:{{" << name << "}},PlatformVersion:{{" << ver
268271
<< "}}" << std::endl;
269272
passed = true;
@@ -316,14 +319,10 @@ int main() {
316319
std::string name = dev.get_info<info::device::name>();
317320
replaceSpecialCharacters(name);
318321
std::string ver("98.76.54321");
319-
if ((plt.get_backend() == backend::opencl) &&
320-
(sycl_be.find("OPENCL") != std::string::npos)) {
321-
fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
322-
<< "}}" << std::endl;
323-
passed = true;
324-
break;
325-
} else if ((plt.get_backend() == backend::level_zero) &&
326-
(sycl_be.find("LEVEL_ZERO") != std::string::npos)) {
322+
if (((plt.get_backend() == backend::opencl) &&
323+
(sycl_be.find("OPENCL") != std::string::npos)) ||
324+
((plt.get_backend() == backend::level_zero) &&
325+
(sycl_be.find("LEVEL_ZERO") != std::string::npos))) {
327326
fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
328327
<< "}}" << std::endl;
329328
passed = true;
@@ -443,14 +442,10 @@ int main() {
443442
throw std::runtime_error("Malformed syntax in version string");
444443
}
445444
ver.replace(start, pos - start, "*");
446-
if ((plt.get_backend() == backend::opencl) &&
447-
(sycl_be.find("OPENCL") != std::string::npos)) {
448-
fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
449-
<< "}}" << std::endl;
450-
passed = true;
451-
break;
452-
} else if ((plt.get_backend() == backend::level_zero) &&
453-
(sycl_be.find("LEVEL_ZERO") != std::string::npos)) {
445+
if (((plt.get_backend() == backend::opencl) &&
446+
(sycl_be.find("OPENCL") != std::string::npos)) ||
447+
((plt.get_backend() == backend::level_zero) &&
448+
(sycl_be.find("LEVEL_ZERO") != std::string::npos))) {
454449
fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
455450
<< "}}" << std::endl;
456451
passed = true;
@@ -504,13 +499,10 @@ int main() {
504499
if (dev.has(aspect::gpu)) {
505500
std::string name = dev.get_info<info::device::name>();
506501
replaceSpecialCharacters(name);
507-
if ((plt.get_backend() == backend::opencl) &&
508-
(sycl_be.find("OPENCL") != std::string::npos)) {
509-
fs << "DeviceName:{{" << name << "}}" << std::endl;
510-
passed = true;
511-
break;
512-
} else if ((plt.get_backend() == backend::level_zero) &&
513-
(sycl_be.find("LEVEL_ZERO") != std::string::npos)) {
502+
if (((plt.get_backend() == backend::opencl) &&
503+
(sycl_be.find("OPENCL") != std::string::npos)) ||
504+
((plt.get_backend() == backend::level_zero) &&
505+
(sycl_be.find("LEVEL_ZERO") != std::string::npos))) {
514506
fs << "DeviceName:{{" << name << "}}" << std::endl;
515507
passed = true;
516508
break;
@@ -556,13 +548,10 @@ int main() {
556548
if (plt.has(aspect::gpu)) {
557549
std::string name = plt.get_info<info::platform::name>();
558550
replaceSpecialCharacters(name);
559-
if ((plt.get_backend() == backend::opencl) &&
560-
(sycl_be.find("OPENCL") != std::string::npos)) {
561-
fs << "PlatformName:{{" << name << "}}" << std::endl;
562-
passed = true;
563-
break;
564-
} else if ((plt.get_backend() == backend::level_zero) &&
565-
(sycl_be.find("LEVEL_ZERO") != std::string::npos)) {
551+
if (((plt.get_backend() == backend::opencl) &&
552+
(sycl_be.find("OPENCL") != std::string::npos)) ||
553+
((plt.get_backend() == backend::level_zero) &&
554+
(sycl_be.find("LEVEL_ZERO") != std::string::npos))) {
566555
fs << "PlatformName:{{" << name << "}}" << std::endl;
567556
passed = true;
568557
break;
@@ -612,18 +601,10 @@ int main() {
612601
std::string name = dev.get_info<info::device::name>();
613602
replaceSpecialCharacters(name);
614603
std::string ver = dev.get_info<info::device::driver_version>();
615-
if ((plt.get_backend() == backend::opencl) &&
616-
(sycl_be.find("OPENCL") != std::string::npos)) {
617-
if (count > 0) {
618-
ss << " | ";
619-
}
620-
ss << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
621-
<< "}}";
622-
count++;
623-
passed = true;
624-
break;
625-
} else if ((plt.get_backend() == backend::level_zero) &&
626-
(sycl_be.find("LEVEL_ZERO") != std::string::npos)) {
604+
if (((plt.get_backend() == backend::opencl) &&
605+
(sycl_be.find("OPENCL") != std::string::npos)) ||
606+
((plt.get_backend() == backend::level_zero) &&
607+
(sycl_be.find("LEVEL_ZERO") != std::string::npos))) {
627608
if (count > 0) {
628609
ss << " | ";
629610
}
@@ -682,13 +663,10 @@ int main() {
682663
if (dev.has(aspect::gpu)) {
683664
std::string name = dev.get_info<info::device::name>();
684665
replaceSpecialCharacters(name);
685-
if ((plt.get_backend() == backend::opencl) &&
686-
(sycl_be.find("OPENCL") != std::string::npos)) {
687-
fs << "DeviceName:HAHA{{" << name << "}}" << std::endl;
688-
passed = true;
689-
break;
690-
} else if ((plt.get_backend() == backend::level_zero) &&
691-
(sycl_be.find("LEVEL_ZERO") != std::string::npos)) {
666+
if (((plt.get_backend() == backend::opencl) &&
667+
(sycl_be.find("OPENCL") != std::string::npos)) ||
668+
((plt.get_backend() == backend::level_zero) &&
669+
(sycl_be.find("LEVEL_ZERO") != std::string::npos))) {
692670
fs << "DeviceName:HAHA{{" << name << "}}" << std::endl;
693671
passed = true;
694672
break;
@@ -738,13 +716,10 @@ int main() {
738716
if (plt.has(aspect::gpu)) {
739717
std::string name = plt.get_info<info::platform::name>();
740718
replaceSpecialCharacters(name);
741-
if ((plt.get_backend() == backend::opencl) &&
742-
(sycl_be.find("OPENCL") != std::string::npos)) {
743-
fs << "PlatformName:HAHA{{" << name << "}}" << std::endl;
744-
passed = true;
745-
break;
746-
} else if ((plt.get_backend() == backend::level_zero) &&
747-
(sycl_be.find("LEVEL_ZERO") != std::string::npos)) {
719+
if (((plt.get_backend() == backend::opencl) &&
720+
(sycl_be.find("OPENCL") != std::string::npos)) ||
721+
((plt.get_backend() == backend::level_zero) &&
722+
(sycl_be.find("LEVEL_ZERO") != std::string::npos))) {
748723
fs << "PlatformName:HAHA{{" << name << "}}" << std::endl;
749724
passed = true;
750725
break;
@@ -795,14 +770,10 @@ int main() {
795770
std::string name = dev.get_info<info::device::name>();
796771
replaceSpecialCharacters(name);
797772
std::string ver = dev.get_info<info::device::driver_version>();
798-
if ((plt.get_backend() == backend::opencl) &&
799-
(sycl_be.find("OPENCL") != std::string::npos)) {
800-
fs << "DeviceName:{{" << name << "}},DriverVersion:HAHA{{"
801-
<< ver << "}}" << std::endl;
802-
passed = true;
803-
break;
804-
} else if ((plt.get_backend() == backend::level_zero) &&
805-
(sycl_be.find("LEVEL_ZERO") != std::string::npos)) {
773+
if (((plt.get_backend() == backend::opencl) &&
774+
(sycl_be.find("OPENCL") != std::string::npos)) ||
775+
((plt.get_backend() == backend::level_zero) &&
776+
(sycl_be.find("LEVEL_ZERO") != std::string::npos))) {
806777
fs << "DeviceName:{{" << name << "}},DriverVersion:HAHA{{"
807778
<< ver << "}}" << std::endl;
808779
passed = true;
@@ -854,14 +825,10 @@ int main() {
854825
std::string name = plt.get_info<info::platform::name>();
855826
replaceSpecialCharacters(name);
856827
std::string ver = plt.get_info<info::platform::version>();
857-
if ((plt.get_backend() == backend::opencl) &&
858-
(sycl_be.find("OPENCL") != std::string::npos)) {
859-
fs << "PlatformName:{{" << name << "}},PlatformVersion:HAHA{{"
860-
<< ver << "}}" << std::endl;
861-
passed = true;
862-
break;
863-
} else if ((plt.get_backend() == backend::level_zero) &&
864-
(sycl_be.find("LEVEL_ZERO") != std::string::npos)) {
828+
if (((plt.get_backend() == backend::opencl) &&
829+
(sycl_be.find("OPENCL") != std::string::npos)) ||
830+
((plt.get_backend() == backend::level_zero) &&
831+
(sycl_be.find("LEVEL_ZERO") != std::string::npos))) {
865832
fs << "PlatformName:{{" << name << "}},PlatformVersion:HAHA{{"
866833
<< ver << "}}" << std::endl;
867834
passed = true;

0 commit comments

Comments
 (0)