Move os_interface files to core

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

Author: HoppeMateusz

core/execution_environment/root_device_environment.cpp

@@ -9,9 +9,9 @@
 
 #include "core/gmm_helper/page_table_mngr.h"
 #include "core/memory_manager/memory_operations_handler.h"
+#include "core/os_interface/os_interface.h"
 #include "runtime/aub/aub_center.h"
 #include "runtime/execution_environment/execution_environment.h"
-#include "runtime/os_interface/os_interface.h"
 
 namespace NEO {
 

core/gmm_helper/client_context/gmm_client_context_base.cpp

@@ -11,8 +11,8 @@
 #include "core/gmm_helper/gmm_interface.h"
 #include "core/helpers/debug_helpers.h"
 #include "core/helpers/hw_info.h"
+#include "core/os_interface/os_interface.h"
 #include "core/sku_info/operations/sku_info_transfer.h"
-#include "runtime/os_interface/os_interface.h"
 
 namespace NEO {
 GmmClientContextBase::GmmClientContextBase(OSInterface *osInterface, HardwareInfo *hwInfo) : hardwareInfo(hwInfo) {

core/helpers/hw_helper_base.inl

@@ -13,11 +13,11 @@
 #include "core/helpers/preamble.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "core/memory_manager/memory_constants.h"
+#include "core/os_interface/os_interface.h"
 #include "runtime/aub_mem_dump/aub_mem_dump.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/helpers/hardware_commands_helper.h"
-#include "runtime/os_interface/os_interface.h"
 
 namespace NEO {
 

core/os_interface/CMakeLists.txt

@@ -9,9 +9,12 @@ set(NEO_CORE_OS_INTERFACE
   ${CMAKE_CURRENT_SOURCE_DIR}/aub_memory_operations_handler.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/aub_memory_operations_handler.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_context.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/os_interface.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_library.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_memory.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_thread.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/os_time.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/os_time.h
   ${CMAKE_CURRENT_SOURCE_DIR}/print.h
 )
 

core/os_interface/linux/CMakeLists.txt

@@ -8,15 +8,26 @@ 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}${BRANCH_DIR_SUFFIX}/drm_engine_mapper.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/drm_engine_mapper.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/drm_neo.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/drm_neo.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/drm_neo_create.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/drm_null_device.h
+  ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_query.cpp
   ${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_interface.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/os_interface.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
   ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_linux.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_thread_linux.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_thread_linux.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/os_time_linux.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/os_time_linux.h
   ${CMAKE_CURRENT_SOURCE_DIR}/page_table_manager_functions.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/print.cpp
 )

…os_interface/linux/drm_engine_mapper.cpp …os_interface/linux/drm_engine_mapper.cppruntime/os_interface/linux/drm_engine_mapper.cpp renamed to core/os_interface/linux/drm_engine_mapper.cpp runtime/os_interface/linux/drm_engine_mapper.cpp renamed to core/os_interface/linux/drm_engine_mapper.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "runtime/os_interface/linux/drm_engine_mapper.h"
+#include "core/os_interface/linux/drm_engine_mapper.h"
 
 #include "core/helpers/debug_helpers.h"
 

…e/os_interface/linux/drm_engine_mapper.h …e/os_interface/linux/drm_engine_mapper.hruntime/os_interface/linux/drm_engine_mapper.h renamed to core/os_interface/linux/drm_engine_mapper.h runtime/os_interface/linux/drm_engine_mapper.h renamed to core/os_interface/linux/drm_engine_mapper.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *

runtime/os_interface/linux/drm_neo.cpp core/os_interface/linux/drm_neo.cppruntime/os_interface/linux/drm_neo.cpp renamed to core/os_interface/linux/drm_neo.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "runtime/os_interface/linux/drm_neo.h"
+#include "core/os_interface/linux/drm_neo.h"
 
 namespace NEO {