Merge from 'sycl' to 'sycl-web'

Author: iclsrc

sycl/source/device_selector.cpp

@@ -106,27 +106,30 @@ device select_device(DSelectorInvocableType DeviceSelectorInvocable,
     return *res;
   }
 
-  auto Selector = DeviceSelectorInvocable.target<int (*)(const sycl::device &)>();
-  if ((Selector && *Selector == gpu_selector_v)
-          || DeviceSelectorInvocable.target<sycl::gpu_selector>()) {
-    throw sycl::runtime_error(
-        "No device of requested type 'info::device_type::gpu' available.",
-        PI_ERROR_DEVICE_NOT_FOUND);
+  std::string Message;
+  constexpr const char Prefix[] = "No device of requested type ";
+  constexpr const char Cpu[] = "'info::device_type::cpu' ";
+  constexpr const char Gpu[] = "'info::device_type::gpu' ";
+  constexpr const char Acc[] = "'info::device_type::accelerator' ";
+  constexpr const char Suffix[] = "available.";
+  constexpr auto ReserveSize = sizeof(Prefix) + sizeof(Suffix) + sizeof(Acc);
+  Message.reserve(ReserveSize);
+  Message += Prefix;
+
+  auto Selector =
+      DeviceSelectorInvocable.target<int (*)(const sycl::device &)>();
+  if ((Selector && *Selector == gpu_selector_v) ||
+      DeviceSelectorInvocable.target<sycl::gpu_selector>()) {
+    Message += Gpu;
+  } else if ((Selector && *Selector == cpu_selector_v) ||
+             DeviceSelectorInvocable.target<sycl::cpu_selector>()) {
+    Message += Cpu;
+  } else if ((Selector && *Selector == accelerator_selector_v) ||
+             DeviceSelectorInvocable.target<sycl::accelerator_selector>()) {
+    Message += Acc;
   }
-  if ((Selector && *Selector == cpu_selector_v)
-          || DeviceSelectorInvocable.target<sycl::cpu_selector>()) {
-    throw sycl::runtime_error(
-        "No device of requested type 'info::device_type::cpu' available.",
-        PI_ERROR_DEVICE_NOT_FOUND);
-  }
-  if ((Selector && *Selector == accelerator_selector_v)
-          || DeviceSelectorInvocable.target<sycl::accelerator_selector>()) {
-    throw sycl::runtime_error("No device of requested type "
-                              "'info::device_type::accelerator' available.",
-                              PI_ERROR_DEVICE_NOT_FOUND);
-  }
-  throw sycl::runtime_error("No device of requested type available.",
-                            PI_ERROR_DEVICE_NOT_FOUND);
+  Message += Suffix;
+  throw sycl::runtime_error(Message, PI_ERROR_DEVICE_NOT_FOUND);
 }
 
 // select_device(selector)