Address more PR feedback

Signed-off-by: Lukas Sommer <[email protected]>

Author: sommerlukas

sycl-jit/jit-compiler/include/KernelFusion.h

@@ -58,16 +58,16 @@ class JITResult {
 
 class RTCResult {
 public:
-  explicit RTCResult(const char *ErrorMessage)
-      : Failed{true}, BundleInfo{}, ErrorMessage{ErrorMessage} {}
+  explicit RTCResult(const char *BuildLog)
+      : Failed{true}, BundleInfo{}, BuildLog{BuildLog} {}
 
   RTCResult(RTCBundleInfo &&BundleInfo, const char *BuildLog)
       : Failed{false}, BundleInfo{std::move(BundleInfo)},
-        ErrorMessage{BuildLog} {}
+        BuildLog{BuildLog} {}
 
   bool failed() const { return Failed; }
 
-  const char *getErrorMessage() const { return ErrorMessage.c_str(); }
+  const char *getBuildLog() const { return BuildLog.c_str(); }
 
   const RTCBundleInfo &getBundleInfo() const {
     assert(!failed() && "No bundle info");
@@ -77,7 +77,7 @@ class RTCResult {
 private:
   bool Failed;
   RTCBundleInfo BundleInfo;
-  sycl::detail::string ErrorMessage;
+  sycl::detail::string BuildLog;
 };
 
 extern "C" {

sycl-jit/jit-compiler/lib/rtc/DeviceCompilation.cpp

@@ -205,8 +205,12 @@ class LLVMDiagnosticWrapper : public llvm::DiagnosticHandler {
         return "ERROR";
       case llvm::DiagnosticSeverity::DS_Warning:
         return "WARNING";
-      default:
+      case llvm::DiagnosticSeverity::DS_Note:
         return "NOTE:";
+      case llvm::DiagnosticSeverity::DS_Remark:
+        return "REMARK:";
+      default:
+        llvm_unreachable("Unhandled case");
       }
     }(DI.getSeverity());
     LogPrinter << Prefix;
@@ -254,16 +258,15 @@ Expected<std::unique_ptr<llvm::Module>> jit_compiler::compileDeviceCode(
   IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts{new DiagnosticOptions};
   ClangDiagnosticWrapper Wrapper(BuildLog, DiagOpts.get());
   Tool.setDiagnosticConsumer(Wrapper.consumer());
+  // Suppress message "Error while processing" being printed to stdout.
+  Tool.setPrintErrorMessage(false);
 
   // Set up in-memory filesystem.
   Tool.mapVirtualFile(SourceFile.Path, SourceFile.Contents);
   for (const auto &IF : IncludeFiles) {
     Tool.mapVirtualFile(IF.Path, IF.Contents);
   }
 
-  // Suppress message "Error while processing" being printed to stdout.
-  Tool.setPrintErrorMessage(false);
-
   // Reset argument adjusters to drop the `-fsyntax-only` flag which is added by
   // default by this API.
   Tool.clearArgumentsAdjusters();

sycl/source/detail/jit_compiler.cpp

@@ -1243,11 +1243,11 @@ sycl_device_binaries jit_compiler::compileSYCL(
   auto Result = CompileSYCLHandle(SourceFile, IncludeFilesView, UserArgsView);
 
   if (LogPtr) {
-    LogPtr->append(Result.getErrorMessage());
+    LogPtr->append(Result.getBuildLog());
   }
 
   if (Result.failed()) {
-    throw sycl::exception(sycl::errc::build, Result.getErrorMessage());
+    throw sycl::exception(sycl::errc::build, Result.getBuildLog());
   }
 
   return createDeviceBinaryImage(Result.getBundleInfo());