[SYCL] Make the build and compile exceptions messages more descriptive.

Added a build information to exceptions which can be thrown from
compile[build]_with_source[kernel_type] methods of program class.

Signed-off-by: Alexey Voronov <[email protected]>

Author: alexeyvoronov-intel

sycl/include/CL/sycl/detail/pi.h

@@ -81,7 +81,8 @@ typedef enum {
   PI_DEVICE_INFO_TYPE           = CL_DEVICE_TYPE,
   PI_DEVICE_INFO_PARENT         = CL_DEVICE_PARENT_DEVICE,
   PI_DEVICE_INFO_PLATFORM       = CL_DEVICE_PLATFORM,
-  PI_DEVICE_INFO_PARTITION_TYPE = CL_DEVICE_PARTITION_TYPE
+  PI_DEVICE_INFO_PARTITION_TYPE = CL_DEVICE_PARTITION_TYPE,
+  PI_DEVICE_INFO_NAME           = CL_DEVICE_NAME
 } _pi_device_info;
 
 // TODO: populate

sycl/include/CL/sycl/detail/program_impl.hpp

@@ -361,8 +361,8 @@ class program_impl {
         0, nullptr, nullptr, nullptr, nullptr));
 
     if (Err != PI_SUCCESS) {
-      // TODO make the exception message more descriptive
-      throw compile_program_error("Program compilation error");
+      throw compile_program_error("Program compilation error:\n" +
+                                  ProgramManager::getProgramBuildLog(Program));
     }
     CompileOptions = Options;
     BuildOptions = Options;
@@ -377,8 +377,8 @@ class program_impl {
         nullptr, nullptr));
 
     if (Err != PI_SUCCESS) {
-      // TODO make the exception message more descriptive
-      throw compile_program_error("Program build error");
+      throw compile_program_error("Program build error:\n" +
+                                  ProgramManager::getProgramBuildLog(Program));
     }
     BuildOptions = Options;
   }

sycl/include/CL/sycl/detail/program_manager/program_manager.hpp

@@ -60,6 +60,7 @@ class ProgramManager {
   void addImages(pi_device_binaries DeviceImages);
   void debugDumpBinaryImages() const;
   void debugDumpBinaryImage(const DeviceImage *Img) const;
+  static string_class getProgramBuildLog(const RT::PiProgram &Program);
 
 private:
   RT::PiProgram loadProgram(OSModuleHandle M, const context &Context,

sycl/source/detail/program_manager/program_manager.cpp

@@ -124,6 +124,32 @@ RT::PiProgram ProgramManager::getClProgramFromClKernel(RT::PiKernel Kernel) {
   return Program;
 }
 
+string_class ProgramManager::getProgramBuildLog(const RT::PiProgram &Program) {
+  size_t Size = 0;
+  PI_CALL(RT::piProgramGetInfo(Program, CL_PROGRAM_DEVICES, 0, nullptr, &Size));
+  vector_class<RT::PiDevice> PIDevices(Size / sizeof(RT::PiDevice));
+  PI_CALL(RT::piProgramGetInfo(Program, CL_PROGRAM_DEVICES, Size,
+                               PIDevices.data(), nullptr));
+  string_class Log = "The program was built for " +
+                     std::to_string(PIDevices.size()) + " devices";
+  for (RT::PiDevice &Device : PIDevices) {
+    PI_CALL(RT::piProgramGetBuildInfo(Program, Device, CL_PROGRAM_BUILD_LOG, 0,
+                                      nullptr, &Size));
+    vector_class<char> DeviceBuildInfo(Size);
+    PI_CALL(RT::piProgramGetBuildInfo(Program, Device, CL_PROGRAM_BUILD_LOG,
+                                      Size, DeviceBuildInfo.data(), nullptr));
+    PI_CALL(
+        RT::piDeviceGetInfo(Device, PI_DEVICE_INFO_NAME, 0, nullptr, &Size));
+    vector_class<char> DeviceName(Size);
+    PI_CALL(RT::piDeviceGetInfo(Device, PI_DEVICE_INFO_NAME, Size,
+                                DeviceName.data(), nullptr));
+
+    Log += "\nBuild program log for '" + string_class(DeviceName.data()) +
+           "':\n" + string_class(DeviceBuildInfo.data());
+  }
+  return Log;
+}
+
 void ProgramManager::build(RT::PiProgram &Program, const string_class &Options,
                            std::vector<RT::PiDevice> Devices) {
 
@@ -148,29 +174,7 @@ void ProgramManager::build(RT::PiProgram &Program, const string_class &Options,
         Opts, nullptr, nullptr)) == PI_SUCCESS)
     return;
 
-  // Get OpenCL build log and add it to the exception message.
-  size_t Size = 0;
-  PI_CALL(RT::piProgramGetInfo(
-      Program, CL_PROGRAM_DEVICES, 0, nullptr, &Size));
-
-  std::vector<RT::PiDevice> DevIds(Size / sizeof(RT::PiDevice));
-  PI_CALL(RT::piProgramGetInfo(
-      Program, CL_PROGRAM_DEVICES, Size, DevIds.data(), nullptr));
-  std::string Log;
-  for (RT::PiDevice &DevId : DevIds) {
-    PI_CALL(RT::piProgramGetBuildInfo(
-        Program, DevId, CL_PROGRAM_BUILD_LOG, 0, nullptr, &Size));
-    std::vector<char> BuildLog(Size);
-    PI_CALL(RT::piProgramGetBuildInfo(
-        Program, DevId, CL_PROGRAM_BUILD_LOG, Size,
-        BuildLog.data(), nullptr));
-
-    device Dev = createSyclObjFromImpl<device>(
-        std::make_shared<device_impl_pi>(DevId));
-    Log += "\nBuild program fail log for '" +
-           Dev.get_info<info::device::name>() + "':\n" + BuildLog.data();
-  }
-  throw compile_program_error(Log.c_str());
+  throw compile_program_error(getProgramBuildLog(Program));
 }
 
 void ProgramManager::addImages(pi_device_binaries DeviceBinary) {