From 9f5152e8237bc19b4ad140636c87f3ff64b4d6a5 Mon Sep 17 00:00:00 2001
From: Mateusz Jablonski <mateusz.jablonski@intel.com>
Date: Wed, 11 Dec 2019 15:28:22 +0100
Subject: [PATCH] Move linux files to core

memory_info
engine_info
os_inc

Related-To: NEO-3982
Change-Id: I52ef357f790497fc6efcd590db277ce96ec1e579
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
---
 core/os_interface/linux/CMakeLists.txt                  | 4 ++++
 {runtime => core}/os_interface/linux/engine_info.h      | 0
 {runtime => core}/os_interface/linux/memory_info.h      | 0
 {runtime => core}/os_interface/linux/os_inc.h           | 4 ++++
 runtime/CMakeLists.txt                                  | 6 ++++--
 runtime/os_interface/linux/CMakeLists.txt               | 3 ---
 runtime/os_interface/linux/drm_neo.cpp                  | 2 +-
 runtime/os_interface/linux/drm_neo.h                    | 4 ++--
 runtime/os_interface/linux/linux_inc.cpp                | 2 +-
 runtime/os_interface/os_inc_base.h                      | 2 --
 unit_tests/os_interface/linux/drm_memory_info_tests.cpp | 2 +-
 11 files changed, 17 insertions(+), 12 deletions(-)
 rename {runtime => core}/os_interface/linux/engine_info.h (100%)
 rename {runtime => core}/os_interface/linux/memory_info.h (100%)
 rename {runtime => core}/os_interface/linux/os_inc.h (65%)

