From 10795c716fae49438ef3e41d52e8db95490f3c7b Mon Sep 17 00:00:00 2001 From: "Jobczyk, Lukasz" Date: Thu, 29 Aug 2019 12:15:33 +0200 Subject: [PATCH] Move DebugSettingsReader to a core dir Related-To: NEO-3677 Change-Id: I3374abde6717be20c064ec6d65c0751a783f5138 Signed-off-by: Jobczyk, Lukasz --- core/os_interface/linux/CMakeLists.txt | 15 +++++++++++++++ .../os_interface/linux/debug_env_reader.cpp | 2 +- .../os_interface}/linux/debug_env_reader.h | 2 +- core/os_interface/windows/CMakeLists.txt | 16 ++++++++++++++++ .../windows/debug_registry_reader.cpp | 7 ++++--- .../os_interface/windows/debug_registry_reader.h | 2 +- .../os_interface/windows/windows_wrapper.h | 0 .../helpers/debug_manager_state_restore.h | 2 +- core/utilities/CMakeLists.txt | 5 +++++ .../utilities/debug_file_reader.cpp | 2 +- {runtime => core}/utilities/debug_file_reader.h | 2 +- .../utilities/debug_settings_reader.cpp | 4 ++-- .../utilities/debug_settings_reader.h | 0 .../utilities/debug_settings_reader_creator.cpp | 2 +- .../utilities/debug_settings_reader_creator.h | 2 +- offline_compiler/helper.cpp | 2 +- runtime/api/dispatch.h | 2 +- runtime/command_stream/aub_subcapture.cpp | 2 +- runtime/compiler_interface/binary_cache.cpp | 2 +- runtime/dll/CMakeLists.txt | 2 +- runtime/gmm_helper/gmm_lib.h | 2 +- runtime/os_interface/debug_settings_manager.cpp | 2 +- runtime/os_interface/linux/CMakeLists.txt | 4 +++- runtime/os_interface/windows/CMakeLists.txt | 6 +++--- .../windows/deferrable_deletion_win.h | 2 +- runtime/os_interface/windows/driver_info.cpp | 2 +- .../os_interface/windows/gl/gl_sharing_win.cpp | 2 +- runtime/os_interface/windows/kmdaf_listener.h | 2 +- runtime/os_interface/windows/os_interface.h | 2 +- runtime/os_interface/windows/os_library.h | 2 +- runtime/os_interface/windows/os_time_win.h | 2 +- runtime/os_interface/windows/print.cpp | 2 +- runtime/os_interface/windows/wddm/wddm.cpp | 2 +- .../os_interface/windows/wddm/wddm_interface.h | 2 +- runtime/os_interface/windows/wddm_allocation.h | 2 +- .../os_interface/windows/wddm_memory_manager.h | 2 +- .../windows/wddm_residency_controller.h | 2 +- runtime/sku_info/operations/sku_info_receiver.h | 2 +- runtime/utilities/CMakeLists.txt | 5 ----- runtime/utilities/windows/directory.cpp | 2 +- runtime/utilities/windows/timer_util.cpp | 2 +- .../api/cl_icd_get_platform_ids_khr_tests.inl | 2 +- unit_tests/api/cl_retain_mem_obj_tests.inl | 1 - .../command_queue/gl/enqueue_kernel_gl_tests.cpp | 2 +- ...nd_stream_receiver_flush_task_gmock_tests.cpp | 2 +- .../command_stream_receiver_hw_tests.cpp | 2 +- unit_tests/helpers/windows/gl_helper_tests.cpp | 2 +- unit_tests/main.cpp | 2 +- .../debug_settings_manager_tests.cpp | 2 +- .../os_interface/linux/debug_env_reader.cpp | 2 +- .../os_interface/windows/driver_info_tests.cpp | 2 +- .../windows/mock_performance_counters_win.cpp | 2 +- .../windows/mock_registry_reader.cpp | 4 ++-- .../os_interface/windows/registry_reader_tests.h | 2 +- unit_tests/utilities/debug_file_reader_tests.inl | 2 +- .../utilities/debug_settings_reader_creator.cpp | 2 +- .../utilities/debug_settings_reader_tests.cpp | 2 +- 57 files changed, 95 insertions(+), 62 deletions(-) create mode 100644 core/os_interface/linux/CMakeLists.txt rename {runtime => core}/os_interface/linux/debug_env_reader.cpp (95%) rename {runtime/utilities => core/os_interface}/linux/debug_env_reader.h (91%) create mode 100644 core/os_interface/windows/CMakeLists.txt rename {runtime => core}/os_interface/windows/debug_registry_reader.cpp (96%) rename runtime/os_interface/windows/registry_reader.h => core/os_interface/windows/debug_registry_reader.h (94%) rename {runtime => core}/os_interface/windows/windows_wrapper.h (100%) rename {runtime => core}/utilities/debug_file_reader.cpp (97%) rename {runtime => core}/utilities/debug_file_reader.h (94%) rename {runtime => core}/utilities/debug_settings_reader.cpp (82%) rename {runtime => core}/utilities/debug_settings_reader.h (100%) rename {runtime => core}/utilities/debug_settings_reader_creator.cpp (81%) rename {runtime => core}/utilities/debug_settings_reader_creator.h (83%) diff --git a/core/os_interface/linux/CMakeLists.txt b/core/os_interface/linux/CMakeLists.txt new file mode 100644 index 0000000000..cb6e05b066 --- /dev/null +++ b/core/os_interface/linux/CMakeLists.txt @@ -0,0 +1,15 @@ +# +# Copyright (C) 2019 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +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 +) + +if(UNIX) + set_property(GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_LINUX ${NEO_CORE_OS_INTERFACE_LINUX}) +endif() \ No newline at end of file diff --git a/runtime/os_interface/linux/debug_env_reader.cpp b/core/os_interface/linux/debug_env_reader.cpp similarity index 95% rename from runtime/os_interface/linux/debug_env_reader.cpp rename to core/os_interface/linux/debug_env_reader.cpp index b1595b3df0..932d4249d1 100644 --- a/runtime/os_interface/linux/debug_env_reader.cpp +++ b/core/os_interface/linux/debug_env_reader.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/utilities/linux/debug_env_reader.h" +#include "core/os_interface/linux/debug_env_reader.h" namespace NEO { diff --git a/runtime/utilities/linux/debug_env_reader.h b/core/os_interface/linux/debug_env_reader.h similarity index 91% rename from runtime/utilities/linux/debug_env_reader.h rename to core/os_interface/linux/debug_env_reader.h index d937e01f33..3b91b265f3 100644 --- a/runtime/utilities/linux/debug_env_reader.h +++ b/core/os_interface/linux/debug_env_reader.h @@ -7,8 +7,8 @@ #pragma once +#include "core/utilities/debug_settings_reader.h" #include "runtime/os_interface/debug_settings_manager.h" -#include "runtime/utilities/debug_settings_reader.h" namespace NEO { diff --git a/core/os_interface/windows/CMakeLists.txt b/core/os_interface/windows/CMakeLists.txt new file mode 100644 index 0000000000..0f008998fb --- /dev/null +++ b/core/os_interface/windows/CMakeLists.txt @@ -0,0 +1,16 @@ +# +# Copyright (C) 2019 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +set(NEO_CORE_OS_INTERFACE_WINDOWS + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/debug_registry_reader.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/debug_registry_reader.h + ${CMAKE_CURRENT_SOURCE_DIR}/windows_wrapper.h +) + +if(WIN32) + set_property(GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_WINDOWS ${NEO_CORE_OS_INTERFACE_WINDOWS}) +endif() \ No newline at end of file diff --git a/runtime/os_interface/windows/debug_registry_reader.cpp b/core/os_interface/windows/debug_registry_reader.cpp similarity index 96% rename from runtime/os_interface/windows/debug_registry_reader.cpp rename to core/os_interface/windows/debug_registry_reader.cpp index b3a1686a63..9c9e7f2392 100644 --- a/runtime/os_interface/windows/debug_registry_reader.cpp +++ b/core/os_interface/windows/debug_registry_reader.cpp @@ -5,10 +5,11 @@ * */ +#include "core/os_interface/windows/debug_registry_reader.h" + +#include "core/os_interface/windows/windows_wrapper.h" +#include "core/utilities/debug_settings_reader.h" #include "runtime/os_interface/debug_settings_manager.h" -#include "runtime/os_interface/windows/registry_reader.h" -#include "runtime/os_interface/windows/windows_wrapper.h" -#include "runtime/utilities/debug_settings_reader.h" #include diff --git a/runtime/os_interface/windows/registry_reader.h b/core/os_interface/windows/debug_registry_reader.h similarity index 94% rename from runtime/os_interface/windows/registry_reader.h rename to core/os_interface/windows/debug_registry_reader.h index 95bcd8126d..257f4d3d63 100644 --- a/runtime/os_interface/windows/registry_reader.h +++ b/core/os_interface/windows/debug_registry_reader.h @@ -7,7 +7,7 @@ #pragma once -#include "runtime/utilities/debug_settings_reader.h" +#include "core/utilities/debug_settings_reader.h" #include "os_inc.h" #include diff --git a/runtime/os_interface/windows/windows_wrapper.h b/core/os_interface/windows/windows_wrapper.h similarity index 100% rename from runtime/os_interface/windows/windows_wrapper.h rename to core/os_interface/windows/windows_wrapper.h diff --git a/core/unit_tests/helpers/debug_manager_state_restore.h b/core/unit_tests/helpers/debug_manager_state_restore.h index e46314eb19..d82d7ce0c4 100644 --- a/core/unit_tests/helpers/debug_manager_state_restore.h +++ b/core/unit_tests/helpers/debug_manager_state_restore.h @@ -6,8 +6,8 @@ */ #pragma once +#include "core/utilities/debug_settings_reader.h" #include "runtime/os_interface/debug_settings_manager.h" -#include "runtime/utilities/debug_settings_reader.h" using namespace NEO; diff --git a/core/utilities/CMakeLists.txt b/core/utilities/CMakeLists.txt index 18227e0ba9..b1ae72c6f3 100644 --- a/core/utilities/CMakeLists.txt +++ b/core/utilities/CMakeLists.txt @@ -8,6 +8,11 @@ set(NEO_CORE_UTILITIES ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/clflush.h ${CMAKE_CURRENT_SOURCE_DIR}/cpu_info.h + ${CMAKE_CURRENT_SOURCE_DIR}/debug_file_reader.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/debug_file_reader.h + ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader_creator.h + ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader.h ${CMAKE_CURRENT_SOURCE_DIR}/spinlock.h ) diff --git a/runtime/utilities/debug_file_reader.cpp b/core/utilities/debug_file_reader.cpp similarity index 97% rename from runtime/utilities/debug_file_reader.cpp rename to core/utilities/debug_file_reader.cpp index e4095a629b..fa63459700 100644 --- a/runtime/utilities/debug_file_reader.cpp +++ b/core/utilities/debug_file_reader.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/utilities/debug_file_reader.h" +#include "core/utilities/debug_file_reader.h" using namespace std; diff --git a/runtime/utilities/debug_file_reader.h b/core/utilities/debug_file_reader.h similarity index 94% rename from runtime/utilities/debug_file_reader.h rename to core/utilities/debug_file_reader.h index 75862a83d8..995d29291f 100644 --- a/runtime/utilities/debug_file_reader.h +++ b/core/utilities/debug_file_reader.h @@ -7,7 +7,7 @@ #pragma once -#include "runtime/utilities/debug_settings_reader.h" +#include "core/utilities/debug_settings_reader.h" #include #include diff --git a/runtime/utilities/debug_settings_reader.cpp b/core/utilities/debug_settings_reader.cpp similarity index 82% rename from runtime/utilities/debug_settings_reader.cpp rename to core/utilities/debug_settings_reader.cpp index f8141bd7ab..33b1808e5f 100644 --- a/runtime/utilities/debug_settings_reader.cpp +++ b/core/utilities/debug_settings_reader.cpp @@ -5,9 +5,9 @@ * */ -#include "debug_settings_reader.h" +#include "core/utilities/debug_settings_reader.h" -#include "debug_file_reader.h" +#include "core/utilities/debug_file_reader.h" namespace NEO { diff --git a/runtime/utilities/debug_settings_reader.h b/core/utilities/debug_settings_reader.h similarity index 100% rename from runtime/utilities/debug_settings_reader.h rename to core/utilities/debug_settings_reader.h diff --git a/runtime/utilities/debug_settings_reader_creator.cpp b/core/utilities/debug_settings_reader_creator.cpp similarity index 81% rename from runtime/utilities/debug_settings_reader_creator.cpp rename to core/utilities/debug_settings_reader_creator.cpp index 665eba529e..499213a3f4 100644 --- a/runtime/utilities/debug_settings_reader_creator.cpp +++ b/core/utilities/debug_settings_reader_creator.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/utilities/debug_settings_reader_creator.h" +#include "core/utilities/debug_settings_reader_creator.h" namespace NEO { std::unique_ptr SettingsReaderCreator::create() { diff --git a/runtime/utilities/debug_settings_reader_creator.h b/core/utilities/debug_settings_reader_creator.h similarity index 83% rename from runtime/utilities/debug_settings_reader_creator.h rename to core/utilities/debug_settings_reader_creator.h index 20a27af832..895b69f8f9 100644 --- a/runtime/utilities/debug_settings_reader_creator.h +++ b/core/utilities/debug_settings_reader_creator.h @@ -7,7 +7,7 @@ #pragma once -#include "debug_settings_reader.h" +#include "core/utilities/debug_settings_reader.h" #include diff --git a/offline_compiler/helper.cpp b/offline_compiler/helper.cpp index fd2c516471..d5e331f240 100644 --- a/offline_compiler/helper.cpp +++ b/offline_compiler/helper.cpp @@ -5,9 +5,9 @@ * */ +#include "core/utilities/debug_settings_reader_creator.h" #include "runtime/helpers/hw_info.h" #include "runtime/os_interface/debug_settings_manager.h" -#include "runtime/utilities/debug_settings_reader_creator.h" namespace NEO { diff --git a/runtime/api/dispatch.h b/runtime/api/dispatch.h index 62b99f55ae..cae5e55281 100644 --- a/runtime/api/dispatch.h +++ b/runtime/api/dispatch.h @@ -19,7 +19,7 @@ #include "CL/cl_d3d11.h" #include "CL/cl_dx9_media_sharing.h" #define CL_DX9_MEDIA_SHARING_INTEL_EXT -#include "runtime/os_interface/windows/windows_wrapper.h" +#include "core/os_interface/windows/windows_wrapper.h" #include "CL/cl_dx9_media_sharing_intel.h" #else diff --git a/runtime/command_stream/aub_subcapture.cpp b/runtime/command_stream/aub_subcapture.cpp index 700ea008a0..9d9133a407 100644 --- a/runtime/command_stream/aub_subcapture.cpp +++ b/runtime/command_stream/aub_subcapture.cpp @@ -7,9 +7,9 @@ #include "runtime/command_stream/aub_subcapture.h" +#include "core/utilities/debug_settings_reader.h" #include "runtime/helpers/dispatch_info.h" #include "runtime/kernel/kernel.h" -#include "runtime/utilities/debug_settings_reader.h" namespace NEO { diff --git a/runtime/compiler_interface/binary_cache.cpp b/runtime/compiler_interface/binary_cache.cpp index 34cbb2a269..3c17f15d8a 100644 --- a/runtime/compiler_interface/binary_cache.cpp +++ b/runtime/compiler_interface/binary_cache.cpp @@ -6,13 +6,13 @@ */ #include +#include #include #include #include #include #include #include -#include #include "config.h" #include "os_inc.h" diff --git a/runtime/dll/CMakeLists.txt b/runtime/dll/CMakeLists.txt index d44da02c96..6709871b91 100644 --- a/runtime/dll/CMakeLists.txt +++ b/runtime/dll/CMakeLists.txt @@ -20,13 +20,13 @@ set(RUNTIME_SRCS_DLL_BASE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_devices.cpp ${IGDRCL_SOURCE_DIR}/core/utilities/clflush.cpp + ${IGDRCL_SOURCE_DIR}/core/utilities/debug_settings_reader_creator.cpp ${IGDRCL_SOURCE_DIR}/runtime/api/api.cpp ${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/resource_info.cpp ${IGDRCL_SOURCE_DIR}/runtime/helpers/abort.cpp ${IGDRCL_SOURCE_DIR}/runtime/helpers/built_ins_helper.cpp ${IGDRCL_SOURCE_DIR}/runtime/helpers/debug_helpers.cpp ${IGDRCL_SOURCE_DIR}/runtime/program/evaluate_unhandled_token.cpp - ${IGDRCL_SOURCE_DIR}/runtime/utilities/debug_settings_reader_creator.cpp ${GTPIN_INIT_FILE} ${HW_SRC_LINK} diff --git a/runtime/gmm_helper/gmm_lib.h b/runtime/gmm_helper/gmm_lib.h index e438359b68..cfee02bf6e 100644 --- a/runtime/gmm_helper/gmm_lib.h +++ b/runtime/gmm_helper/gmm_lib.h @@ -7,7 +7,7 @@ #pragma once #ifdef WIN32 -#include "runtime/os_interface/windows/windows_wrapper.h" +#include "core/os_interface/windows/windows_wrapper.h" #include diff --git a/runtime/os_interface/debug_settings_manager.cpp b/runtime/os_interface/debug_settings_manager.cpp index 6c074fba78..b84fb969d5 100644 --- a/runtime/os_interface/debug_settings_manager.cpp +++ b/runtime/os_interface/debug_settings_manager.cpp @@ -9,13 +9,13 @@ #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" +#include "core/utilities/debug_settings_reader_creator.h" #include "runtime/event/event.h" #include "runtime/helpers/dispatch_info.h" #include "runtime/helpers/timestamp_packet.h" #include "runtime/kernel/kernel.h" #include "runtime/mem_obj/mem_obj.h" #include "runtime/os_interface/definitions/translate_debug_settings.h" -#include "runtime/utilities/debug_settings_reader_creator.h" #include "CL/cl.h" diff --git a/runtime/os_interface/linux/CMakeLists.txt b/runtime/os_interface/linux/CMakeLists.txt index 9b95ee0108..e3aa38ac5d 100644 --- a/runtime/os_interface/linux/CMakeLists.txt +++ b/runtime/os_interface/linux/CMakeLists.txt @@ -9,7 +9,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/allocator_helper.h ${CMAKE_CURRENT_SOURCE_DIR}/api_linux.cpp ${CMAKE_CURRENT_SOURCE_DIR}/d3d_sharing_functions.h - ${CMAKE_CURRENT_SOURCE_DIR}/debug_env_reader.cpp ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl ${CMAKE_CURRENT_SOURCE_DIR}/device_factory_linux.cpp ${CMAKE_CURRENT_SOURCE_DIR}/driver_info.cpp @@ -57,6 +56,9 @@ set(RUNTIME_SRCS_OS_INTERFACE_LINUX ) if(UNIX) + get_property(NEO_CORE_OS_INTERFACE_LINUX GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_LINUX) + list(APPEND RUNTIME_SRCS_OS_INTERFACE_LINUX ${NEO_CORE_OS_INTERFACE_LINUX}) + target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_OS_INTERFACE_LINUX}) endif() set_property(GLOBAL PROPERTY RUNTIME_SRCS_OS_INTERFACE_LINUX ${RUNTIME_SRCS_OS_INTERFACE_LINUX}) diff --git a/runtime/os_interface/windows/CMakeLists.txt b/runtime/os_interface/windows/CMakeLists.txt index b41683f2c4..1648e1d1c0 100644 --- a/runtime/os_interface/windows/CMakeLists.txt +++ b/runtime/os_interface/windows/CMakeLists.txt @@ -16,7 +16,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS ${CMAKE_CURRENT_SOURCE_DIR}/d3d10_11_sharing_functions.cpp ${CMAKE_CURRENT_SOURCE_DIR}/d3d9_sharing_functions.cpp ${CMAKE_CURRENT_SOURCE_DIR}/d3d_sharing_functions.h - ${CMAKE_CURRENT_SOURCE_DIR}/debug_registry_reader.cpp ${CMAKE_CURRENT_SOURCE_DIR}/deferrable_deletion_win.cpp ${CMAKE_CURRENT_SOURCE_DIR}/deferrable_deletion_win.h ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl @@ -46,7 +45,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_win.cpp ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_win.h ${CMAKE_CURRENT_SOURCE_DIR}/print.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/registry_reader.h ${CMAKE_CURRENT_SOURCE_DIR}/sys_calls.h ${CMAKE_CURRENT_SOURCE_DIR}/thk_wrapper.h ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/wddm_allocation.cpp @@ -67,7 +65,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_operations_handler.h ${CMAKE_CURRENT_SOURCE_DIR}/windows_defs.h ${CMAKE_CURRENT_SOURCE_DIR}/windows_inc.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/windows_wrapper.h ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm.h @@ -77,6 +74,9 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS ) if(WIN32) + get_property(NEO_CORE_OS_INTERFACE_WINDOWS GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_WINDOWS) + list(APPEND RUNTIME_SRCS_OS_INTERFACE_WINDOWS ${NEO_CORE_OS_INTERFACE_WINDOWS}) + target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_OS_INTERFACE_WINDOWS} ) diff --git a/runtime/os_interface/windows/deferrable_deletion_win.h b/runtime/os_interface/windows/deferrable_deletion_win.h index 49e781f613..bdfb58ef6e 100644 --- a/runtime/os_interface/windows/deferrable_deletion_win.h +++ b/runtime/os_interface/windows/deferrable_deletion_win.h @@ -6,9 +6,9 @@ */ #pragma once +#include "core/os_interface/windows/windows_wrapper.h" #include "runtime/memory_manager/deferrable_deletion.h" #include "runtime/os_interface/os_context.h" -#include "runtime/os_interface/windows/windows_wrapper.h" #include diff --git a/runtime/os_interface/windows/driver_info.cpp b/runtime/os_interface/windows/driver_info.cpp index 2d0998df94..1871953128 100644 --- a/runtime/os_interface/windows/driver_info.cpp +++ b/runtime/os_interface/windows/driver_info.cpp @@ -7,9 +7,9 @@ #include "runtime/device/driver_info.h" +#include "core/os_interface/windows/debug_registry_reader.h" #include "runtime/os_interface/windows/driver_info.h" #include "runtime/os_interface/windows/os_interface.h" -#include "runtime/os_interface/windows/registry_reader.h" #include "runtime/os_interface/windows/wddm/wddm.h" namespace NEO { diff --git a/runtime/os_interface/windows/gl/gl_sharing_win.cpp b/runtime/os_interface/windows/gl/gl_sharing_win.cpp index 8484a0749a..17e98f152f 100644 --- a/runtime/os_interface/windows/gl/gl_sharing_win.cpp +++ b/runtime/os_interface/windows/gl/gl_sharing_win.cpp @@ -5,8 +5,8 @@ * */ +#include "core/os_interface/windows/windows_wrapper.h" #include "runtime/helpers/timestamp_packet.h" -#include "runtime/os_interface/windows/windows_wrapper.h" #include "runtime/sharings/gl/gl_arb_sync_event.h" #include "runtime/sharings/gl/gl_sharing.h" diff --git a/runtime/os_interface/windows/kmdaf_listener.h b/runtime/os_interface/windows/kmdaf_listener.h index 68562ecf72..fff3f17e46 100644 --- a/runtime/os_interface/windows/kmdaf_listener.h +++ b/runtime/os_interface/windows/kmdaf_listener.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/os_interface/windows/windows_wrapper.h" +#include "core/os_interface/windows/windows_wrapper.h" #include diff --git a/runtime/os_interface/windows/os_interface.h b/runtime/os_interface/windows/os_interface.h index 8cae10d7ac..af49af3e67 100644 --- a/runtime/os_interface/windows/os_interface.h +++ b/runtime/os_interface/windows/os_interface.h @@ -7,9 +7,9 @@ #pragma once +#include "core/os_interface/windows/windows_wrapper.h" #include "runtime/os_interface/os_interface.h" #include "runtime/os_interface/windows/wddm/wddm.h" -#include "runtime/os_interface/windows/windows_wrapper.h" #include "profileapi.h" #include "umKmInc/sharedata.h" diff --git a/runtime/os_interface/windows/os_library.h b/runtime/os_interface/windows/os_library.h index 8ef3432baf..0e605af9dd 100644 --- a/runtime/os_interface/windows/os_library.h +++ b/runtime/os_interface/windows/os_library.h @@ -9,7 +9,7 @@ #include "runtime/os_interface/os_library.h" #define UMDF_USING_NTSTATUS -#include "runtime/os_interface/windows/windows_wrapper.h" +#include "core/os_interface/windows/windows_wrapper.h" namespace NEO { namespace Windows { diff --git a/runtime/os_interface/windows/os_time_win.h b/runtime/os_interface/windows/os_time_win.h index 61cb5c8a0e..f6e585c211 100644 --- a/runtime/os_interface/windows/os_time_win.h +++ b/runtime/os_interface/windows/os_time_win.h @@ -6,8 +6,8 @@ */ #pragma once +#include "core/os_interface/windows/windows_wrapper.h" #include "runtime/os_interface/os_time.h" -#include "runtime/os_interface/windows/windows_wrapper.h" #include "gfxEscape.h" diff --git a/runtime/os_interface/windows/print.cpp b/runtime/os_interface/windows/print.cpp index d5c980408b..c14d204ac6 100644 --- a/runtime/os_interface/windows/print.cpp +++ b/runtime/os_interface/windows/print.cpp @@ -7,7 +7,7 @@ #include "runtime/os_interface/print.h" -#include "runtime/os_interface/windows/windows_wrapper.h" +#include "core/os_interface/windows/windows_wrapper.h" #include #include diff --git a/runtime/os_interface/windows/wddm/wddm.cpp b/runtime/os_interface/windows/wddm/wddm.cpp index 621728b66b..49d18f05ef 100644 --- a/runtime/os_interface/windows/wddm/wddm.cpp +++ b/runtime/os_interface/windows/wddm/wddm.cpp @@ -8,6 +8,7 @@ #include "runtime/os_interface/windows/wddm/wddm.h" #include "core/helpers/interlocked_max.h" +#include "core/os_interface/windows/debug_registry_reader.h" #include "runtime/command_stream/preemption.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/gmm_helper/gmm.h" @@ -19,7 +20,6 @@ #include "runtime/os_interface/windows/gdi_interface.h" #include "runtime/os_interface/windows/kmdaf_listener.h" #include "runtime/os_interface/windows/os_context_win.h" -#include "runtime/os_interface/windows/registry_reader.h" #include "runtime/os_interface/windows/wddm/wddm_interface.h" #include "runtime/os_interface/windows/wddm_allocation.h" #include "runtime/os_interface/windows/wddm_engine_mapper.h" diff --git a/runtime/os_interface/windows/wddm/wddm_interface.h b/runtime/os_interface/windows/wddm/wddm_interface.h index d3c9df93fa..b53f329178 100644 --- a/runtime/os_interface/windows/wddm/wddm_interface.h +++ b/runtime/os_interface/windows/wddm/wddm_interface.h @@ -6,9 +6,9 @@ */ #pragma once +#include "core/os_interface/windows/windows_wrapper.h" #include "runtime/helpers/hw_info.h" #include "runtime/os_interface/os_context.h" -#include "runtime/os_interface/windows/windows_wrapper.h" #include diff --git a/runtime/os_interface/windows/wddm_allocation.h b/runtime/os_interface/windows/wddm_allocation.h index f014d92ee0..258d062867 100644 --- a/runtime/os_interface/windows/wddm_allocation.h +++ b/runtime/os_interface/windows/wddm_allocation.h @@ -8,8 +8,8 @@ #pragma once #define UMDF_USING_NTSTATUS #include "core/helpers/aligned_memory.h" +#include "core/os_interface/windows/windows_wrapper.h" #include "runtime/memory_manager/graphics_allocation.h" -#include "runtime/os_interface/windows/windows_wrapper.h" #include diff --git a/runtime/os_interface/windows/wddm_memory_manager.h b/runtime/os_interface/windows/wddm_memory_manager.h index 4c35747abf..5c2ddc199f 100644 --- a/runtime/os_interface/windows/wddm_memory_manager.h +++ b/runtime/os_interface/windows/wddm_memory_manager.h @@ -7,10 +7,10 @@ #pragma once #include "core/helpers/aligned_memory.h" +#include "core/os_interface/windows/windows_wrapper.h" #include "runtime/memory_manager/memory_manager.h" #include "runtime/os_interface/os_context.h" #include "runtime/os_interface/windows/wddm_allocation.h" -#include "runtime/os_interface/windows/windows_wrapper.h" #include diff --git a/runtime/os_interface/windows/wddm_residency_controller.h b/runtime/os_interface/windows/wddm_residency_controller.h index e05c4cefb3..6c6c2e320b 100644 --- a/runtime/os_interface/windows/wddm_residency_controller.h +++ b/runtime/os_interface/windows/wddm_residency_controller.h @@ -7,10 +7,10 @@ #pragma once +#include "core/os_interface/windows/windows_wrapper.h" #include "core/utilities/spinlock.h" #include "runtime/memory_manager/residency_container.h" #include "runtime/os_interface/windows/windows_defs.h" -#include "runtime/os_interface/windows/windows_wrapper.h" #include #include diff --git a/runtime/sku_info/operations/sku_info_receiver.h b/runtime/sku_info/operations/sku_info_receiver.h index 7f1b00d642..2db49b1394 100644 --- a/runtime/sku_info/operations/sku_info_receiver.h +++ b/runtime/sku_info/operations/sku_info_receiver.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/os_interface/windows/windows_wrapper.h" +#include "core/os_interface/windows/windows_wrapper.h" #include "sku_info.h" #include "umKmInc/sharedata.h" diff --git a/runtime/utilities/CMakeLists.txt b/runtime/utilities/CMakeLists.txt index d662ff91eb..f15c29f534 100644 --- a/runtime/utilities/CMakeLists.txt +++ b/runtime/utilities/CMakeLists.txt @@ -8,11 +8,6 @@ set(RUNTIME_SRCS_UTILITIES_BASE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/api_intercept.h ${CMAKE_CURRENT_SOURCE_DIR}/arrayref.h - ${CMAKE_CURRENT_SOURCE_DIR}/debug_file_reader.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/debug_file_reader.h - ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader_creator.h - ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader.h ${CMAKE_CURRENT_SOURCE_DIR}/directory.h ${CMAKE_CURRENT_SOURCE_DIR}/heap_allocator.cpp ${CMAKE_CURRENT_SOURCE_DIR}/heap_allocator.h diff --git a/runtime/utilities/windows/directory.cpp b/runtime/utilities/windows/directory.cpp index 86c54b92e3..67eb91231c 100644 --- a/runtime/utilities/windows/directory.cpp +++ b/runtime/utilities/windows/directory.cpp @@ -7,7 +7,7 @@ #include "runtime/utilities/directory.h" -#include "runtime/os_interface/windows/windows_wrapper.h" +#include "core/os_interface/windows/windows_wrapper.h" namespace NEO { diff --git a/runtime/utilities/windows/timer_util.cpp b/runtime/utilities/windows/timer_util.cpp index 40b02e83bc..7801fea34e 100644 --- a/runtime/utilities/windows/timer_util.cpp +++ b/runtime/utilities/windows/timer_util.cpp @@ -7,8 +7,8 @@ #include "runtime/utilities/timer_util.h" +#include "core/os_interface/windows/windows_wrapper.h" #include "runtime/helpers/debug_helpers.h" -#include "runtime/os_interface/windows/windows_wrapper.h" namespace NEO { diff --git a/unit_tests/api/cl_icd_get_platform_ids_khr_tests.inl b/unit_tests/api/cl_icd_get_platform_ids_khr_tests.inl index 66a18af64a..055c8b9486 100644 --- a/unit_tests/api/cl_icd_get_platform_ids_khr_tests.inl +++ b/unit_tests/api/cl_icd_get_platform_ids_khr_tests.inl @@ -6,7 +6,7 @@ */ #if defined(_WIN32) -#include "runtime/os_interface/windows/windows_wrapper.h" +#include "core/os_interface/windows/windows_wrapper.h" #endif #include "runtime/device/device.h" diff --git a/unit_tests/api/cl_retain_mem_obj_tests.inl b/unit_tests/api/cl_retain_mem_obj_tests.inl index f838426e82..ca75647817 100644 --- a/unit_tests/api/cl_retain_mem_obj_tests.inl +++ b/unit_tests/api/cl_retain_mem_obj_tests.inl @@ -52,6 +52,5 @@ TEST_F(clRetainMemObjectTests, GivenValidParamsWhenRetainingMemObjectThenRefCoun retVal = clReleaseMemObject(buffer); EXPECT_EQ(CL_SUCCESS, retVal); - } } // namespace ULT diff --git a/unit_tests/command_queue/gl/enqueue_kernel_gl_tests.cpp b/unit_tests/command_queue/gl/enqueue_kernel_gl_tests.cpp index d27522657d..637eb6da63 100644 --- a/unit_tests/command_queue/gl/enqueue_kernel_gl_tests.cpp +++ b/unit_tests/command_queue/gl/enqueue_kernel_gl_tests.cpp @@ -5,11 +5,11 @@ * */ +#include "core/os_interface/windows/windows_wrapper.h" #include "runtime/built_ins/built_ins.h" #include "runtime/helpers/preamble.h" #include "runtime/memory_manager/graphics_allocation.h" #include "runtime/memory_manager/memory_constants.h" -#include "runtime/os_interface/windows/windows_wrapper.h" #include "runtime/sharings/gl/gl_buffer.h" #include "unit_tests/command_queue/enqueue_fixture.h" #include "unit_tests/fixtures/hello_world_fixture.h" diff --git a/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp b/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp index eb9aff7da1..6ef3b4ea18 100644 --- a/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp @@ -8,6 +8,7 @@ #include "core/command_stream/linear_stream.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" +#include "core/os_interface/linux/debug_env_reader.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/built_ins/built_ins.h" #include "runtime/command_queue/command_queue_hw.h" @@ -22,7 +23,6 @@ #include "runtime/memory_manager/graphics_allocation.h" #include "runtime/memory_manager/memory_manager.h" #include "runtime/os_interface/debug_settings_manager.h" -#include "runtime/utilities/linux/debug_env_reader.h" #include "test.h" #include "unit_tests/fixtures/built_in_fixture.h" #include "unit_tests/fixtures/device_fixture.h" diff --git a/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp b/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp index 42542d2b32..f6d7c9aa24 100644 --- a/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp @@ -8,6 +8,7 @@ #include "core/command_stream/linear_stream.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" +#include "core/os_interface/linux/debug_env_reader.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/built_ins/built_ins.h" #include "runtime/command_queue/command_queue_hw.h" @@ -25,7 +26,6 @@ #include "runtime/memory_manager/memory_manager.h" #include "runtime/os_interface/debug_settings_manager.h" #include "runtime/os_interface/os_context.h" -#include "runtime/utilities/linux/debug_env_reader.h" #include "test.h" #include "unit_tests/fixtures/built_in_fixture.h" #include "unit_tests/fixtures/device_fixture.h" diff --git a/unit_tests/helpers/windows/gl_helper_tests.cpp b/unit_tests/helpers/windows/gl_helper_tests.cpp index f923b3cf86..1ecfb15141 100644 --- 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/windows/windows_wrapper.h" #include "runtime/helpers/windows/gl_helper.h" #include "runtime/os_interface/os_library.h" -#include "runtime/os_interface/windows/windows_wrapper.h" #include "test.h" #include "unit_tests/helpers/windows/mock_function.h" diff --git a/unit_tests/main.cpp b/unit_tests/main.cpp index f5fabc4f98..26485bc0a4 100644 --- a/unit_tests/main.cpp +++ b/unit_tests/main.cpp @@ -6,11 +6,11 @@ */ #include "core/unit_tests/helpers/memory_leak_listener.h" +#include "core/utilities/debug_settings_reader.h" #include "runtime/gmm_helper/resource_info.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/debug_settings_manager.h" #include "runtime/os_interface/hw_info_config.h" -#include "runtime/utilities/debug_settings_reader.h" #include "unit_tests/custom_event_listener.h" #include "unit_tests/mocks/mock_gmm.h" #include "unit_tests/mocks/mock_program.h" diff --git a/unit_tests/os_interface/debug_settings_manager_tests.cpp b/unit_tests/os_interface/debug_settings_manager_tests.cpp index 5a445e5646..11706bcbcb 100644 --- a/unit_tests/os_interface/debug_settings_manager_tests.cpp +++ b/unit_tests/os_interface/debug_settings_manager_tests.cpp @@ -6,7 +6,7 @@ */ #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/utilities/debug_file_reader.h" +#include "core/utilities/debug_file_reader.h" #include "unit_tests/fixtures/buffer_fixture.h" #include "unit_tests/fixtures/image_fixture.h" #include "unit_tests/mocks/mock_buffer.h" diff --git a/unit_tests/os_interface/linux/debug_env_reader.cpp b/unit_tests/os_interface/linux/debug_env_reader.cpp index ff585f4d53..e59d5e2f18 100644 --- a/unit_tests/os_interface/linux/debug_env_reader.cpp +++ b/unit_tests/os_interface/linux/debug_env_reader.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/utilities/linux/debug_env_reader.h" +#include "core/os_interface/linux/debug_env_reader.h" #include "test.h" diff --git a/unit_tests/os_interface/windows/driver_info_tests.cpp b/unit_tests/os_interface/windows/driver_info_tests.cpp index 93ba706ce2..8da71ad11e 100644 --- a/unit_tests/os_interface/windows/driver_info_tests.cpp +++ b/unit_tests/os_interface/windows/driver_info_tests.cpp @@ -5,13 +5,13 @@ * */ +#include "core/os_interface/windows/debug_registry_reader.h" #include "runtime/command_stream/preemption.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/helpers/options.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" #include "runtime/os_interface/windows/driver_info.h" #include "runtime/os_interface/windows/os_interface.h" -#include "runtime/os_interface/windows/registry_reader.h" #include "unit_tests/helpers/variable_backup.h" #include "unit_tests/libult/create_command_stream.h" #include "unit_tests/mocks/mock_csr.h" diff --git a/unit_tests/os_interface/windows/mock_performance_counters_win.cpp b/unit_tests/os_interface/windows/mock_performance_counters_win.cpp index af049b1bbe..00232fea48 100644 --- a/unit_tests/os_interface/windows/mock_performance_counters_win.cpp +++ b/unit_tests/os_interface/windows/mock_performance_counters_win.cpp @@ -7,9 +7,9 @@ #include "mock_performance_counters_win.h" +#include "core/os_interface/windows/windows_wrapper.h" #include "runtime/os_interface/os_interface.h" #include "runtime/os_interface/windows/os_interface.h" -#include "runtime/os_interface/windows/windows_wrapper.h" #include "unit_tests/mocks/mock_wddm.h" #include "unit_tests/os_interface/windows/mock_os_time_win.h" diff --git a/unit_tests/os_interface/windows/mock_registry_reader.cpp b/unit_tests/os_interface/windows/mock_registry_reader.cpp index 3017ef57c0..a581137ec6 100644 --- a/unit_tests/os_interface/windows/mock_registry_reader.cpp +++ b/unit_tests/os_interface/windows/mock_registry_reader.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "windows_wrapper.h" +#include "core/os_interface/windows/windows_wrapper.h" LSTATUS APIENTRY RegOpenKeyExA( HKEY hKey, diff --git a/unit_tests/os_interface/windows/registry_reader_tests.h b/unit_tests/os_interface/windows/registry_reader_tests.h index 84e10311e3..11e136f64c 100644 --- a/unit_tests/os_interface/windows/registry_reader_tests.h +++ b/unit_tests/os_interface/windows/registry_reader_tests.h @@ -5,7 +5,7 @@ * */ -#include "runtime/os_interface/windows/registry_reader.h" +#include "core/os_interface/windows/debug_registry_reader.h" namespace NEO { class TestedRegistryReader : public RegistryReader { diff --git a/unit_tests/utilities/debug_file_reader_tests.inl b/unit_tests/utilities/debug_file_reader_tests.inl index ce9768c8ca..8ffeca9fa1 100644 --- a/unit_tests/utilities/debug_file_reader_tests.inl +++ b/unit_tests/utilities/debug_file_reader_tests.inl @@ -5,8 +5,8 @@ * */ +#include "core/utilities/debug_file_reader.h" #include "runtime/helpers/file_io.h" -#include "runtime/utilities/debug_file_reader.h" #include "test.h" #include "gtest/gtest.h" diff --git a/unit_tests/utilities/debug_settings_reader_creator.cpp b/unit_tests/utilities/debug_settings_reader_creator.cpp index 22ac98f33e..9116b6329f 100644 --- a/unit_tests/utilities/debug_settings_reader_creator.cpp +++ b/unit_tests/utilities/debug_settings_reader_creator.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/utilities/debug_settings_reader_creator.h" +#include "core/utilities/debug_settings_reader_creator.h" namespace NEO { std::unique_ptr SettingsReaderCreator::create() { diff --git a/unit_tests/utilities/debug_settings_reader_tests.cpp b/unit_tests/utilities/debug_settings_reader_tests.cpp index c027ae499b..a6eb46fc29 100644 --- a/unit_tests/utilities/debug_settings_reader_tests.cpp +++ b/unit_tests/utilities/debug_settings_reader_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/utilities/debug_settings_reader.h" #include "runtime/helpers/file_io.h" #include "runtime/os_interface/debug_settings_manager.h" -#include "runtime/utilities/debug_settings_reader.h" #include "test.h" #include "gtest/gtest.h"