From 51f7ca1601e96a25c7c541a4302859614a1a8b12 Mon Sep 17 00:00:00 2001 From: Mateusz Hoppe Date: Mon, 30 Dec 2019 14:40:24 +0100 Subject: [PATCH] Move files to core - runtime/gmm_helper files - engine_control.h - allocation_properties.h Change-Id: I108888d639c8fdb298eda00fb1e7961b2ccb26cd Signed-off-by: Mateusz Hoppe --- core/execution_environment/root_device_environment.cpp | 4 ++-- core/gmm_helper/CMakeLists.txt | 6 +++++- {runtime => core}/gmm_helper/page_table_mngr.cpp | 4 ++-- {runtime => core}/gmm_helper/page_table_mngr.h | 0 {runtime => core}/gmm_helper/page_table_mngr_impl.cpp | 4 ++-- {runtime => core}/gmm_helper/resource_info.cpp | 4 ++-- {runtime => core}/gmm_helper/resource_info.h | 2 +- {runtime => core}/gmm_helper/resource_info_impl.cpp | 4 ++-- core/helpers/CMakeLists.txt | 3 ++- {runtime => core}/helpers/engine_control.h | 2 +- core/memory_manager/CMakeLists.txt | 3 ++- {runtime => core}/memory_manager/allocation_properties.h | 2 +- core/os_interface/linux/CMakeLists.txt | 3 ++- .../os_interface/linux/page_table_manager_functions.cpp | 2 +- core/os_interface/windows/CMakeLists.txt | 3 ++- .../os_interface/windows/page_table_manager_functions.cpp | 2 +- manifests/manifest.yml | 2 +- runtime/aub_mem_dump/aub_alloc_dump.h | 4 ++-- runtime/command_queue/command_queue.h | 4 ++-- runtime/command_queue/command_queue_hw.h | 4 ++-- runtime/command_stream/command_stream_receiver_hw_base.inl | 2 +- .../command_stream_receiver_simulated_common_hw_base.inl | 4 ++-- runtime/device/device.h | 4 ++-- runtime/dll/CMakeLists.txt | 6 +++--- runtime/gmm_helper/CMakeLists.txt | 6 +----- runtime/gmm_helper/gmm.cpp | 4 ++-- runtime/helpers/CMakeLists.txt | 3 +-- runtime/helpers/mem_properties_parser_helper.h | 4 ++-- runtime/helpers/mipmap.cpp | 4 ++-- runtime/mem_obj/buffer_base.inl | 4 ++-- runtime/mem_obj/image.cpp | 4 ++-- runtime/mem_obj/image.inl | 4 ++-- runtime/mem_obj/mem_obj.cpp | 4 ++-- runtime/memory_manager/CMakeLists.txt | 3 +-- runtime/memory_manager/deferrable_allocation_deletion.cpp | 4 ++-- runtime/memory_manager/memory_manager.cpp | 6 +++--- runtime/memory_manager/memory_manager.h | 6 +++--- runtime/memory_manager/os_agnostic_memory_manager.cpp | 4 ++-- runtime/os_interface/linux/CMakeLists.txt | 3 +-- runtime/os_interface/linux/drm_command_stream.inl | 4 ++-- runtime/os_interface/linux/drm_memory_manager.cpp | 4 ++-- runtime/os_interface/windows/CMakeLists.txt | 3 +-- runtime/os_interface/windows/wddm/wddm.cpp | 6 +++--- runtime/os_interface/windows/wddm_device_command_stream.inl | 4 ++-- runtime/os_interface/windows/wddm_memory_manager.cpp | 6 +++--- runtime/sharings/d3d/d3d_texture.cpp | 4 ++-- runtime/sharings/gl/gl_texture.cpp | 4 ++-- runtime/sharings/unified/unified_image.cpp | 4 ++-- unit_tests/aub_tests/CMakeLists.txt | 4 ++-- unit_tests/command_stream/command_stream_receiver_tests.cpp | 4 ++-- unit_tests/helpers/hw_helper_tests.cpp | 4 ++-- unit_tests/main.cpp | 4 ++-- unit_tests/mem_obj/buffer_tests.cpp | 4 ++-- unit_tests/memory_manager/memory_manager_tests.cpp | 4 ++-- unit_tests/mocks/CMakeLists.txt | 6 +++--- unit_tests/mocks/mock_gmm_page_table_mngr.h | 2 +- unit_tests/mocks/mock_gmm_resource_info.h | 4 ++-- unit_tests/os_interface/linux/drm_command_stream_tests.cpp | 4 ++-- unit_tests/sharings/gl/gl_reused_buffers_tests.cpp | 4 ++-- 59 files changed, 112 insertions(+), 112 deletions(-) rename {runtime => core}/gmm_helper/page_table_mngr.cpp (75%) rename {runtime => core}/gmm_helper/page_table_mngr.h (100%) rename {runtime => core}/gmm_helper/page_table_mngr_impl.cpp (91%) rename {runtime => core}/gmm_helper/resource_info.cpp (83%) rename {runtime => core}/gmm_helper/resource_info.h (98%) rename {runtime => core}/gmm_helper/resource_info_impl.cpp (91%) rename {runtime => core}/helpers/engine_control.h (91%) rename {runtime => core}/memory_manager/allocation_properties.h (98%) rename {runtime => core}/os_interface/linux/page_table_manager_functions.cpp (92%) rename {runtime => core}/os_interface/windows/page_table_manager_functions.cpp (93%) diff --git a/core/execution_environment/root_device_environment.cpp b/core/execution_environment/root_device_environment.cpp index 93270dcdd3..6f60c5fde8 100644 --- a/core/execution_environment/root_device_environment.cpp +++ b/core/execution_environment/root_device_environment.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,10 +7,10 @@ #include "core/execution_environment/root_device_environment.h" +#include "core/gmm_helper/page_table_mngr.h" #include "core/memory_manager/memory_operations_handler.h" #include "runtime/aub/aub_center.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/gmm_helper/page_table_mngr.h" namespace NEO { diff --git a/core/gmm_helper/CMakeLists.txt b/core/gmm_helper/CMakeLists.txt index 8b9cb1f17e..3f72f04e47 100644 --- a/core/gmm_helper/CMakeLists.txt +++ b/core/gmm_helper/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2019 Intel Corporation +# Copyright (C) 2019-2020 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -13,6 +13,10 @@ set(NEO_CORE_GMM_HELPER ${CMAKE_CURRENT_SOURCE_DIR}/gmm_helper.cpp ${CMAKE_CURRENT_SOURCE_DIR}/gmm_helper.h ${CMAKE_CURRENT_SOURCE_DIR}/gmm_lib.h + ${CMAKE_CURRENT_SOURCE_DIR}/page_table_mngr.h + ${CMAKE_CURRENT_SOURCE_DIR}/page_table_mngr_impl.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/resource_info.h + ${CMAKE_CURRENT_SOURCE_DIR}/resource_info_impl.cpp ) set_property(GLOBAL PROPERTY NEO_CORE_GMM_HELPER ${NEO_CORE_GMM_HELPER}) diff --git a/runtime/gmm_helper/page_table_mngr.cpp b/core/gmm_helper/page_table_mngr.cpp similarity index 75% rename from runtime/gmm_helper/page_table_mngr.cpp rename to core/gmm_helper/page_table_mngr.cpp index 6759d70f6d..d284337079 100644 --- a/runtime/gmm_helper/page_table_mngr.cpp +++ b/core/gmm_helper/page_table_mngr.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/gmm_helper/page_table_mngr.h" +#include "core/gmm_helper/page_table_mngr.h" namespace NEO { GmmPageTableMngr *GmmPageTableMngr::create(unsigned int translationTableFlags, GMM_TRANSLATIONTABLE_CALLBACKS *translationTableCb) { diff --git a/runtime/gmm_helper/page_table_mngr.h b/core/gmm_helper/page_table_mngr.h similarity index 100% rename from runtime/gmm_helper/page_table_mngr.h rename to core/gmm_helper/page_table_mngr.h diff --git a/runtime/gmm_helper/page_table_mngr_impl.cpp b/core/gmm_helper/page_table_mngr_impl.cpp similarity index 91% rename from runtime/gmm_helper/page_table_mngr_impl.cpp rename to core/gmm_helper/page_table_mngr_impl.cpp index 6bef068a08..9cc9540047 100644 --- a/runtime/gmm_helper/page_table_mngr_impl.cpp +++ b/core/gmm_helper/page_table_mngr_impl.cpp @@ -6,9 +6,9 @@ */ #include "core/gmm_helper/gmm_helper.h" +#include "core/gmm_helper/page_table_mngr.h" +#include "core/gmm_helper/resource_info.h" #include "runtime/gmm_helper/gmm.h" -#include "runtime/gmm_helper/page_table_mngr.h" -#include "runtime/gmm_helper/resource_info.h" #include "gmm_client_context.h" diff --git a/runtime/gmm_helper/resource_info.cpp b/core/gmm_helper/resource_info.cpp similarity index 83% rename from runtime/gmm_helper/resource_info.cpp rename to core/gmm_helper/resource_info.cpp index 0d4e459ed6..b81a9a5b9a 100644 --- a/runtime/gmm_helper/resource_info.cpp +++ b/core/gmm_helper/resource_info.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/gmm_helper/resource_info.h" +#include "core/gmm_helper/resource_info.h" namespace NEO { GmmResourceInfo *GmmResourceInfo::create(GmmClientContext *clientContext, GMM_RESCREATE_PARAMS *resourceCreateParams) { diff --git a/runtime/gmm_helper/resource_info.h b/core/gmm_helper/resource_info.h similarity index 98% rename from runtime/gmm_helper/resource_info.h rename to core/gmm_helper/resource_info.h index 1e6f3a09d2..9ed2d012b0 100644 --- a/runtime/gmm_helper/resource_info.h +++ b/core/gmm_helper/resource_info.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/runtime/gmm_helper/resource_info_impl.cpp b/core/gmm_helper/resource_info_impl.cpp similarity index 91% rename from runtime/gmm_helper/resource_info_impl.cpp rename to core/gmm_helper/resource_info_impl.cpp index 4b9161de1a..c117681a0a 100644 --- a/runtime/gmm_helper/resource_info_impl.cpp +++ b/core/gmm_helper/resource_info_impl.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "core/gmm_helper/gmm_helper.h" -#include "runtime/gmm_helper/resource_info.h" +#include "core/gmm_helper/resource_info.h" #include "gmm_client_context.h" diff --git a/core/helpers/CMakeLists.txt b/core/helpers/CMakeLists.txt index 473aaf3b28..10d3ef56db 100644 --- a/core/helpers/CMakeLists.txt +++ b/core/helpers/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2019 Intel Corporation +# Copyright (C) 2019-2020 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -16,6 +16,7 @@ set(NEO_CORE_HELPERS ${CMAKE_CURRENT_SOURCE_DIR}/completion_stamp.h ${CMAKE_CURRENT_SOURCE_DIR}/debug_helpers.h ${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter_helper.h + ${CMAKE_CURRENT_SOURCE_DIR}/engine_control.h ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/engine_node_helper.cpp ${CMAKE_CURRENT_SOURCE_DIR}/engine_node_helper.h ${CMAKE_CURRENT_SOURCE_DIR}/extendable_enum.h diff --git a/runtime/helpers/engine_control.h b/core/helpers/engine_control.h similarity index 91% rename from runtime/helpers/engine_control.h rename to core/helpers/engine_control.h index 4c1b0db421..fcd5157f13 100644 --- a/runtime/helpers/engine_control.h +++ b/core/helpers/engine_control.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/core/memory_manager/CMakeLists.txt b/core/memory_manager/CMakeLists.txt index e7c1038bcc..8d38b8bb7d 100644 --- a/core/memory_manager/CMakeLists.txt +++ b/core/memory_manager/CMakeLists.txt @@ -1,11 +1,12 @@ # -# Copyright (C) 2019 Intel Corporation +# Copyright (C) 2019-2020 Intel Corporation # # SPDX-License-Identifier: MIT # set(NEO_CORE_MEMORY_MANAGER ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/allocation_properties.h ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/engine_limits.h ${CMAKE_CURRENT_SOURCE_DIR}/eviction_status.h ${CMAKE_CURRENT_SOURCE_DIR}/gfx_partition.cpp diff --git a/runtime/memory_manager/allocation_properties.h b/core/memory_manager/allocation_properties.h similarity index 98% rename from runtime/memory_manager/allocation_properties.h rename to core/memory_manager/allocation_properties.h index 57a286315a..6403c6dac4 100644 --- a/runtime/memory_manager/allocation_properties.h +++ b/core/memory_manager/allocation_properties.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/core/os_interface/linux/CMakeLists.txt b/core/os_interface/linux/CMakeLists.txt index 5fb2310967..dc448ce1aa 100644 --- a/core/os_interface/linux/CMakeLists.txt +++ b/core/os_interface/linux/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2019 Intel Corporation +# Copyright (C) 2019-2020 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -15,6 +15,7 @@ set(NEO_CORE_OS_INTERFACE_LINUX ${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}/page_table_manager_functions.cpp ${CMAKE_CURRENT_SOURCE_DIR}/print.cpp ) diff --git a/runtime/os_interface/linux/page_table_manager_functions.cpp b/core/os_interface/linux/page_table_manager_functions.cpp similarity index 92% rename from runtime/os_interface/linux/page_table_manager_functions.cpp rename to core/os_interface/linux/page_table_manager_functions.cpp index e96969007e..37bf83c250 100644 --- a/runtime/os_interface/linux/page_table_manager_functions.cpp +++ b/core/os_interface/linux/page_table_manager_functions.cpp @@ -6,7 +6,7 @@ */ #include "core/gmm_helper/gmm_helper.h" -#include "runtime/gmm_helper/page_table_mngr.h" +#include "core/gmm_helper/page_table_mngr.h" #include "runtime/platform/platform.h" #include "gmm_client_context.h" diff --git a/core/os_interface/windows/CMakeLists.txt b/core/os_interface/windows/CMakeLists.txt index def469f724..85de0c192c 100644 --- a/core/os_interface/windows/CMakeLists.txt +++ b/core/os_interface/windows/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2019 Intel Corporation +# Copyright (C) 2019-2020 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -20,6 +20,7 @@ set(NEO_CORE_OS_INTERFACE_WINDOWS ${CMAKE_CURRENT_SOURCE_DIR}/os_library_win.h ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_win.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_win.h + ${CMAKE_CURRENT_SOURCE_DIR}/page_table_manager_functions.cpp ${CMAKE_CURRENT_SOURCE_DIR}/print.cpp ${CMAKE_CURRENT_SOURCE_DIR}/sys_calls.h ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/wddm_engine_mapper.cpp diff --git a/runtime/os_interface/windows/page_table_manager_functions.cpp b/core/os_interface/windows/page_table_manager_functions.cpp similarity index 93% rename from runtime/os_interface/windows/page_table_manager_functions.cpp rename to core/os_interface/windows/page_table_manager_functions.cpp index 15a8491bb5..e6703cd2fb 100644 --- a/runtime/os_interface/windows/page_table_manager_functions.cpp +++ b/core/os_interface/windows/page_table_manager_functions.cpp @@ -6,7 +6,7 @@ */ #include "core/gmm_helper/gmm_helper.h" -#include "runtime/gmm_helper/page_table_mngr.h" +#include "core/gmm_helper/page_table_mngr.h" #include "runtime/platform/platform.h" #include "gmm_client_context.h" diff --git a/manifests/manifest.yml b/manifests/manifest.yml index 59fb588cae..b0db250aee 100644 --- a/manifests/manifest.yml +++ b/manifests/manifest.yml @@ -17,7 +17,7 @@ components: branch: infra clean_on_sync: true dest_dir: infra - revision: 1c8a06a9acd8609850619ad0060314b47be4488e + revision: 702c5ad1f900ab22ed98f77480d38c2938f1fe0e type: git internal: branch: master diff --git a/runtime/aub_mem_dump/aub_alloc_dump.h b/runtime/aub_mem_dump/aub_alloc_dump.h index 2bc3446fc1..15fb269ef9 100644 --- a/runtime/aub_mem_dump/aub_alloc_dump.h +++ b/runtime/aub_mem_dump/aub_alloc_dump.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,10 +8,10 @@ #pragma once #include "core/debug_settings/debug_settings_manager.h" +#include "core/gmm_helper/resource_info.h" #include "core/helpers/options.h" #include "core/memory_manager/graphics_allocation.h" #include "runtime/aub_mem_dump/aub_mem_dump.h" -#include "runtime/gmm_helper/resource_info.h" using namespace NEO; diff --git a/runtime/command_queue/command_queue.h b/runtime/command_queue/command_queue.h index 8cb6629ab8..0cd0479bef 100644 --- a/runtime/command_queue/command_queue.h +++ b/runtime/command_queue/command_queue.h @@ -1,15 +1,15 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #pragma once +#include "core/helpers/engine_control.h" #include "runtime/event/event.h" #include "runtime/helpers/base_object.h" #include "runtime/helpers/dispatch_info.h" -#include "runtime/helpers/engine_control.h" #include "runtime/helpers/task_information.h" #include diff --git a/runtime/command_queue/command_queue_hw.h b/runtime/command_queue/command_queue_hw.h index f15830b861..c32571ebf6 100644 --- a/runtime/command_queue/command_queue_hw.h +++ b/runtime/command_queue/command_queue_hw.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #pragma once #include "core/command_stream/preemption.h" +#include "core/helpers/engine_control.h" #include "core/helpers/hw_helper.h" #include "core/memory_manager/graphics_allocation.h" #include "runtime/command_queue/command_queue.h" @@ -14,7 +15,6 @@ #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/device_queue/device_queue_hw.h" #include "runtime/helpers/dispatch_info.h" -#include "runtime/helpers/engine_control.h" #include "runtime/helpers/queue_helpers.h" #include "runtime/mem_obj/mem_obj.h" #include "runtime/program/printf_handler.h" diff --git a/runtime/command_stream/command_stream_receiver_hw_base.inl b/runtime/command_stream/command_stream_receiver_hw_base.inl index 02e5a8d157..610dc90d1c 100644 --- a/runtime/command_stream/command_stream_receiver_hw_base.inl +++ b/runtime/command_stream/command_stream_receiver_hw_base.inl @@ -9,6 +9,7 @@ #include "core/command_stream/preemption.h" #include "core/debug_settings/debug_settings_manager.h" #include "core/execution_environment/root_device_environment.h" +#include "core/gmm_helper/page_table_mngr.h" #include "core/helpers/cache_policy.h" #include "core/helpers/hw_helper.h" #include "core/helpers/options.h" @@ -22,7 +23,6 @@ #include "runtime/command_stream/scratch_space_controller_base.h" #include "runtime/device/device.h" #include "runtime/event/event.h" -#include "runtime/gmm_helper/page_table_mngr.h" #include "runtime/gtpin/gtpin_notify.h" #include "runtime/helpers/blit_commands_helper.h" #include "runtime/helpers/flat_batch_buffer_helper_hw.h" diff --git a/runtime/command_stream/command_stream_receiver_simulated_common_hw_base.inl b/runtime/command_stream/command_stream_receiver_simulated_common_hw_base.inl index f01fd80b58..c420985bd2 100644 --- a/runtime/command_stream/command_stream_receiver_simulated_common_hw_base.inl +++ b/runtime/command_stream/command_stream_receiver_simulated_common_hw_base.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,11 +7,11 @@ #include "core/debug_settings/debug_settings_manager.h" #include "core/gmm_helper/gmm_helper.h" +#include "core/gmm_helper/resource_info.h" #include "runtime/aub/aub_helper.h" #include "runtime/aub_mem_dump/page_table_entry_bits.h" #include "runtime/command_stream/command_stream_receiver_simulated_common_hw.h" #include "runtime/gmm_helper/gmm.h" -#include "runtime/gmm_helper/resource_info.h" #include "runtime/helpers/hardware_context_controller.h" #include "runtime/memory_manager/address_mapper.h" #include "runtime/memory_manager/memory_manager.h" diff --git a/runtime/device/device.h b/runtime/device/device.h index e42c6a32a2..a0ba446e11 100644 --- a/runtime/device/device.h +++ b/runtime/device/device.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,12 +7,12 @@ #pragma once #include "core/helpers/common_types.h" +#include "core/helpers/engine_control.h" #include "core/helpers/hw_info.h" #include "runtime/api/cl_types.h" #include "runtime/device/device_info_map.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/helpers/base_object.h" -#include "runtime/helpers/engine_control.h" #include "runtime/os_interface/performance_counters.h" #include "engine_node.h" diff --git a/runtime/dll/CMakeLists.txt b/runtime/dll/CMakeLists.txt index 280b9e0f82..e1c023a50f 100644 --- a/runtime/dll/CMakeLists.txt +++ b/runtime/dll/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2018-2019 Intel Corporation +# Copyright (C) 2018-2020 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -20,14 +20,14 @@ set(RUNTIME_SRCS_DLL_BASE ${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger.cpp ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_devices.cpp + ${NEO_SOURCE_DIR}/core/gmm_helper/resource_info.cpp + ${NEO_SOURCE_DIR}/core/gmm_helper/page_table_mngr.cpp ${NEO_SOURCE_DIR}/core/helpers/abort.cpp ${NEO_SOURCE_DIR}/core/helpers/debug_helpers.cpp ${NEO_SOURCE_DIR}/core/helpers/allow_deferred_deleter.cpp ${NEO_SOURCE_DIR}/core/utilities/clflush.cpp ${NEO_SOURCE_DIR}/core/utilities/debug_settings_reader_creator.cpp ${NEO_SOURCE_DIR}/runtime/api/api.cpp - ${NEO_SOURCE_DIR}/runtime/gmm_helper/page_table_mngr.cpp - ${NEO_SOURCE_DIR}/runtime/gmm_helper/resource_info.cpp ${NEO_SOURCE_DIR}/runtime/helpers/built_ins_helper.cpp ${NEO_SOURCE_DIR}/runtime/program/evaluate_unhandled_token.cpp diff --git a/runtime/gmm_helper/CMakeLists.txt b/runtime/gmm_helper/CMakeLists.txt index 444876f13a..0d53701585 100644 --- a/runtime/gmm_helper/CMakeLists.txt +++ b/runtime/gmm_helper/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2018-2019 Intel Corporation +# Copyright (C) 2018-2020 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -11,11 +11,7 @@ set(RUNTIME_SRCS_GMM_HELPER_BASE ${CMAKE_CURRENT_SOURCE_DIR}/gmm_interface.cpp ${CMAKE_CURRENT_SOURCE_DIR}/gmm_types_converter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/gmm_types_converter.h - ${CMAKE_CURRENT_SOURCE_DIR}/resource_info.h - ${CMAKE_CURRENT_SOURCE_DIR}/resource_info_impl.cpp ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/gmm_utils.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/page_table_mngr.h - ${CMAKE_CURRENT_SOURCE_DIR}/page_table_mngr_impl.cpp ) set(RUNTIME_SRCS_GMM_HELPER_WINDOWS diff --git a/runtime/gmm_helper/gmm.cpp b/runtime/gmm_helper/gmm.cpp index 7eac2eb8aa..532ec235ca 100644 --- a/runtime/gmm_helper/gmm.cpp +++ b/runtime/gmm_helper/gmm.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,12 +8,12 @@ #include "runtime/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" +#include "core/gmm_helper/resource_info.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/debug_helpers.h" #include "core/helpers/hw_helper.h" #include "core/helpers/hw_info.h" #include "core/helpers/ptr_math.h" -#include "runtime/gmm_helper/resource_info.h" #include "runtime/helpers/surface_formats.h" #include "runtime/platform/platform.h" diff --git a/runtime/helpers/CMakeLists.txt b/runtime/helpers/CMakeLists.txt index ae4ed948ab..9db7f32fb0 100644 --- a/runtime/helpers/CMakeLists.txt +++ b/runtime/helpers/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2018-2019 Intel Corporation +# Copyright (C) 2018-2020 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -25,7 +25,6 @@ set(RUNTIME_SRCS_HELPERS_BASE ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_info.h ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_info_builder.h ${CMAKE_CURRENT_SOURCE_DIR}/enable_product.inl - ${CMAKE_CURRENT_SOURCE_DIR}/engine_control.h ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_properties.h ${CMAKE_CURRENT_SOURCE_DIR}/error_mappers.h ${CMAKE_CURRENT_SOURCE_DIR}/flat_batch_buffer_helper.h diff --git a/runtime/helpers/mem_properties_parser_helper.h b/runtime/helpers/mem_properties_parser_helper.h index 1f3707ba56..2473574979 100644 --- a/runtime/helpers/mem_properties_parser_helper.h +++ b/runtime/helpers/mem_properties_parser_helper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,8 @@ #pragma once #include "common/helpers/bit_helpers.h" +#include "core/memory_manager/allocation_properties.h" #include "public/cl_ext_private.h" -#include "runtime/memory_manager/allocation_properties.h" #include "memory_properties_flags.h" diff --git a/runtime/helpers/mipmap.cpp b/runtime/helpers/mipmap.cpp index 3c96437604..92593acbcd 100644 --- a/runtime/helpers/mipmap.cpp +++ b/runtime/helpers/mipmap.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,8 @@ #include "runtime/helpers/mipmap.h" +#include "core/gmm_helper/resource_info.h" #include "runtime/gmm_helper/gmm.h" -#include "runtime/gmm_helper/resource_info.h" #include "runtime/mem_obj/image.h" #include diff --git a/runtime/mem_obj/buffer_base.inl b/runtime/mem_obj/buffer_base.inl index 74ffd7aff7..1be4d770ee 100644 --- a/runtime/mem_obj/buffer_base.inl +++ b/runtime/mem_obj/buffer_base.inl @@ -1,16 +1,16 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "common/helpers/bit_helpers.h" +#include "core/gmm_helper/resource_info.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/hw_cmds.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/gmm_helper/gmm.h" -#include "runtime/gmm_helper/resource_info.h" #include "runtime/helpers/surface_formats.h" #include "runtime/mem_obj/buffer.h" diff --git a/runtime/mem_obj/image.cpp b/runtime/mem_obj/image.cpp index 478bd370b2..e6906d7216 100644 --- a/runtime/mem_obj/image.cpp +++ b/runtime/mem_obj/image.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,6 +9,7 @@ #include "common/compiler_support.h" #include "core/debug_settings/debug_settings_manager.h" +#include "core/gmm_helper/resource_info.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/basic_math.h" #include "core/helpers/hw_helper.h" @@ -20,7 +21,6 @@ #include "runtime/device/device.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_types_converter.h" -#include "runtime/gmm_helper/resource_info.h" #include "runtime/helpers/get_info.h" #include "runtime/helpers/memory_properties_flags_helpers.h" #include "runtime/helpers/mipmap.h" diff --git a/runtime/mem_obj/image.inl b/runtime/mem_obj/image.inl index a3dfa874ea..a62539fe06 100644 --- a/runtime/mem_obj/image.inl +++ b/runtime/mem_obj/image.inl @@ -1,16 +1,16 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "core/gmm_helper/gmm_helper.h" +#include "core/gmm_helper/resource_info.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/hw_cmds.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/gmm_helper/gmm.h" -#include "runtime/gmm_helper/resource_info.h" #include "runtime/helpers/surface_formats.h" #include "runtime/mem_obj/image.h" diff --git a/runtime/mem_obj/mem_obj.cpp b/runtime/mem_obj/mem_obj.cpp index 67b0d8e0b2..d5b5a1c1c4 100644 --- a/runtime/mem_obj/mem_obj.cpp +++ b/runtime/mem_obj/mem_obj.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,13 +8,13 @@ #include "runtime/mem_obj/mem_obj.h" #include "common/helpers/bit_helpers.h" +#include "core/gmm_helper/resource_info.h" #include "core/helpers/aligned_memory.h" #include "runtime/command_queue/command_queue.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/context/context.h" #include "runtime/device/device.h" #include "runtime/gmm_helper/gmm.h" -#include "runtime/gmm_helper/resource_info.h" #include "runtime/helpers/get_info.h" #include "runtime/memory_manager/deferred_deleter.h" #include "runtime/memory_manager/internal_allocation_storage.h" diff --git a/runtime/memory_manager/CMakeLists.txt b/runtime/memory_manager/CMakeLists.txt index 48b53040c8..77e5f195f3 100644 --- a/runtime/memory_manager/CMakeLists.txt +++ b/runtime/memory_manager/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2018-2019 Intel Corporation +# Copyright (C) 2018-2020 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -8,7 +8,6 @@ set(RUNTIME_SRCS_MEMORY_MANAGER ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/address_mapper.cpp ${CMAKE_CURRENT_SOURCE_DIR}/address_mapper.h - ${CMAKE_CURRENT_SOURCE_DIR}/allocation_properties.h ${CMAKE_CURRENT_SOURCE_DIR}/allocations_list.h ${CMAKE_CURRENT_SOURCE_DIR}/cpu_page_fault_manager_memory_sync.cpp ${CMAKE_CURRENT_SOURCE_DIR}/deferrable_allocation_deletion.h diff --git a/runtime/memory_manager/deferrable_allocation_deletion.cpp b/runtime/memory_manager/deferrable_allocation_deletion.cpp index c1b6bda55a..2d4898132a 100644 --- a/runtime/memory_manager/deferrable_allocation_deletion.cpp +++ b/runtime/memory_manager/deferrable_allocation_deletion.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,8 @@ #include "runtime/memory_manager/deferrable_allocation_deletion.h" +#include "core/helpers/engine_control.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/helpers/engine_control.h" #include "runtime/memory_manager/memory_manager.h" #include "runtime/os_interface/os_context.h" diff --git a/runtime/memory_manager/memory_manager.cpp b/runtime/memory_manager/memory_manager.cpp index 43753cf4ad..b0e6e77880 100644 --- a/runtime/memory_manager/memory_manager.cpp +++ b/runtime/memory_manager/memory_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,6 +9,8 @@ #include "core/execution_environment/root_device_environment.h" #include "core/gmm_helper/gmm_helper.h" +#include "core/gmm_helper/page_table_mngr.h" +#include "core/gmm_helper/resource_info.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/basic_math.h" #include "core/helpers/hw_helper.h" @@ -18,8 +20,6 @@ #include "core/utilities/stackvec.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/gmm_helper/gmm.h" -#include "runtime/gmm_helper/page_table_mngr.h" -#include "runtime/gmm_helper/resource_info.h" #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/deferrable_allocation_deletion.h" #include "runtime/memory_manager/deferred_deleter.h" diff --git a/runtime/memory_manager/memory_manager.h b/runtime/memory_manager/memory_manager.h index efa950d840..832efd8200 100644 --- a/runtime/memory_manager/memory_manager.h +++ b/runtime/memory_manager/memory_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,13 +10,13 @@ #include "core/command_stream/preemption_mode.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/common_types.h" +#include "core/helpers/engine_control.h" +#include "core/memory_manager/allocation_properties.h" #include "core/memory_manager/gfx_partition.h" #include "core/memory_manager/graphics_allocation.h" #include "core/memory_manager/host_ptr_defines.h" #include "core/memory_manager/local_memory_usage.h" #include "core/page_fault_manager/cpu_page_fault_manager.h" -#include "runtime/helpers/engine_control.h" -#include "runtime/memory_manager/allocation_properties.h" #include "engine_node.h" diff --git a/runtime/memory_manager/os_agnostic_memory_manager.cpp b/runtime/memory_manager/os_agnostic_memory_manager.cpp index 840ab49cd1..8263a815e7 100644 --- a/runtime/memory_manager/os_agnostic_memory_manager.cpp +++ b/runtime/memory_manager/os_agnostic_memory_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,6 +9,7 @@ #include "core/execution_environment/root_device_environment.h" #include "core/gmm_helper/gmm_helper.h" +#include "core/gmm_helper/resource_info.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/basic_math.h" #include "core/helpers/hw_info.h" @@ -20,7 +21,6 @@ #include "runtime/aub/aub_center.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/gmm_helper/gmm.h" -#include "runtime/gmm_helper/resource_info.h" #include "runtime/helpers/surface_formats.h" #include diff --git a/runtime/os_interface/linux/CMakeLists.txt b/runtime/os_interface/linux/CMakeLists.txt index 673b12433a..2dc48f63ed 100644 --- a/runtime/os_interface/linux/CMakeLists.txt +++ b/runtime/os_interface/linux/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2018-2019 Intel Corporation +# Copyright (C) 2018-2020 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -45,7 +45,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_LINUX ${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}/performance_counters_linux.cpp ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_linux.h ) diff --git a/runtime/os_interface/linux/drm_command_stream.inl b/runtime/os_interface/linux/drm_command_stream.inl index 0fbca65803..193b1f156e 100644 --- a/runtime/os_interface/linux/drm_command_stream.inl +++ b/runtime/os_interface/linux/drm_command_stream.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,11 +7,11 @@ #include "core/command_stream/linear_stream.h" #include "core/gmm_helper/gmm_helper.h" +#include "core/gmm_helper/page_table_mngr.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/preamble.h" #include "core/memory_manager/residency.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/gmm_helper/page_table_mngr.h" #include "runtime/helpers/flush_stamp.h" #include "runtime/mem_obj/buffer.h" #include "runtime/os_interface/linux/drm_allocation.h" diff --git a/runtime/os_interface/linux/drm_memory_manager.cpp b/runtime/os_interface/linux/drm_memory_manager.cpp index bb8b724be8..1ed038d5f6 100644 --- a/runtime/os_interface/linux/drm_memory_manager.cpp +++ b/runtime/os_interface/linux/drm_memory_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,6 +8,7 @@ #include "runtime/os_interface/linux/drm_memory_manager.h" #include "core/gmm_helper/gmm_helper.h" +#include "core/gmm_helper/resource_info.h" #include "core/helpers/hw_info.h" #include "core/helpers/options.h" #include "core/helpers/ptr_math.h" @@ -17,7 +18,6 @@ #include "runtime/device/device.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/gmm_helper/gmm.h" -#include "runtime/gmm_helper/resource_info.h" #include "runtime/helpers/surface_formats.h" #include "runtime/os_interface/linux/allocator_helper.h" #include "runtime/os_interface/linux/os_context_linux.h" diff --git a/runtime/os_interface/windows/CMakeLists.txt b/runtime/os_interface/windows/CMakeLists.txt index ecb00de0b5..8631cd8c91 100644 --- a/runtime/os_interface/windows/CMakeLists.txt +++ b/runtime/os_interface/windows/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2018-2019 Intel Corporation +# Copyright (C) 2018-2020 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -31,7 +31,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS ${CMAKE_CURRENT_SOURCE_DIR}/os_thread_win.h ${CMAKE_CURRENT_SOURCE_DIR}/os_time_win.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_time_win.h - ${CMAKE_CURRENT_SOURCE_DIR}/page_table_manager_functions.cpp ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_win.cpp ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_win.h ${CMAKE_CURRENT_SOURCE_DIR}/thk_wrapper.h diff --git a/runtime/os_interface/windows/wddm/wddm.cpp b/runtime/os_interface/windows/wddm/wddm.cpp index df829e233e..8028280ce8 100644 --- a/runtime/os_interface/windows/wddm/wddm.cpp +++ b/runtime/os_interface/windows/wddm/wddm.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,6 +10,8 @@ #include "core/command_stream/preemption.h" #include "core/execution_environment/root_device_environment.h" #include "core/gmm_helper/gmm_helper.h" +#include "core/gmm_helper/page_table_mngr.h" +#include "core/gmm_helper/resource_info.h" #include "core/helpers/interlocked_max.h" #include "core/os_interface/windows/debug_registry_reader.h" #include "core/os_interface/windows/kmdaf_listener.h" @@ -19,8 +21,6 @@ #include "core/utilities/stackvec.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/gmm_helper/gmm.h" -#include "runtime/gmm_helper/page_table_mngr.h" -#include "runtime/gmm_helper/resource_info.h" #include "runtime/memory_manager/memory_manager.h" #include "runtime/os_interface/hw_info_config.h" #include "runtime/os_interface/windows/gdi_interface.h" diff --git a/runtime/os_interface/windows/wddm_device_command_stream.inl b/runtime/os_interface/windows/wddm_device_command_stream.inl index 8490d24423..c84af9e995 100644 --- a/runtime/os_interface/windows/wddm_device_command_stream.inl +++ b/runtime/os_interface/windows/wddm_device_command_stream.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,10 +11,10 @@ #pragma warning(disable : 4005) #include "core/command_stream/linear_stream.h" #include "core/command_stream/preemption.h" +#include "core/gmm_helper/page_table_mngr.h" #include "core/helpers/hw_cmds.h" #include "core/helpers/ptr_math.h" #include "runtime/device/device.h" -#include "runtime/gmm_helper/page_table_mngr.h" #include "runtime/helpers/flush_stamp.h" #include "runtime/helpers/windows/gmm_callbacks.h" #include "runtime/mem_obj/mem_obj.h" diff --git a/runtime/os_interface/windows/wddm_memory_manager.cpp b/runtime/os_interface/windows/wddm_memory_manager.cpp index f365cdac03..ed630ce40e 100644 --- a/runtime/os_interface/windows/wddm_memory_manager.cpp +++ b/runtime/os_interface/windows/wddm_memory_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,6 +9,8 @@ #include "core/execution_environment/root_device_environment.h" #include "core/gmm_helper/gmm_helper.h" +#include "core/gmm_helper/page_table_mngr.h" +#include "core/gmm_helper/resource_info.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/deferred_deleter_helper.h" #include "core/helpers/ptr_math.h" @@ -17,8 +19,6 @@ #include "runtime/command_stream/command_stream_receiver_hw.h" #include "runtime/device/device.h" #include "runtime/gmm_helper/gmm.h" -#include "runtime/gmm_helper/page_table_mngr.h" -#include "runtime/gmm_helper/resource_info.h" #include "runtime/helpers/surface_formats.h" #include "runtime/memory_manager/deferrable_deletion.h" #include "runtime/memory_manager/deferred_deleter.h" diff --git a/runtime/sharings/d3d/d3d_texture.cpp b/runtime/sharings/d3d/d3d_texture.cpp index c012b7f335..dff432ac5d 100644 --- a/runtime/sharings/d3d/d3d_texture.cpp +++ b/runtime/sharings/d3d/d3d_texture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,12 +7,12 @@ #include "runtime/sharings/d3d/d3d_texture.h" +#include "core/gmm_helper/resource_info.h" #include "core/helpers/hw_helper.h" #include "runtime/context/context.h" #include "runtime/device/device.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_types_converter.h" -#include "runtime/gmm_helper/resource_info.h" #include "runtime/helpers/get_info.h" #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/memory_manager.h" diff --git a/runtime/sharings/gl/gl_texture.cpp b/runtime/sharings/gl/gl_texture.cpp index 89e8d6acd2..c81567ea26 100644 --- a/runtime/sharings/gl/gl_texture.cpp +++ b/runtime/sharings/gl/gl_texture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,6 +8,7 @@ #include "runtime/sharings/gl/gl_texture.h" #include "core/gmm_helper/gmm_helper.h" +#include "core/gmm_helper/resource_info.h" #include "core/helpers/hw_helper.h" #include "core/helpers/hw_info.h" #include "public/cl_gl_private_intel.h" @@ -15,7 +16,6 @@ #include "runtime/device/device.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_types_converter.h" -#include "runtime/gmm_helper/resource_info.h" #include "runtime/helpers/get_info.h" #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/memory_manager.h" diff --git a/runtime/sharings/unified/unified_image.cpp b/runtime/sharings/unified/unified_image.cpp index d3c5e81710..aa195a8637 100644 --- a/runtime/sharings/unified/unified_image.cpp +++ b/runtime/sharings/unified/unified_image.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,12 +7,12 @@ #include "unified_image.h" +#include "core/gmm_helper/resource_info.h" #include "core/helpers/hw_helper.h" #include "core/memory_manager/graphics_allocation.h" #include "runtime/context/context.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/gmm_helper/gmm.h" -#include "runtime/gmm_helper/resource_info.h" #include "runtime/helpers/get_info.h" #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/memory_manager.h" diff --git a/unit_tests/aub_tests/CMakeLists.txt b/unit_tests/aub_tests/CMakeLists.txt index 61141fbacc..147a676b1a 100644 --- a/unit_tests/aub_tests/CMakeLists.txt +++ b/unit_tests/aub_tests/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2017-2019 Intel Corporation +# Copyright (C) 2017-2020 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -48,7 +48,7 @@ target_include_directories(igdrcl_aub_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) target_sources(igdrcl_aub_tests PRIVATE ${NEO_SOURCE_DIR}/core/unit_tests/page_fault_manager/default_asan_options.cpp - ${NEO_SOURCE_DIR}/runtime/gmm_helper/resource_info.cpp + ${NEO_SOURCE_DIR}/core/gmm_helper/resource_info.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h ) diff --git a/unit_tests/command_stream/command_stream_receiver_tests.cpp b/unit_tests/command_stream/command_stream_receiver_tests.cpp index baa3ab239b..f83d7e66b0 100644 --- a/unit_tests/command_stream/command_stream_receiver_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,13 +7,13 @@ #include "core/command_stream/linear_stream.h" #include "core/command_stream/preemption.h" +#include "core/gmm_helper/page_table_mngr.h" #include "core/helpers/cache_policy.h" #include "core/helpers/hw_helper.h" #include "core/memory_manager/graphics_allocation.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/command_stream/scratch_space_controller.h" -#include "runtime/gmm_helper/page_table_mngr.h" #include "runtime/helpers/timestamp_packet.h" #include "runtime/mem_obj/buffer.h" #include "runtime/memory_manager/internal_allocation_storage.h" diff --git a/unit_tests/helpers/hw_helper_tests.cpp b/unit_tests/helpers/hw_helper_tests.cpp index a5c34ae627..1c4b15343e 100644 --- a/unit_tests/helpers/hw_helper_tests.cpp +++ b/unit_tests/helpers/hw_helper_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,13 +8,13 @@ #include "unit_tests/helpers/hw_helper_tests.h" #include "core/gmm_helper/gmm_helper.h" +#include "core/gmm_helper/resource_info.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/options.h" #include "core/helpers/string.h" #include "core/memory_manager/graphics_allocation.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/gmm_helper/gmm.h" -#include "runtime/gmm_helper/resource_info.h" #include "runtime/helpers/dispatch_info.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/mem_obj/image.h" diff --git a/unit_tests/main.cpp b/unit_tests/main.cpp index 23b4607437..d036178c68 100644 --- a/unit_tests/main.cpp +++ b/unit_tests/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,10 +7,10 @@ #include "core/debug_settings/debug_settings_manager.h" #include "core/gmm_helper/gmm_helper.h" +#include "core/gmm_helper/resource_info.h" #include "core/helpers/options.h" #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/os_interface/hw_info_config.h" #include "runtime/os_interface/ocl_reg_path.h" #include "unit_tests/custom_event_listener.h" diff --git a/unit_tests/mem_obj/buffer_tests.cpp b/unit_tests/mem_obj/buffer_tests.cpp index 03babf672c..104cf81c18 100644 --- a/unit_tests/mem_obj/buffer_tests.cpp +++ b/unit_tests/mem_obj/buffer_tests.cpp @@ -1,11 +1,12 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "core/gmm_helper/gmm_helper.h" +#include "core/gmm_helper/resource_info.h" #include "core/helpers/hw_helper.h" #include "core/helpers/options.h" #include "core/memory_manager/unified_memory_manager.h" @@ -16,7 +17,6 @@ #include "runtime/command_queue/gpgpu_walker.h" #include "runtime/event/user_event.h" #include "runtime/gmm_helper/gmm.h" -#include "runtime/gmm_helper/resource_info.h" #include "runtime/helpers/array_count.h" #include "runtime/helpers/memory_properties_flags_helpers.h" #include "runtime/mem_obj/buffer.h" diff --git a/unit_tests/memory_manager/memory_manager_tests.cpp b/unit_tests/memory_manager/memory_manager_tests.cpp index e93f5a9e80..7ea0edb0e1 100644 --- a/unit_tests/memory_manager/memory_manager_tests.cpp +++ b/unit_tests/memory_manager/memory_manager_tests.cpp @@ -1,18 +1,18 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "core/command_stream/preemption.h" +#include "core/gmm_helper/page_table_mngr.h" #include "core/helpers/cache_policy.h" #include "core/memory_manager/graphics_allocation.h" #include "core/memory_manager/memory_constants.h" #include "core/memory_manager/residency.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/event/event.h" -#include "runtime/gmm_helper/page_table_mngr.h" #include "runtime/helpers/dispatch_info.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/mem_obj/image.h" diff --git a/unit_tests/mocks/CMakeLists.txt b/unit_tests/mocks/CMakeLists.txt index 5c69a81624..fbab443390 100644 --- a/unit_tests/mocks/CMakeLists.txt +++ b/unit_tests/mocks/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2018-2019 Intel Corporation +# Copyright (C) 2018-2020 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -74,7 +74,7 @@ set(IGDRCL_SRCS_tests_mocks ${CMAKE_CURRENT_SOURCE_DIR}/mock_tbx_csr.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_tbx_stream.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_timestamp_container.h - ${NEO_SOURCE_DIR}/runtime/gmm_helper/page_table_mngr_impl.cpp + ${NEO_SOURCE_DIR}/core/gmm_helper/page_table_mngr_impl.cpp ) if(WIN32) @@ -98,7 +98,7 @@ else() ${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_drm_allocation.h ${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_drm_memory_manager.h ${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_drm_command_stream_receiver.h - ${NEO_SOURCE_DIR}/runtime/os_interface/linux/page_table_manager_functions.cpp + ${NEO_SOURCE_DIR}/core/os_interface/linux/page_table_manager_functions.cpp ) endif() diff --git a/unit_tests/mocks/mock_gmm_page_table_mngr.h b/unit_tests/mocks/mock_gmm_page_table_mngr.h index 899d4e3c0f..8f7dfcba7d 100644 --- a/unit_tests/mocks/mock_gmm_page_table_mngr.h +++ b/unit_tests/mocks/mock_gmm_page_table_mngr.h @@ -7,7 +7,7 @@ #pragma once -#include "runtime/gmm_helper/page_table_mngr.h" +#include "core/gmm_helper/page_table_mngr.h" #include "gmock/gmock.h" diff --git a/unit_tests/mocks/mock_gmm_resource_info.h b/unit_tests/mocks/mock_gmm_resource_info.h index 0bc1781392..8e57b47446 100644 --- a/unit_tests/mocks/mock_gmm_resource_info.h +++ b/unit_tests/mocks/mock_gmm_resource_info.h @@ -1,12 +1,12 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #pragma once -#include "runtime/gmm_helper/resource_info.h" +#include "core/gmm_helper/resource_info.h" #include "runtime/helpers/surface_formats.h" #include "gmock/gmock.h" diff --git a/unit_tests/os_interface/linux/drm_command_stream_tests.cpp b/unit_tests/os_interface/linux/drm_command_stream_tests.cpp index 1da40ec6f0..eca6619dd5 100644 --- a/unit_tests/os_interface/linux/drm_command_stream_tests.cpp +++ b/unit_tests/os_interface/linux/drm_command_stream_tests.cpp @@ -7,11 +7,11 @@ #include "core/command_stream/preemption.h" #include "core/gmm_helper/gmm_helper.h" +#include "core/gmm_helper/page_table_mngr.h" +#include "core/gmm_helper/resource_info.h" #include "core/memory_manager/graphics_allocation.h" #include "core/memory_manager/residency.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/gmm_helper/page_table_mngr.h" -#include "runtime/gmm_helper/resource_info.h" #include "runtime/helpers/flush_stamp.h" #include "runtime/helpers/memory_properties_flags_helpers.h" #include "runtime/mem_obj/buffer.h" diff --git a/unit_tests/sharings/gl/gl_reused_buffers_tests.cpp b/unit_tests/sharings/gl/gl_reused_buffers_tests.cpp index 99d16bd41f..61c39f9907 100644 --- a/unit_tests/sharings/gl/gl_reused_buffers_tests.cpp +++ b/unit_tests/sharings/gl/gl_reused_buffers_tests.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "core/gmm_helper/resource_info.h" #include "runtime/gmm_helper/gmm.h" -#include "runtime/gmm_helper/resource_info.h" #include "runtime/mem_obj/buffer.h" #include "runtime/sharings/gl/gl_buffer.h" #include "test.h"