refactor: make spdlog optional

Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>

Source: b8e212d

Author: ArturHarasimiuk

level_zero/CMakeLists.txt

@@ -194,8 +194,11 @@ if(BUILD_WITH_L0)
   endif()
 
   include_directories(${COMPUTE_RUNTIME_DIR}/third_party/opencl_headers)
-  if(UNIX)
-    set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/experimental/source/log_utility/linux/linux_logging.cpp PROPERTIES INCLUDE_DIRECTORIES ${COMPUTE_RUNTIME_DIR}/third_party/spdlog_headers)
+  if(UNIX AND DEFINED NEO_SPDLOG_DIR)
+    set_source_files_properties(
+                                ${CMAKE_CURRENT_SOURCE_DIR}/experimental/source/log_utility/linux/linux_logging.cpp
+                                PROPERTIES INCLUDE_DIRECTORIES ${NEO_SPDLOG_DIR}
+    )
   endif()
 
   if(CUSTOM_L0_INCLUDE_PATH)
@@ -360,6 +363,12 @@ if(BUILD_WITH_L0)
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tools/source "${NEO_BUILD_DIR}/${LIB_NAME}tools/source")
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sysman/source "${NEO_BUILD_DIR}/${LIB_NAME}sysman/source")
 
+    if(DEFINED NEO_SPDLOG_DIR)
+      target_include_directories(${LIB_NAME} PRIVATE "experimental/source/log_utility")
+    else()
+      target_include_directories(${LIB_NAME} PRIVATE "experimental/source/log_utility_stub")
+    endif()
+
     if(${MOCKABLE})
       get_property(COMPUTE_RUNTIME_DEFINITIONS
                    TARGET ${NEO_SHARED_MOCKABLE_LIB_NAME}

level_zero/core/source/cmdlist/cmdlist_imp.cpp

@@ -26,10 +26,10 @@
 #include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
 #include "level_zero/core/source/helpers/properties_parser.h"
-#include "level_zero/experimental/source/log_utility/log_manager.h"
 #include "level_zero/tools/source/metrics/metric.h"
 
 #include "igfxfmid.h"
+#include "log_manager.h"
 
 #include <algorithm>
 

level_zero/core/source/driver/driver.cpp

@@ -17,24 +17,14 @@
 #include "level_zero/core/source/device/device.h"
 #include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/core/source/driver/driver_imp.h"
-#include "level_zero/experimental/source/log_utility/log_manager.h"
 #include "level_zero/tools/source/metrics/metric.h"
 
 #include "driver_version.h"
+#include "log_manager.h"
 
 #include <memory>
 #include <thread>
 
-#define QTR(a) #a
-#define TOSTR(b) QTR(b)
-#define LOG_INFO_VERSION_SHA(logType, version, sha)                                              \
-    auto logger = NEO::LogManager::getInstance()->getLogger(logType);                            \
-    if (logger) {                                                                                \
-        char logBuffer[256];                                                                     \
-        snprintf(logBuffer, 256, "Level zero driver version and SHA : %s - %s\n", version, sha); \
-        logger->logInfo(logBuffer);                                                              \
-    }
-
 namespace L0 {
 
 _ze_driver_handle_t *globalDriverHandle;
@@ -72,7 +62,7 @@ void DriverImp::initialize(ze_result_t *result) {
     }
 
     // Logging enablement if opted
-    initLogger();
+    NEO::initLogger();
 
     if (envVariables.fp64Emulation) {
         executionEnvironment->setFP64EmulationEnabled();
@@ -111,13 +101,6 @@ void DriverImp::initialize(ze_result_t *result) {
 
 ze_result_t DriverImp::initStatus(ZE_RESULT_ERROR_UNINITIALIZED);
 
-void DriverImp::initLogger() {
-    if (NEO::LogManager::getLoggingLevel() != (uint32_t)NEO::LogLevel::logLevelOff) {
-        CREATE_LOGGER(NEO::LogManager::LogType::coreLogger, "coreLogger.log", NEO::LogManager::getLoggingLevel());
-        LOG_INFO_VERSION_SHA(NEO::LogManager::LogType::coreLogger, TOSTR(NEO_OCL_DRIVER_VERSION), NEO_REVISION);
-    }
-}
-
 ze_result_t DriverImp::driverInit(ze_init_flags_t flags) {
     std::call_once(initDriverOnce, [this]() {
         ze_result_t result;

level_zero/core/source/driver/driver_imp.h

@@ -21,7 +21,6 @@ class DriverImp : public Driver {
     void initialize(ze_result_t *result) override;
 
   protected:
-    void initLogger();
     std::once_flag initDriverOnce;
     static ze_result_t initStatus;
 };

level_zero/core/test/unit_tests/sources/log_utility/linux/CMakeLists.txt

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-if(UNIX)
+if(UNIX AND DEFINED NEO_SPDLOG_DIR)
   target_sources(
                  ${TARGET_NAME}
                  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt

level_zero/experimental/source/log_utility/CMakeLists.txt

@@ -4,10 +4,12 @@
 # SPDX-License-Identifier: MIT
 #
 
-target_sources(${L0_STATIC_LIB_NAME}
-               PRIVATE
-               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-               ${CMAKE_CURRENT_SOURCE_DIR}/log_manager.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/logging.h
-)
-add_subdirectories()
+if(DEFINED NEO_SPDLOG_DIR)
+  target_sources(${L0_STATIC_LIB_NAME}
+                 PRIVATE
+                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                 ${CMAKE_CURRENT_SOURCE_DIR}/log_manager.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/logging.h
+  )
+  add_subdirectories()
+endif()

level_zero/experimental/source/log_utility/linux/linux_log_manager.cpp

@@ -9,12 +9,31 @@
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 
+#include "driver_version.h"
+
 #include <map>
 
+#define QTR(a) #a
+#define TOSTR(b) QTR(b)
+#define LOG_INFO_VERSION_SHA(logType, version, sha)                                              \
+    auto logger = NEO::LogManager::getInstance()->getLogger(logType);                            \
+    if (logger) {                                                                                \
+        char logBuffer[256];                                                                     \
+        snprintf(logBuffer, 256, "Level zero driver version and SHA : %s - %s\n", version, sha); \
+        logger->logInfo(logBuffer);                                                              \
+    }
+
 namespace NEO {
 std::unique_ptr<LogManager> LogManager::instancePtr = nullptr;
 uint32_t LogManager::logLevel = UINT32_MAX;
 
+void initLogger() {
+    if (NEO::LogManager::getLoggingLevel() != (uint32_t)NEO::LogLevel::logLevelOff) {
+        CREATE_LOGGER(NEO::LogManager::LogType::coreLogger, "coreLogger.log", NEO::LogManager::getLoggingLevel());
+        LOG_INFO_VERSION_SHA(NEO::LogManager::LogType::coreLogger, TOSTR(NEO_OCL_DRIVER_VERSION), NEO_REVISION);
+    }
+}
+
 LogManager *LogManager::getInstance() {
     if (instancePtr == nullptr) {
         LogManager::instancePtr = std::make_unique<LinuxLogManager>();

level_zero/experimental/source/log_utility/log_manager.h

@@ -68,4 +68,5 @@ class LogManager {
         }                                                                             \
     }
 
+extern void initLogger();
 } // namespace NEO

level_zero/experimental/source/log_utility/windows/windows_log_manager.cpp

@@ -37,4 +37,6 @@ uint32_t LogManager::getLoggingLevel() {
 void WinLogManager::destroyLogger(LogManager::LogType logType) {
 }
 
+void initLogger(){};
+
 } // namespace NEO

level_zero/experimental/source/log_utility_stub/CMakeLists.txt

@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2024 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+if(NOT DEFINED NEO_SPDLOG_DIR)
+  target_sources(${L0_STATIC_LIB_NAME}
+                 PRIVATE
+                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                 ${CMAKE_CURRENT_SOURCE_DIR}/log_manager.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/log_manager_stub.cpp
+  )
+endif()