Merge pull request #1345 from lplewa/native_cpu_log

Refactor native cpu adapter to new logger

Author: kbenzie

source/adapters/native_cpu/adapter.cpp

@@ -13,6 +13,7 @@
 
 struct ur_adapter_handle_t_ {
   std::atomic<uint32_t> RefCount = 0;
+  logger::Logger &logger = logger::get_logger("native_cpu");
 } Adapter;
 
 UR_APIEXPORT ur_result_t UR_APICALL urAdapterGet(

source/adapters/native_cpu/common.cpp

@@ -29,6 +29,6 @@ ur_result_t urGetLastResult(ur_platform_handle_t, const char **ppMessage) {
 }
 
 void detail::ur::die(const char *pMessage) {
-  std::cerr << "ur_die: " << pMessage << '\n';
+  logger::always("ur_die: {}", pMessage);
   std::terminate();
 }

source/adapters/native_cpu/common.hpp

@@ -10,6 +10,7 @@
 
 #pragma once
 
+#include "logger/ur_logger.hpp"
 #include "ur/ur.hpp"
 
 constexpr size_t MaxMessageSize = 256;
@@ -18,29 +19,24 @@ extern thread_local ur_result_t ErrorMessageCode;
 extern thread_local char ErrorMessage[MaxMessageSize];
 
 #define DIE_NO_IMPLEMENTATION                                                  \
-  if (PrintTrace) {                                                            \
-    std::cerr << "Not Implemented : " << __FUNCTION__                          \
-              << " - File : " << __FILE__;                                     \
-    std::cerr << " / Line : " << __LINE__ << std::endl;                        \
-  }                                                                            \
-  return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
+  do {                                                                         \
+    logger::error("Not Implemented : {} - File : {} / Line : {}",              \
+                  __FUNCTION__, __FILE__, __LINE__);                           \
+                                                                               \
+    return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;                                \
+  } while (false);
 
 #define CONTINUE_NO_IMPLEMENTATION                                             \
-  if (PrintTrace) {                                                            \
-    std::cerr << "Warning : Not Implemented : " << __FUNCTION__                \
-              << " - File : " << __FILE__;                                     \
-    std::cerr << " / Line : " << __LINE__ << std::endl;                        \
-  }                                                                            \
-  return UR_RESULT_SUCCESS;
+  do {                                                                         \
+    logger::warning("Not Implemented : {} - File : {} / Line : {}",            \
+                    __FUNCTION__, __FILE__, __LINE__);                         \
+    return UR_RESULT_SUCCESS;                                                  \
+  } while (false);
 
 #define CASE_UR_UNSUPPORTED(not_supported)                                     \
   case not_supported:                                                          \
-    if (PrintTrace) {                                                          \
-      std::cerr << std::endl                                                   \
-                << "Unsupported UR case : " << #not_supported << " in "        \
-                << __FUNCTION__ << ":" << __LINE__ << "(" << __FILE__ << ")"   \
-                << std::endl;                                                  \
-    }                                                                          \
+    logger::error("Unsupported UR case : {} in {}:{}({})", #not_supported,     \
+                  __FUNCTION__, __LINE__, __FILE__);                           \
     return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
 
 /// ------ Error handling, matching OpenCL plugin semantics.

source/adapters/native_cpu/device.cpp

@@ -32,9 +32,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGet(ur_platform_handle_t hPlatform,
   if (NumEntries == 0) {
     /// Runtime queries number of devices
     if (phDevices != nullptr) {
-      if (PrintTrace) {
-        std::cerr << "Invalid Arguments for urDevicesGet\n";
-      }
+      logger::error("Invalid Arguments for urDevicesGet");
       return UR_RESULT_ERROR_INVALID_VALUE;
     }
     return UR_RESULT_SUCCESS;

source/adapters/native_cpu/platform.cpp

@@ -28,9 +28,7 @@ urPlatformGet(ur_adapter_handle_t *, uint32_t, uint32_t NumEntries,
 
   if (NumEntries == 0) {
     if (phPlatforms != nullptr) {
-      if (PrintTrace) {
-        std::cerr << "Invalid argument combination for urPlatformsGet\n";
-      }
+      logger::error("Invalid argument combination for urPlatformsGet");
       return UR_RESULT_ERROR_INVALID_VALUE;
     }
     return UR_RESULT_SUCCESS;