Merge branch 'urlog' of github.com:mateuszpn/llvm into urlog

Author: mateuszpn

unified-runtime/source/adapters/native_cpu/common.hpp

@@ -22,7 +22,6 @@ extern thread_local char ErrorMessage[MaxMessageSize];
 #define DIE_NO_IMPLEMENTATION                                                  \
   do {                                                                         \
     URLOG(ERR, "Not Implemented : {}", __FUNCTION__)                           \
-                                                                               \
     return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;                                \
   } while (false)
 
@@ -34,8 +33,7 @@ extern thread_local char ErrorMessage[MaxMessageSize];
 
 #define CASE_UR_UNSUPPORTED(not_supported)                                     \
   case not_supported:                                                          \
-    URLOG(ERR, "Unsupported UR case : {} in {}", #not_supported,               \
-          __FUNCTION__)                                                        \
+    URLOG(ERR, "Unsupported UR case : {} in {}", #not_supported, __FUNCTION__) \
     return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
 // Todo: replace this with a common helper once it is available

unified-runtime/source/common/logger/ur_sinks.hpp

@@ -15,6 +15,7 @@
 #include "ur_filesystem_resolved.hpp"
 #include "ur_level.hpp"
 #include "ur_print.hpp"
+#include <assert.h>
 
 namespace logger {
 
@@ -100,18 +101,18 @@ class Sink {
         if (*(++fmt) == '{') {
           buffer << *fmt++;
         } else {
-        //   std::cerr << error_prefix
-        //             << "No arguments provided and braces not escaped!"
-        //             << std::endl;
-        assert(false & "No arguments provided and braces not escaped!");
+          //   std::cerr << error_prefix
+          //             << "No arguments provided and braces not escaped!"
+          //             << std::endl;
+          assert(false && "No arguments provided and braces not escaped!");
         }
       } else if (*fmt == '}') {
         if (*(++fmt) == '}') {
           buffer << *fmt++;
         } else {
-        //   std::cerr << error_prefix << "Closing curly brace not escaped!"
-        //             << std::endl;
-        assert(false & "Closing curly brace not escaped!");
+          //   std::cerr << error_prefix << "Closing curly brace not escaped!"
+          //             << std::endl;
+          assert(false && "Closing curly brace not escaped!");
         }
       }
     }