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

Author: mateuszpn

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

@@ -32,8 +32,8 @@ inline void init(const std::string &name) { get_logger(name.c_str()); }
 
 // use log level as a first parameter
 // available levels: QUIET, ERR, WARN, INFO, DEBUG
-#define UR_LOG(...) URLOG_(::logger::get_logger(), __VA_ARGS__)
-#define UR_LOG_LEGACY(...) URLOG_L_(::logger::get_logger(), __VA_ARGS__)
+#define UR_LOG(level, ...) URLOG_(::logger::get_logger(), level, __VA_ARGS__)
+#define UR_LOG_LEGACY(level, ...) URLOG_L_(::logger::get_logger(), level, __VA_ARGS__)
 
 // TODO: consider removing UR_LOG_L and maybe UR_LOG_LEGACY macros, using UR_LOG
 // instead

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

@@ -131,11 +131,6 @@ class Logger {
 
 // some symbols usefuls for log levels are predfined in some systems,
 // eg. ERROR on Windows
-#define URLOG_(logger_instance, level, ...)                                    \
-  URLOG_##level(logger_instance, __VA_ARGS__)
-#define URLOG_L_(logger_instance, level, ...)                                  \
-  URLOG_L_##level(logger_instance, __VA_ARGS__)
-
 #define URLOG_ERR(logger_instance, ...)                                        \
   URLOG2_(logger_instance, UR_LOGGER_LEVEL_ERROR, __VA_ARGS__)
 #define URLOG_WARN(logger_instance, ...)                                       \
@@ -158,4 +153,9 @@ class Logger {
 #define URLOG_L_QUIET(logger_instance, ...)                                    \
   URLOG_L2_(logger_instance, UR_LOGGER_LEVEL_QUIET, __VA_ARGS__)
 
+#define URLOG_(logger_instance, level, ...)                                    \
+  URLOG_##level(logger_instance, __VA_ARGS__)
+#define URLOG_L_(logger_instance, level, ...)                                  \
+  URLOG_L_##level(logger_instance, __VA_ARGS__)
+
 #endif /* UR_LOGGER_DETAILS_HPP */