Move files to core

- OsLibrary class - sku_info directory - gmm_lib.h header Change-Id: Ia86280e61cd2913c546afc40c3751b42e04ab137 Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
2026-01-03 23:03:02 +08:00 · 2019-11-19 11:49:19 +01:00
parent e7ee6daaa0
commit 13921f698e
81 changed files with 135 additions and 109 deletions
--- a/unit_tests/global_environment.h
+++ b/unit_tests/global_environment.h
@@ -6,8 +6,8 @@
 */

 #pragma once
+#include "core/os_interface/os_library.h"
 #include "runtime/helpers/hw_info.h"
-#include "runtime/os_interface/os_library.h"
 #include "unit_tests/mocks/mock_compilers.h"

 #include "gtest/gtest.h"
--- a/unit_tests/gmm_helper/gmm_interface_tests.cpp
+++ b/unit_tests/gmm_helper/gmm_interface_tests.cpp
@@ -5,12 +5,12 @@
 *
 */

+#include "core/sku_info/operations/sku_info_transfer.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/os_interface/os_interface.h"
 #include "runtime/platform/platform.h"
-#include "runtime/sku_info/operations/sku_info_transfer.h"
 #include "unit_tests/helpers/variable_backup.h"

 #include "gtest/gtest.h"
--- a/unit_tests/helpers/windows/gl_helper_tests.cpp
+++ b/unit_tests/helpers/windows/gl_helper_tests.cpp
@@ -5,9 +5,9 @@
 *
 */

+#include "core/os_interface/os_library.h"
 #include "core/os_interface/windows/windows_wrapper.h"
 #include "runtime/helpers/windows/gl_helper.h"
-#include "runtime/os_interface/os_library.h"
 #include "test.h"
 #include "unit_tests/helpers/windows/mock_function.h"

--- a/unit_tests/igdrcl_tests_pch.h
+++ b/unit_tests/igdrcl_tests_pch.h
@@ -5,16 +5,16 @@
 *
 */

+#include "core/gmm_helper/gmm_lib.h"
 #include "core/helpers/abort.h"
 #include "core/helpers/debug_helpers.h"
 #include "core/helpers/ptr_math.h"
 #include "core/memory_manager/memory_constants.h"
+#include "core/sku_info/sku_info_base.h"
 #include "runtime/gen_common/hw_cmds.h"
-#include "runtime/gmm_helper/gmm_lib.h"
 #include "runtime/helpers/completion_stamp.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/kmd_notify_properties.h"
-#include "runtime/sku_info/sku_info_base.h"
 #include "test.h"
 #include "unit_tests/gen_common/gen_cmd_parse.h"

--- a/unit_tests/libult/source_level_debugger_library.h
+++ b/unit_tests/libult/source_level_debugger_library.h
@@ -5,7 +5,7 @@
 *
 */

-#include "runtime/os_interface/os_library.h"
+#include "core/os_interface/os_library.h"

 #include "igfx_debug_interchange_types.h"

--- a/unit_tests/linux/main_linux.cpp
+++ b/unit_tests/linux/main_linux.cpp
@@ -5,8 +5,8 @@
 *
 */

+#include "core/os_interface/os_library.h"
 #include "runtime/os_interface/linux/drm_neo.h"
-#include "runtime/os_interface/os_library.h"
 #include "test.h"
 #include "unit_tests/custom_event_listener.h"

--- a/unit_tests/mock_gdi/mock_gdi.h
+++ b/unit_tests/mock_gdi/mock_gdi.h
@@ -7,7 +7,7 @@

 #pragma once

-#include "runtime/gmm_helper/gmm_lib.h"
+#include "core/gmm_helper/gmm_lib.h"
 #include "runtime/os_interface/windows/os_time_win.h"

 #include <d3d10_1.h>