diff --git a/core/os_interface/linux/CMakeLists.txt b/core/os_interface/linux/CMakeLists.txt
index 646a318bd0..5fb2310967 100644
--- a/core/os_interface/linux/CMakeLists.txt
+++ b/core/os_interface/linux/CMakeLists.txt
@@ -8,6 +8,9 @@ set(NEO_CORE_OS_INTERFACE_LINUX
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/debug_env_reader.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/debug_env_reader.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/engine_info.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/memory_info.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/os_inc.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_library_linux.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_library_linux.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_linux.cpp
@@ -16,3 +19,4 @@ set(NEO_CORE_OS_INTERFACE_LINUX
 )
 
 set_property(GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_LINUX ${NEO_CORE_OS_INTERFACE_LINUX})
+add_subdirectories()
diff --git a/runtime/os_interface/linux/engine_info.h b/core/os_interface/linux/engine_info.h
similarity index 100%
rename from runtime/os_interface/linux/engine_info.h
rename to core/os_interface/linux/engine_info.h
diff --git a/runtime/os_interface/linux/memory_info.h b/core/os_interface/linux/memory_info.h
similarity index 100%
rename from runtime/os_interface/linux/memory_info.h
rename to core/os_interface/linux/memory_info.h
diff --git a/runtime/os_interface/linux/os_inc.h b/core/os_interface/linux/os_inc.h
similarity index 65%
rename from runtime/os_interface/linux/os_inc.h
rename to core/os_interface/linux/os_inc.h
index 400a97851a..a120c089fc 100644
--- a/runtime/os_interface/linux/os_inc.h
+++ b/core/os_interface/linux/os_inc.h
@@ -9,3 +9,7 @@
 
 #define PATH_SEPARATOR '/'
 #define __cdecl
+namespace Os {
+// Pci Path
+extern const char *sysFsPciPath;
+} // namespace Os
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index 5f13bf3f82..95012ca51f 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -81,13 +81,15 @@ if(WIN32)
   set(IGDRCL_EXTRA_LIBS Ws2_32)
   target_include_directories(${NEO_STATIC_LIB_NAME} PUBLIC
     ${WDK_INCLUDE_PATHS}
-    os_interface/windows
+    ${NEO_SOURCE_DIR}/core/os_interface/windows
+    ${NEO_SOURCE_DIR}/runtime/os_interface/windows
   )
   target_compile_definitions(${NEO_STATIC_LIB_NAME} PRIVATE OGL=1)
 else()
   set(IGDRCL_EXTRA_LIBS dl pthread)
   target_include_directories(${NEO_STATIC_LIB_NAME} PUBLIC
-    os_interface/linux
+    ${NEO_SOURCE_DIR}/core/os_interface/linux
+    ${NEO_SOURCE_DIR}/runtime/os_interface/linux
     ${I915_INCLUDES_DIR}
   )
 endif()
diff --git a/runtime/os_interface/linux/CMakeLists.txt b/runtime/os_interface/linux/CMakeLists.txt
index 4cce4b4f5e..c45535b084 100644
--- a/runtime/os_interface/linux/CMakeLists.txt
+++ b/runtime/os_interface/linux/CMakeLists.txt
@@ -33,14 +33,11 @@ set(RUNTIME_SRCS_OS_INTERFACE_LINUX
   ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_query.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_operations_handler.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_operations_handler.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/engine_info.h
   ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/linux_inc.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/memory_info.h
   ${CMAKE_CURRENT_SOURCE_DIR}/ocl_reg_path.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_context_linux.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_context_linux.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/os_inc.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_interface.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_interface.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_metrics_library.cpp
diff --git a/runtime/os_interface/linux/drm_neo.cpp b/runtime/os_interface/linux/drm_neo.cpp
index adb382f5e1..bf82008fb3 100644
--- a/runtime/os_interface/linux/drm_neo.cpp
+++ b/runtime/os_interface/linux/drm_neo.cpp
@@ -9,8 +9,8 @@
 
 #include "core/helpers/hw_info.h"
 #include "core/memory_manager/memory_constants.h"
+#include "core/os_interface/linux/os_inc.h"
 #include "core/utilities/directory.h"
-#include "runtime/os_interface/os_inc_base.h"
 
 #include <cstdio>
 #include <cstring>
diff --git a/runtime/os_interface/linux/drm_neo.h b/runtime/os_interface/linux/drm_neo.h
index ba101a559d..0ce2112da2 100644
--- a/runtime/os_interface/linux/drm_neo.h
+++ b/runtime/os_interface/linux/drm_neo.h
@@ -7,8 +7,8 @@
 
 #pragma once
 #include "core/helpers/basic_math.h"
-#include "runtime/os_interface/linux/engine_info.h"
-#include "runtime/os_interface/linux/memory_info.h"
+#include "core/os_interface/linux/engine_info.h"
+#include "core/os_interface/linux/memory_info.h"
 #include "runtime/utilities/api_intercept.h"
 
 #include "drm/i915_drm.h"
diff --git a/runtime/os_interface/linux/linux_inc.cpp b/runtime/os_interface/linux/linux_inc.cpp
index cd42ff9ff4..c79482c913 100644
--- a/runtime/os_interface/linux/linux_inc.cpp
+++ b/runtime/os_interface/linux/linux_inc.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/os_interface/linux/os_inc.h"
+#include "core/os_interface/linux/os_inc.h"
 namespace Os {
 const char *fileSeparator = "/";
 }
diff --git a/runtime/os_interface/os_inc_base.h b/runtime/os_interface/os_inc_base.h
index e9165d42a3..c1d9ecc3d9 100644
--- a/runtime/os_interface/os_inc_base.h
+++ b/runtime/os_interface/os_inc_base.h
@@ -16,8 +16,6 @@ extern const char *testDllName;
 
 // OS specific directory separator
 extern const char *fileSeparator;
-// Pci Path
-extern const char *sysFsPciPath;
 
 // Os specific Metrics Library name
 extern const char *metricsLibraryDllName;
diff --git a/unit_tests/os_interface/linux/drm_memory_info_tests.cpp b/unit_tests/os_interface/linux/drm_memory_info_tests.cpp
index 76682aa707..26f610cf04 100644
--- a/unit_tests/os_interface/linux/drm_memory_info_tests.cpp
+++ b/unit_tests/os_interface/linux/drm_memory_info_tests.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/os_interface/linux/memory_info.h"
+#include "core/os_interface/linux/memory_info.h"
 #include "unit_tests/os_interface/linux/drm_mock.h"
 
 #include "gtest/gtest.h"