[SYCL] Change tests for PI errors (#1061)

intel/llvm#6328 changes error reporting to use
PI error enumerator names rather than OpenCL ones. Some of the
test-suite tests rely on the OpenCL names being reported however, so
this commit changes these tests to use the PI equivalents instead.

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

Author: steffenlarsen

SYCL/FilterSelector/select.cpp

@@ -120,15 +120,14 @@ int main() {
   device d8(filter_selector("0"));
   std::cout << "...PASS" << std::endl;
 
-  std::string ErrorMesg(
-      "Could not find a device that matches the specified filter(s)!");
-
   try {
     // pick something crazy
     device d9(filter_selector("gpu:999"));
     std::cout << "d9 = " << d9.get_info<info::device::name>() << std::endl;
   } catch (const sycl::runtime_error &e) {
-    assert(ErrorMesg.find_first_of(e.what()) == 0);
+    const char *ErrorMesg =
+        "Could not find a device that matches the specified filter(s)!";
+    assert(std::string{e.what()}.find(ErrorMesg) == 0);
     std::cout << "Selector failed as expected! OK" << std::endl;
   }
 
@@ -137,7 +136,8 @@ int main() {
     device d10(filter_selector("bob:gpu"));
     std::cout << "d10 = " << d10.get_info<info::device::name>() << std::endl;
   } catch (const sycl::runtime_error &e) {
-    assert(ErrorMesg.find_first_of(e.what()) == 0);
+    const char *ErrorMesg = "Invalid filter string!";
+    assert(std::string{e.what()}.find(ErrorMesg) == 0);
     std::cout << "Selector failed as expected! OK" << std::endl;
   }
 
@@ -146,7 +146,8 @@ int main() {
     device d11(filter_selector("opencl:bob"));
     std::cout << "d11 = " << d11.get_info<info::device::name>() << std::endl;
   } catch (const sycl::runtime_error &e) {
-    assert(ErrorMesg.find_first_of(e.what()) == 0);
+    const char *ErrorMesg = "Invalid filter string!";
+    assert(std::string{e.what()}.find(ErrorMesg) == 0);
     std::cout << "Selector failed as expected! OK" << std::endl;
   }
 

SYCL/KernelAndProgram/build-log.cpp

@@ -21,7 +21,7 @@ void test() {
   cl::sycl::queue Queue;
 
   // Submitting this kernel should result in a compile_program_error exception
-  // with a message indicating "CL_BUILD_PROGRAM_FAILURE".
+  // with a message indicating "PI_ERROR_BUILD_PROGRAM_FAILURE".
   auto Kernel = []() {
 #ifdef __SYCL_DEVICE_ONLY__
 #ifdef GPU
@@ -43,7 +43,7 @@ void test() {
   } catch (const cl::sycl::compile_program_error &e) {
     std::string Msg(e.what());
     std::cerr << Msg << std::endl;
-    assert(Msg.find("CL_BUILD_PROGRAM_FAILURE") != std::string::npos);
+    assert(Msg.find("PI_ERROR_BUILD_PROGRAM_FAILURE") != std::string::npos);
   } catch (...) {
     assert(false && "There must be cl::sycl::compile_program_error");
   }

SYCL/KernelAndProgram/cache-build-result.cpp

@@ -38,7 +38,8 @@ void test() {
         Result = e.get_cl_code();
       } else {
         // Exception constantly adds info on its error code in the message
-        assert(Msg.find_first_of(e.what()) == 0 && "CL_BUILD_PROGRAM_FAILURE");
+        assert(Msg.find_first_of(e.what()) == 0 &&
+               "PI_ERROR_BUILD_PROGRAM_FAILURE");
         assert(Result == e.get_cl_code() && "Exception code differs");
       }
     } catch (...) {