--- a/unit_tests/offline_compiler/main.cpp
+++ b/unit_tests/offline_compiler/main.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "runtime/os_interface/os_library.h"
+#include "core/os_interface/os_library.h"
 #include "unit_tests/custom_event_listener.h"
 #include "unit_tests/helpers/test_files.h"

--- a/unit_tests/offline_compiler/segfault_test/CMakeLists.txt
+++ b/unit_tests/offline_compiler/segfault_test/CMakeLists.txt
@@ -9,22 +9,24 @@ set(CLOC_SEGFAULT_TEST_SOURCES
  ${CMAKE_CURRENT_SOURCE_DIR}/segfault_helper.h
  ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
  ${NEO_SOURCE_DIR}/core/helpers/abort.cpp
-  ${NEO_SOURCE_DIR}/runtime/os_interface/os_library.h
+  ${NEO_SOURCE_DIR}/core/os_interface/os_library.h
  ${NEO_SOURCE_DIR}/unit_tests/helpers/debug_helpers.cpp
 )

 if(WIN32)
  list(APPEND CLOC_SEGFAULT_TEST_SOURCES
    ${CMAKE_CURRENT_SOURCE_DIR}/windows/safety_guard_caller_windows.cpp
+    ${NEO_SOURCE_DIR}/core/os_interface/windows/os_library_win.cpp
+    ${NEO_SOURCE_DIR}/core/os_interface/windows/os_library_win.h
    ${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/safety_guard_windows.h
    ${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/seh_exception.cpp
    ${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/seh_exception.h
-    ${NEO_SOURCE_DIR}/runtime/os_interface/windows/os_library.cpp
  )
 else()
  list(APPEND CLOC_SEGFAULT_TEST_SOURCES
    ${CMAKE_CURRENT_SOURCE_DIR}/linux/safety_guard_caller_linux.cpp
-    ${NEO_SOURCE_DIR}/runtime/os_interface/linux/os_library.cpp
+    ${NEO_SOURCE_DIR}/core/os_interface/linux/os_library_linux.cpp
+    ${NEO_SOURCE_DIR}/core/os_interface/linux/os_library_linux.h
  )
 endif()

--- a/unit_tests/os_interface/device_factory_tests.cpp
+++ b/unit_tests/os_interface/device_factory_tests.cpp
@@ -6,13 +6,13 @@
 */

 #include "core/memory_manager/memory_constants.h"
+#include "core/os_interface/os_library.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 #include "runtime/os_interface/device_factory.h"
 #include "runtime/os_interface/os_interface.h"
-#include "runtime/os_interface/os_library.h"
 #include "runtime/platform/platform.h"
 #include "unit_tests/mocks/mock_execution_environment.h"

--- a/unit_tests/os_interface/linux/options.cpp
+++ b/unit_tests/os_interface/linux/options.cpp
@@ -6,7 +6,7 @@
 */

 #include "common/gtsysinfo.h"
-#include "runtime/os_interface/os_library.h"
+#include "core/os_interface/os_library.h"

 #include "igfxfmid.h"

--- a/unit_tests/os_interface/os_library_tests.cpp
+++ b/unit_tests/os_interface/os_library_tests.cpp
@@ -6,11 +6,11 @@
 */

 #if defined(_WIN32)
-#include "runtime/os_interface/windows/os_library.h"
+#include "core/os_interface/windows/os_library_win.h"
 #elif defined(__linux__)
-#include "runtime/os_interface/linux/os_library.h"
+#include "core/os_interface/linux/os_library_linux.h"
 #endif
-#include "runtime/os_interface/os_library.h"
+#include "core/os_interface/os_library.h"
 #include "test.h"
 #include "unit_tests/fixtures/memory_management_fixture.h"

--- a/unit_tests/os_interface/windows/gdi_dll_fixture.h
+++ b/unit_tests/os_interface/windows/gdi_dll_fixture.h
@@ -6,9 +6,9 @@
 */

 #pragma once
+#include "core/os_interface/os_library.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
-#include "runtime/os_interface/os_library.h"
 #include "unit_tests/mock_gdi/mock_gdi.h"

 using namespace NEO;
--- a/unit_tests/os_interface/windows/gdi_interface_tests.cpp
+++ b/unit_tests/os_interface/windows/gdi_interface_tests.cpp
@@ -6,8 +6,8 @@
 */

 #if defined(_WIN32)
+#include "core/os_interface/os_library.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/os_interface/os_library.h"
 #include "runtime/os_interface/windows/gdi_interface.h"
 #include "test.h"

--- a/unit_tests/os_interface/windows/gl/gl_dll_helper.h
+++ b/unit_tests/os_interface/windows/gl/gl_dll_helper.h
@@ -6,8 +6,8 @@
 */

 #pragma once
+#include "core/os_interface/os_library.h"
 #include "public/cl_gl_private_intel.h"
-#include "runtime/os_interface/os_library.h"

 #include "Gl/gl.h"

--- a/unit_tests/os_interface/windows/options.cpp
+++ b/unit_tests/os_interface/windows/options.cpp
@@ -6,7 +6,7 @@
 */

 #include "common/gtsysinfo.h"
-#include "runtime/os_interface/os_library.h"
+#include "core/os_interface/os_library.h"

 #include "igfxfmid.h"

--- a/unit_tests/os_interface/windows/os_library_win_tests.cpp
+++ b/unit_tests/os_interface/windows/os_library_win_tests.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "runtime/os_interface/windows/os_library.h"
+#include "core/os_interface/windows/os_library_win.h"
 #include "test.h"
 #include "unit_tests/helpers/variable_backup.h"

--- a/unit_tests/os_interface/windows/wddm20_tests.cpp
+++ b/unit_tests/os_interface/windows/wddm20_tests.cpp
@@ -5,6 +5,7 @@
 *
 */

+#include "core/os_interface/os_library.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/gmm_helper/gmm.h"
@@ -12,7 +13,6 @@
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
-#include "runtime/os_interface/os_library.h"
 #include "runtime/os_interface/os_time.h"
 #include "runtime/os_interface/windows/os_context_win.h"
 #include "runtime/os_interface/windows/os_interface.h"
--- a/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp
+++ b/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp
@@ -8,6 +8,7 @@
 #include "unit_tests/os_interface/windows/wddm_memory_manager_tests.h"

 #include "core/helpers/aligned_memory.h"
+#include "core/os_interface/os_library.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/utilities/base_object_utils.h"
 #include "runtime/gmm_helper/gmm.h"
@@ -17,7 +18,6 @@
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/mem_obj/mem_obj_helper.h"
-#include "runtime/os_interface/os_library.h"
 #include "runtime/os_interface/windows/os_context_win.h"
 #include "runtime/os_interface/windows/wddm_residency_controller.h"
 #include "runtime/platform/platform.h"
--- a/unit_tests/sku_info/sku_info_base_reference.h
+++ b/unit_tests/sku_info/sku_info_base_reference.h
@@ -7,7 +7,7 @@

 #pragma once

-#include "runtime/gmm_helper/gmm_lib.h"
+#include "core/gmm_helper/gmm_lib.h"

 #include "sku_info.h"

--- a/unit_tests/sku_info/sku_info_receiver_tests.cpp
+++ b/unit_tests/sku_info/sku_info_receiver_tests.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "runtime/sku_info/operations/sku_info_receiver.h"
+#include "core/sku_info/operations/windows/sku_info_receiver.h"
 #include "unit_tests/sku_info/sku_info_base_reference.h"

 #include "gtest/gtest.h"
--- a/unit_tests/sku_info/sku_info_transfer_tests.cpp
+++ b/unit_tests/sku_info/sku_info_transfer_tests.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "runtime/sku_info/operations/sku_info_transfer.h"
+#include "core/sku_info/operations/sku_info_transfer.h"
 #include "unit_tests/sku_info/sku_info_base_reference.h"

 #include "gtest/gtest.h"