Move DebugSettingsManager to core

- pass registry path in constructor

Change-Id: I2a121da2c9483a0df088989feea490a638c63016
Signed-off-by: Mateusz Hoppe <[email protected]>

Author: HoppeMateusz

CMakeLists.txt

@@ -776,6 +776,7 @@ endif()
 include_directories(${NEO_BUILD_DIR})
 include_directories(${NEO_SOURCE_DIR})
 include_directories(${NEO_SOURCE_DIR}/core/compiler_interface/compiler_options${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/core/debug_settings/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/core/memory_manager/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/core/memory_properties${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/core/sku_info/definitions${BRANCH_DIR_SUFFIX})
@@ -787,7 +788,7 @@ include_directories(${NEO_SOURCE_DIR}/runtime/gmm_helper/client_context${BRANCH_
 include_directories(${NEO_SOURCE_DIR}/runtime/gmm_helper/gmm_memory${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/runtime/mem_obj/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/runtime/memory_manager/definitions${BRANCH_DIR_SUFFIX})
-include_directories(${NEO_SOURCE_DIR}/runtime/os_interface/definitions${BRANCH_DIR_SUFFIX})
+
 
 if(HAVE_INSTRUMENTATION)
   set(IGDRCL__INSTRUMENTATION_DIR_SUFFIX ${BRANCH_DIR_SUFFIX})

core/compiler_interface/compiler_interface.cpp

@@ -9,9 +9,9 @@
 
 #include "core/compiler_interface/compiler_cache.h"
 #include "core/compiler_interface/compiler_interface.inl"
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/hw_info.h"
 #include "runtime/device/device.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_inc_base.h"
 
 #include "cif/common/cif_main.h"

core/debug_settings/CMakeLists.txt

@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2019 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+set(NEO_CORE_DEBUG_SETTINGS
+  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_manager.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_manager.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/debug_variables_base.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/debug_variables.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/translate_debug_settings.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/definitions/translate_debug_settings.h
+)
+
+set_property(GLOBAL PROPERTY NEO_CORE_DEBUG_SETTINGS ${NEO_CORE_DEBUG_SETTINGS})

…/os_interface/debug_settings_manager.cpp …ebug_settings/debug_settings_manager.cppruntime/os_interface/debug_settings_manager.cpp renamed to core/debug_settings/debug_settings_manager.cpp runtime/os_interface/debug_settings_manager.cpp renamed to core/debug_settings/debug_settings_manager.cpp

@@ -7,14 +7,11 @@
 
 #include "debug_settings_manager.h"
 
+#include "core/debug_settings/definitions/translate_debug_settings.h"
 #include "core/helpers/debug_helpers.h"
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
 #include "core/utilities/debug_settings_reader_creator.h"
-#include "runtime/os_interface/definitions/translate_debug_settings.h"
-#include "runtime/os_interface/ocl_reg_path.h"
-
-#include "CL/cl.h"
 
 #include <cstdio>
 #include <sstream>
@@ -27,12 +24,10 @@ static std::string to_string(const std::string &arg) {
 
 namespace NEO {
 
-DebugSettingsManager<globalDebugFunctionalityLevel> DebugManager;
-
 template <DebugFunctionalityLevel DebugLevel>
-DebugSettingsManager<DebugLevel>::DebugSettingsManager() {
+DebugSettingsManager<DebugLevel>::DebugSettingsManager(const char *registryPath) {
     if (registryReadAvailable()) {
-        readerImpl = SettingsReaderCreator::create(oclRegPath);
+        readerImpl = SettingsReaderCreator::create(std::string(registryPath));
         injectSettingsFromReader();
         dumpFlags();
     }

…me/os_interface/debug_settings_manager.h …/debug_settings/debug_settings_manager.hruntime/os_interface/debug_settings_manager.h renamed to core/debug_settings/debug_settings_manager.h runtime/os_interface/debug_settings_manager.h renamed to core/debug_settings/debug_settings_manager.h

@@ -73,7 +73,7 @@ struct DebugVariables {
 template <DebugFunctionalityLevel DebugLevel>
 class DebugSettingsManager {
   public:
-    DebugSettingsManager();
+    DebugSettingsManager(const char *registryPath);
     ~DebugSettingsManager();
 
     DebugSettingsManager(const DebugSettingsManager &) = delete;

…me/os_interface/debug_variables_base.inl …/debug_settings/debug_variables_base.inlruntime/os_interface/debug_variables_base.inl renamed to core/debug_settings/debug_variables_base.inl runtime/os_interface/debug_variables_base.inl renamed to core/debug_settings/debug_variables_base.inl

@@ -0,0 +1,8 @@
+/*
+ * Copyright (C) 2018-2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "core/debug_settings/debug_variables_base.inl"

core/debug_settings/definitions/debug_variables.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/os_interface/definitions/translate_debug_settings.h"
+#include "core/debug_settings/definitions/translate_debug_settings.h"
 
 namespace NEO {
 

…definitions/translate_debug_settings.cpp …definitions/translate_debug_settings.cppruntime/os_interface/definitions/translate_debug_settings.cpp renamed to core/debug_settings/definitions/translate_debug_settings.cpp runtime/os_interface/definitions/translate_debug_settings.cpp renamed to core/debug_settings/definitions/translate_debug_settings.cpp

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/deferred_deleter_helper.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 namespace NEO {
 bool isDeferredDeleterEnabled() {