Alt design for RTCHashResult

Signed-off-by: Julian Oppermann <[email protected]>

Author: jopperm

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

@@ -58,21 +58,35 @@ class JITResult {
 
 class RTCHashResult {
 public:
-  explicit RTCHashResult(const char *PreprocLog)
-      : Failed{true}, Hash{}, PreprocLog{PreprocLog} {}
-  RTCHashResult(const char *Hash, const char *PreprocLog)
-      : Failed{false}, Hash{Hash}, PreprocLog{PreprocLog} {}
+  static RTCHashResult success(const char *Hash) {
+    return RTCHashResult{/*Failed=*/false, Hash};
+  }
+
+  static RTCHashResult failure(const char *PreprocLog) {
+    return RTCHashResult{/*Failed=*/true, PreprocLog};
+  }
 
   bool failed() { return Failed; }
 
-  const char *getPreprocLog() { return PreprocLog.c_str(); }
+  const char *getPreprocLog() {
+    assert(failed() && "No preprocessor log");
+    return PreprocLog.c_str();
+  }
 
   const char *getHash() {
     assert(!failed() && "No hash");
     return Hash.c_str();
   }
 
 private:
+  RTCHashResult(bool Failed, const char *Str) : Failed(Failed) {
+    if (!Failed) {
+      this->Hash = Str;
+    } else {
+      this->PreprocLog = Str;
+    }
+  }
+
   bool Failed;
   sycl::detail::string Hash;
   sycl::detail::string PreprocLog;

sycl-jit/jit-compiler/lib/KernelFusion.cpp

@@ -252,15 +252,18 @@ calculateHash(InMemoryFile SourceFile, View<InMemoryFile> IncludeFiles,
               View<const char *> UserArgs) {
   auto UserArgListOrErr = parseUserArgs(UserArgs);
   if (!UserArgListOrErr) {
-    return errorTo<RTCHashResult>(UserArgListOrErr.takeError(),
-                                  "Parsing of user arguments failed");
+    return RTCHashResult::failure(
+        formatError(UserArgListOrErr.takeError(),
+                    "Parsing of user arguments failed")
+            .c_str());
   }
   llvm::opt::InputArgList UserArgList = std::move(*UserArgListOrErr);
 
   auto Start = std::chrono::high_resolution_clock::now();
   auto HashOrError = calculateHash(SourceFile, IncludeFiles, UserArgList);
   if (!HashOrError) {
-    return errorTo<RTCHashResult>(HashOrError.takeError(), "Hashing failed");
+    return RTCHashResult::failure(
+        formatError(HashOrError.takeError(), "Hashing failed").c_str());
   }
   auto Hash = *HashOrError;
   auto Stop = std::chrono::high_resolution_clock::now();
@@ -271,7 +274,7 @@ calculateHash(InMemoryFile SourceFile, View<InMemoryFile> IncludeFiles,
                  << int(HashTime.count()) << " ms\n";
   }
 
-  return RTCHashResult{Hash.c_str(), /*PreprocLog=*/""};
+  return RTCHashResult::success(Hash.c_str());
 }
 
 extern "C" KF_EXPORT_SYMBOL RTCResult

sycl/source/detail/jit_compiler.cpp

@@ -1284,8 +1284,9 @@ sycl_device_binaries jit_compiler::compileSYCL(
     auto Result =
         CalculateHashHandle(SourceFile, IncludeFilesView, UserArgsView);
 
-    appendToLog(Result.getPreprocLog());
-    if (!Result.failed()) {
+    if (Result.failed()) {
+      appendToLog(Result.getPreprocLog());
+    } else {
       CacheKey = Result.getHash();
       CachedIR = PersistentDeviceCodeCache::getDeviceCodeIRFromDisc(CacheKey);
     }