From fd4ae3b36948f7918a5697b14c774b863b73b9e1 Mon Sep 17 00:00:00 2001 From: Mateusz Hoppe Date: Thu, 9 Jan 2020 16:10:48 +0100 Subject: [PATCH] Move gmm to core Change-Id: I787dfcb3ca3926ce10e2e3c748594713df5fc467 Signed-off-by: Mateusz Hoppe --- core/gmm_helper/CMakeLists.txt | 2 ++ {runtime => core}/gmm_helper/gmm.cpp | 2 +- {runtime => core}/gmm_helper/gmm.h | 0 core/gmm_helper/page_table_mngr_impl.cpp | 2 +- core/helpers/hw_helper_base.inl | 4 ++-- runtime/aub_mem_dump/aub_alloc_dump.inl | 4 ++-- .../command_stream_receiver_simulated_common_hw_base.inl | 2 +- runtime/gmm_helper/CMakeLists.txt | 2 -- runtime/gmm_helper/gmm_utils.cpp | 4 ++-- runtime/helpers/mipmap.cpp | 2 +- runtime/mem_obj/buffer.cpp | 4 ++-- runtime/mem_obj/buffer_base.inl | 2 +- runtime/mem_obj/image.cpp | 2 +- runtime/mem_obj/image.inl | 2 +- runtime/mem_obj/mem_obj.cpp | 2 +- runtime/memory_manager/memory_manager.cpp | 2 +- runtime/memory_manager/os_agnostic_memory_manager.cpp | 2 +- runtime/os_interface/linux/drm_memory_manager.cpp | 2 +- runtime/os_interface/windows/wddm/wddm.cpp | 2 +- runtime/os_interface/windows/wddm_memory_manager.cpp | 2 +- runtime/sharings/d3d/d3d_sharing.cpp | 2 +- runtime/sharings/d3d/d3d_surface.cpp | 2 +- runtime/sharings/d3d/d3d_texture.cpp | 2 +- runtime/sharings/gl/gl_buffer.cpp | 6 ++++-- runtime/sharings/gl/gl_texture.cpp | 2 +- runtime/sharings/unified/unified_buffer.cpp | 2 +- runtime/sharings/unified/unified_image.cpp | 2 +- runtime/sharings/va/va_surface.cpp | 2 +- unit_tests/aub_mem_dump/aub_alloc_dump_tests.cpp | 4 ++-- unit_tests/built_ins/built_in_tests.cpp | 4 ++-- unit_tests/command_queue/read_write_buffer_cpu_copy.cpp | 4 ++-- unit_tests/gmm_helper/gmm_helper_tests.cpp | 2 +- unit_tests/helpers/hw_helper_tests.cpp | 2 +- unit_tests/mem_obj/buffer_set_arg_tests.cpp | 4 ++-- unit_tests/mem_obj/buffer_tests.cpp | 2 +- unit_tests/mem_obj/image_set_arg_tests.cpp | 2 +- unit_tests/mem_obj/mem_obj_tests.cpp | 4 ++-- unit_tests/mem_obj/nv12_image_tests.cpp | 4 ++-- unit_tests/mocks/mock_gmm.h | 2 +- unit_tests/mocks/mock_memory_manager.cpp | 2 +- unit_tests/os_interface/windows/file_logger_win_tests.cpp | 4 ++-- unit_tests/os_interface/windows/wddm20_tests.cpp | 2 +- .../os_interface/windows/wddm_kmdaf_listener_tests.cpp | 2 +- .../os_interface/windows/wddm_memory_manager_tests.cpp | 4 ++-- unit_tests/sharings/gl/gl_reused_buffers_tests.cpp | 2 +- unit_tests/sharings/gl/gl_sharing_tests.cpp | 4 ++-- unit_tests/sharings/unified/unified_sharing_image_tests.cpp | 2 +- unit_tests/sharings/va/va_sharing_tests.cpp | 2 +- 48 files changed, 63 insertions(+), 61 deletions(-) rename {runtime => core}/gmm_helper/gmm.cpp (99%) rename {runtime => core}/gmm_helper/gmm.h (100%) diff --git a/core/gmm_helper/CMakeLists.txt b/core/gmm_helper/CMakeLists.txt index 3f72f04e47..c1d5f70535 100644 --- a/core/gmm_helper/CMakeLists.txt +++ b/core/gmm_helper/CMakeLists.txt @@ -10,6 +10,8 @@ set(NEO_CORE_GMM_HELPER ${CMAKE_CURRENT_SOURCE_DIR}/client_context/gmm_client_context_base.h ${CMAKE_CURRENT_SOURCE_DIR}/client_context${BRANCH_DIR_SUFFIX}/gmm_client_context.cpp ${CMAKE_CURRENT_SOURCE_DIR}/client_context${BRANCH_DIR_SUFFIX}/gmm_client_context.h + ${CMAKE_CURRENT_SOURCE_DIR}/gmm.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/gmm.h ${CMAKE_CURRENT_SOURCE_DIR}/gmm_helper.cpp ${CMAKE_CURRENT_SOURCE_DIR}/gmm_helper.h ${CMAKE_CURRENT_SOURCE_DIR}/gmm_lib.h diff --git a/runtime/gmm_helper/gmm.cpp b/core/gmm_helper/gmm.cpp similarity index 99% rename from runtime/gmm_helper/gmm.cpp rename to core/gmm_helper/gmm.cpp index 897e732cae..ff48b8410d 100644 --- a/runtime/gmm_helper/gmm.cpp +++ b/core/gmm_helper/gmm.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gmm_helper/gmm.h" +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/client_context/gmm_client_context.h" #include "core/gmm_helper/gmm_helper.h" diff --git a/runtime/gmm_helper/gmm.h b/core/gmm_helper/gmm.h similarity index 100% rename from runtime/gmm_helper/gmm.h rename to core/gmm_helper/gmm.h diff --git a/core/gmm_helper/page_table_mngr_impl.cpp b/core/gmm_helper/page_table_mngr_impl.cpp index 9cc9540047..1067dd9b1b 100644 --- a/core/gmm_helper/page_table_mngr_impl.cpp +++ b/core/gmm_helper/page_table_mngr_impl.cpp @@ -5,10 +5,10 @@ * */ +#include "core/gmm_helper/gmm.h" #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 "gmm_client_context.h" diff --git a/core/helpers/hw_helper_base.inl b/core/helpers/hw_helper_base.inl index a9d6b9b82a..9800759ecb 100644 --- a/core/helpers/hw_helper_base.inl +++ b/core/helpers/hw_helper_base.inl @@ -1,10 +1,11 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/hw_helper.h" @@ -14,7 +15,6 @@ #include "core/memory_manager/memory_constants.h" #include "runtime/aub_mem_dump/aub_mem_dump.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/helpers/dispatch_info.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/os_interface/os_interface.h" diff --git a/runtime/aub_mem_dump/aub_alloc_dump.inl b/runtime/aub_mem_dump/aub_alloc_dump.inl index 14e77cddb0..c130d57793 100644 --- a/runtime/aub_mem_dump/aub_alloc_dump.inl +++ b/runtime/aub_mem_dump/aub_alloc_dump.inl @@ -1,13 +1,13 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" #include "runtime/aub_mem_dump/aub_alloc_dump.h" -#include "runtime/gmm_helper/gmm.h" #include "third_party/aub_stream/headers/aubstream.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 c420985bd2..f042eb81bc 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 @@ -6,12 +6,12 @@ */ #include "core/debug_settings/debug_settings_manager.h" +#include "core/gmm_helper/gmm.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/helpers/hardware_context_controller.h" #include "runtime/memory_manager/address_mapper.h" #include "runtime/memory_manager/memory_manager.h" diff --git a/runtime/gmm_helper/CMakeLists.txt b/runtime/gmm_helper/CMakeLists.txt index 0d53701585..68043eb972 100644 --- a/runtime/gmm_helper/CMakeLists.txt +++ b/runtime/gmm_helper/CMakeLists.txt @@ -6,8 +6,6 @@ set(RUNTIME_SRCS_GMM_HELPER_BASE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/gmm.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/gmm.h ${CMAKE_CURRENT_SOURCE_DIR}/gmm_interface.cpp ${CMAKE_CURRENT_SOURCE_DIR}/gmm_types_converter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/gmm_types_converter.h diff --git a/runtime/gmm_helper/gmm_utils.cpp b/runtime/gmm_helper/gmm_utils.cpp index 0a263199cb..6f70fa133a 100644 --- a/runtime/gmm_helper/gmm_utils.cpp +++ b/runtime/gmm_helper/gmm_utils.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ # -#include "runtime/gmm_helper/gmm.h" +#include "core/gmm_helper/gmm.h" #include "runtime/helpers/surface_formats.h" using namespace NEO; diff --git a/runtime/helpers/mipmap.cpp b/runtime/helpers/mipmap.cpp index cf79434c9a..752607c76e 100644 --- a/runtime/helpers/mipmap.cpp +++ b/runtime/helpers/mipmap.cpp @@ -7,8 +7,8 @@ #include "runtime/helpers/mipmap.h" +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/resource_info.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/mem_obj/image.h" #include diff --git a/runtime/mem_obj/buffer.cpp b/runtime/mem_obj/buffer.cpp index 0f7760989f..d74d3bca57 100644 --- a/runtime/mem_obj/buffer.cpp +++ b/runtime/mem_obj/buffer.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/mem_obj/buffer.h" #include "core/debug_settings/debug_settings_manager.h" +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/hw_helper.h" @@ -20,7 +21,6 @@ #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/helpers/memory_properties_flags_helpers.h" #include "runtime/helpers/timestamp_packet.h" #include "runtime/helpers/validators.h" diff --git a/runtime/mem_obj/buffer_base.inl b/runtime/mem_obj/buffer_base.inl index 1be4d770ee..a40f413b80 100644 --- a/runtime/mem_obj/buffer_base.inl +++ b/runtime/mem_obj/buffer_base.inl @@ -6,11 +6,11 @@ */ #include "common/helpers/bit_helpers.h" +#include "core/gmm_helper/gmm.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/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 acc2fabbc0..938bd7be52 100644 --- a/runtime/mem_obj/image.cpp +++ b/runtime/mem_obj/image.cpp @@ -9,6 +9,7 @@ #include "common/compiler_support.h" #include "core/debug_settings/debug_settings_manager.h" +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/resource_info.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/basic_math.h" @@ -19,7 +20,6 @@ #include "runtime/command_queue/command_queue.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/helpers/get_info.h" #include "runtime/helpers/memory_properties_flags_helpers.h" diff --git a/runtime/mem_obj/image.inl b/runtime/mem_obj/image.inl index 911775c504..9749fb5cfa 100644 --- a/runtime/mem_obj/image.inl +++ b/runtime/mem_obj/image.inl @@ -5,12 +5,12 @@ * */ +#include "core/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/hw_cmds.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/gmm_helper/gmm.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 48ebb29a72..a8ad72b5a6 100644 --- a/runtime/mem_obj/mem_obj.cpp +++ b/runtime/mem_obj/mem_obj.cpp @@ -8,6 +8,7 @@ #include "runtime/mem_obj/mem_obj.h" #include "common/helpers/bit_helpers.h" +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/resource_info.h" #include "core/helpers/aligned_memory.h" #include "core/memory_manager/deferred_deleter.h" @@ -15,7 +16,6 @@ #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/helpers/get_info.h" #include "runtime/memory_manager/internal_allocation_storage.h" #include "runtime/memory_manager/memory_manager.h" diff --git a/runtime/memory_manager/memory_manager.cpp b/runtime/memory_manager/memory_manager.cpp index 7cf497b23e..a4a1f03ef1 100644 --- a/runtime/memory_manager/memory_manager.cpp +++ b/runtime/memory_manager/memory_manager.cpp @@ -8,6 +8,7 @@ #include "runtime/memory_manager/memory_manager.h" #include "core/execution_environment/root_device_environment.h" +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" #include "core/gmm_helper/page_table_mngr.h" #include "core/gmm_helper/resource_info.h" @@ -21,7 +22,6 @@ #include "core/memory_manager/host_ptr_manager.h" #include "core/utilities/stackvec.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/internal_allocation_storage.h" #include "runtime/os_interface/os_context.h" diff --git a/runtime/memory_manager/os_agnostic_memory_manager.cpp b/runtime/memory_manager/os_agnostic_memory_manager.cpp index 91c8616159..6b6ed48023 100644 --- a/runtime/memory_manager/os_agnostic_memory_manager.cpp +++ b/runtime/memory_manager/os_agnostic_memory_manager.cpp @@ -8,6 +8,7 @@ #include "runtime/memory_manager/os_agnostic_memory_manager.h" #include "core/execution_environment/root_device_environment.h" +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" #include "core/gmm_helper/resource_info.h" #include "core/helpers/aligned_memory.h" @@ -20,7 +21,6 @@ #include "core/os_interface/os_memory.h" #include "runtime/aub/aub_center.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/helpers/surface_formats.h" #include diff --git a/runtime/os_interface/linux/drm_memory_manager.cpp b/runtime/os_interface/linux/drm_memory_manager.cpp index fc34a0e3e1..cc9b2f8bda 100644 --- a/runtime/os_interface/linux/drm_memory_manager.cpp +++ b/runtime/os_interface/linux/drm_memory_manager.cpp @@ -7,6 +7,7 @@ #include "runtime/os_interface/linux/drm_memory_manager.h" +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" #include "core/gmm_helper/resource_info.h" #include "core/helpers/hw_info.h" @@ -17,7 +18,6 @@ #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/device/device.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/gmm_helper/gmm.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/wddm/wddm.cpp b/runtime/os_interface/windows/wddm/wddm.cpp index 6ab184e201..a305107b63 100644 --- a/runtime/os_interface/windows/wddm/wddm.cpp +++ b/runtime/os_interface/windows/wddm/wddm.cpp @@ -9,6 +9,7 @@ #include "core/command_stream/preemption.h" #include "core/execution_environment/root_device_environment.h" +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" #include "core/gmm_helper/page_table_mngr.h" #include "core/gmm_helper/resource_info.h" @@ -21,7 +22,6 @@ #include "core/sku_info/operations/windows/sku_info_receiver.h" #include "core/utilities/stackvec.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/helpers/windows/gmm_callbacks.h" #include "runtime/memory_manager/memory_manager.h" #include "runtime/os_interface/hw_info_config.h" diff --git a/runtime/os_interface/windows/wddm_memory_manager.cpp b/runtime/os_interface/windows/wddm_memory_manager.cpp index c38347f538..06c13a2079 100644 --- a/runtime/os_interface/windows/wddm_memory_manager.cpp +++ b/runtime/os_interface/windows/wddm_memory_manager.cpp @@ -8,6 +8,7 @@ #include "runtime/os_interface/windows/wddm_memory_manager.h" #include "core/execution_environment/root_device_environment.h" +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" #include "core/gmm_helper/page_table_mngr.h" #include "core/gmm_helper/resource_info.h" @@ -20,7 +21,6 @@ #include "core/memory_manager/memory_operations_handler.h" #include "runtime/command_stream/command_stream_receiver_hw.h" #include "runtime/device/device.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/helpers/surface_formats.h" #include "runtime/os_interface/os_interface.h" #include "runtime/os_interface/windows/os_context_win.h" diff --git a/runtime/sharings/d3d/d3d_sharing.cpp b/runtime/sharings/d3d/d3d_sharing.cpp index 0e2fb0db3e..08b81c14f2 100644 --- a/runtime/sharings/d3d/d3d_sharing.cpp +++ b/runtime/sharings/d3d/d3d_sharing.cpp @@ -7,8 +7,8 @@ #include "runtime/sharings/d3d/d3d_sharing.h" +#include "core/gmm_helper/gmm.h" #include "runtime/context/context.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/mem_obj/image.h" using namespace NEO; diff --git a/runtime/sharings/d3d/d3d_surface.cpp b/runtime/sharings/d3d/d3d_surface.cpp index 9c800b1596..f462fb4302 100644 --- a/runtime/sharings/d3d/d3d_surface.cpp +++ b/runtime/sharings/d3d/d3d_surface.cpp @@ -7,9 +7,9 @@ #include "runtime/sharings/d3d/d3d_surface.h" +#include "core/gmm_helper/gmm.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/helpers/get_info.h" #include "runtime/helpers/memory_properties_flags_helpers.h" diff --git a/runtime/sharings/d3d/d3d_texture.cpp b/runtime/sharings/d3d/d3d_texture.cpp index 2a14dce42f..f2db851c92 100644 --- a/runtime/sharings/d3d/d3d_texture.cpp +++ b/runtime/sharings/d3d/d3d_texture.cpp @@ -7,11 +7,11 @@ #include "runtime/sharings/d3d/d3d_texture.h" +#include "core/gmm_helper/gmm.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/helpers/get_info.h" #include "runtime/mem_obj/image.h" diff --git a/runtime/sharings/gl/gl_buffer.cpp b/runtime/sharings/gl/gl_buffer.cpp index 85a31b5e26..4b501fd939 100644 --- a/runtime/sharings/gl/gl_buffer.cpp +++ b/runtime/sharings/gl/gl_buffer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,10 +7,12 @@ #include "gl_buffer.h" +// clang-format off #include "public/cl_gl_private_intel.h" +// clang-format on +#include "core/gmm_helper/gmm.h" #include "runtime/context/context.h" #include "runtime/device/device.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/helpers/get_info.h" #include "runtime/mem_obj/buffer.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 759fcc94fa..f164f2f850 100644 --- a/runtime/sharings/gl/gl_texture.cpp +++ b/runtime/sharings/gl/gl_texture.cpp @@ -7,6 +7,7 @@ #include "runtime/sharings/gl/gl_texture.h" +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" #include "core/gmm_helper/resource_info.h" #include "core/helpers/hw_helper.h" @@ -14,7 +15,6 @@ #include "public/cl_gl_private_intel.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/helpers/get_info.h" #include "runtime/mem_obj/image.h" diff --git a/runtime/sharings/unified/unified_buffer.cpp b/runtime/sharings/unified/unified_buffer.cpp index 61a37735fe..7e1a7401c9 100644 --- a/runtime/sharings/unified/unified_buffer.cpp +++ b/runtime/sharings/unified/unified_buffer.cpp @@ -7,8 +7,8 @@ #include "unified_buffer.h" +#include "core/gmm_helper/gmm.h" #include "runtime/context/context.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/helpers/get_info.h" #include "runtime/mem_obj/buffer.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 3702294670..450d815c2d 100644 --- a/runtime/sharings/unified/unified_image.cpp +++ b/runtime/sharings/unified/unified_image.cpp @@ -7,12 +7,12 @@ #include "unified_image.h" +#include "core/gmm_helper/gmm.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/helpers/get_info.h" #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/memory_manager.h" diff --git a/runtime/sharings/va/va_surface.cpp b/runtime/sharings/va/va_surface.cpp index e7e9421230..db6dfda888 100644 --- a/runtime/sharings/va/va_surface.cpp +++ b/runtime/sharings/va/va_surface.cpp @@ -7,9 +7,9 @@ #include "runtime/sharings/va/va_surface.h" +#include "core/gmm_helper/gmm.h" #include "runtime/context/context.h" #include "runtime/device/device.h" -#include "runtime/gmm_helper/gmm.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_mem_dump/aub_alloc_dump_tests.cpp b/unit_tests/aub_mem_dump/aub_alloc_dump_tests.cpp index 65da1b976f..b781a11e99 100644 --- a/unit_tests/aub_mem_dump/aub_alloc_dump_tests.cpp +++ b/unit_tests/aub_mem_dump/aub_alloc_dump_tests.cpp @@ -1,14 +1,14 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/aub_mem_dump/aub_alloc_dump.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/mem_obj/buffer.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" diff --git a/unit_tests/built_ins/built_in_tests.cpp b/unit_tests/built_ins/built_in_tests.cpp index a3c289f633..2c8349d8a0 100644 --- a/unit_tests/built_ins/built_in_tests.cpp +++ b/unit_tests/built_ins/built_in_tests.cpp @@ -1,11 +1,12 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "core/debug_settings/debug_settings_manager.h" +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" #include "core/helpers/file_io.h" #include "core/helpers/hash.h" @@ -16,7 +17,6 @@ #include "runtime/built_ins/built_ins.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/built_ins/vme_dispatch_builder.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/helpers/dispatch_info_builder.h" #include "runtime/kernel/kernel.h" #include "test.h" diff --git a/unit_tests/command_queue/read_write_buffer_cpu_copy.cpp b/unit_tests/command_queue/read_write_buffer_cpu_copy.cpp index 3c0d0701f1..d67d7cf94d 100644 --- a/unit_tests/command_queue/read_write_buffer_cpu_copy.cpp +++ b/unit_tests/command_queue/read_write_buffer_cpu_copy.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "core/gmm_helper/gmm.h" #include "core/helpers/basic_math.h" -#include "runtime/gmm_helper/gmm.h" #include "test.h" #include "unit_tests/command_queue/enqueue_read_buffer_fixture.h" diff --git a/unit_tests/gmm_helper/gmm_helper_tests.cpp b/unit_tests/gmm_helper/gmm_helper_tests.cpp index 71a2cb2053..134c1d81e0 100644 --- a/unit_tests/gmm_helper/gmm_helper_tests.cpp +++ b/unit_tests/gmm_helper/gmm_helper_tests.cpp @@ -5,12 +5,12 @@ * */ +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" #include "core/helpers/hw_info.h" #include "core/helpers/options.h" #include "core/helpers/ptr_math.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_types_converter.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" #include "runtime/platform/platform.h" diff --git a/unit_tests/helpers/hw_helper_tests.cpp b/unit_tests/helpers/hw_helper_tests.cpp index 1c4b15343e..969668c87d 100644 --- a/unit_tests/helpers/hw_helper_tests.cpp +++ b/unit_tests/helpers/hw_helper_tests.cpp @@ -7,6 +7,7 @@ #include "unit_tests/helpers/hw_helper_tests.h" +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" #include "core/gmm_helper/resource_info.h" #include "core/helpers/aligned_memory.h" @@ -14,7 +15,6 @@ #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/helpers/dispatch_info.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/mem_obj/image.h" diff --git a/unit_tests/mem_obj/buffer_set_arg_tests.cpp b/unit_tests/mem_obj/buffer_set_arg_tests.cpp index ff83c0528e..3eef13da3c 100644 --- a/unit_tests/mem_obj/buffer_set_arg_tests.cpp +++ b/unit_tests/mem_obj/buffer_set_arg_tests.cpp @@ -1,15 +1,15 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" #include "core/helpers/ptr_math.h" #include "core/memory_manager/unified_memory_manager.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/kernel/kernel.h" #include "runtime/memory_manager/surface.h" #include "test.h" diff --git a/unit_tests/mem_obj/buffer_tests.cpp b/unit_tests/mem_obj/buffer_tests.cpp index 104cf81c18..46a3fb8515 100644 --- a/unit_tests/mem_obj/buffer_tests.cpp +++ b/unit_tests/mem_obj/buffer_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" #include "core/gmm_helper/resource_info.h" #include "core/helpers/hw_helper.h" @@ -16,7 +17,6 @@ #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_queue/gpgpu_walker.h" #include "runtime/event/user_event.h" -#include "runtime/gmm_helper/gmm.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/mem_obj/image_set_arg_tests.cpp b/unit_tests/mem_obj/image_set_arg_tests.cpp index bb022fa6d5..31b3385a3b 100644 --- a/unit_tests/mem_obj/image_set_arg_tests.cpp +++ b/unit_tests/mem_obj/image_set_arg_tests.cpp @@ -5,12 +5,12 @@ * */ +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/basic_math.h" #include "core/helpers/ptr_math.h" #include "core/memory_manager/graphics_allocation.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/helpers/surface_formats.h" #include "runtime/kernel/kernel.h" #include "runtime/mem_obj/image.h" diff --git a/unit_tests/mem_obj/mem_obj_tests.cpp b/unit_tests/mem_obj/mem_obj_tests.cpp index 1d38287300..d0ad357c53 100644 --- a/unit_tests/mem_obj/mem_obj_tests.cpp +++ b/unit_tests/mem_obj/mem_obj_tests.cpp @@ -1,13 +1,13 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "core/gmm_helper/gmm.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/device/device.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/helpers/memory_properties_flags_helpers.h" #include "runtime/helpers/properties_helper.h" #include "runtime/mem_obj/mem_obj.h" diff --git a/unit_tests/mem_obj/nv12_image_tests.cpp b/unit_tests/mem_obj/nv12_image_tests.cpp index 30441bfbc6..186cd12adb 100644 --- a/unit_tests/mem_obj/nv12_image_tests.cpp +++ b/unit_tests/mem_obj/nv12_image_tests.cpp @@ -1,13 +1,13 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "core/gmm_helper/gmm.h" #include "core/helpers/aligned_memory.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/helpers/memory_properties_flags_helpers.h" #include "runtime/helpers/surface_formats.h" #include "runtime/mem_obj/image.h" diff --git a/unit_tests/mocks/mock_gmm.h b/unit_tests/mocks/mock_gmm.h index 69615c8d11..d593a19de7 100644 --- a/unit_tests/mocks/mock_gmm.h +++ b/unit_tests/mocks/mock_gmm.h @@ -6,8 +6,8 @@ */ #pragma once +#include "core/gmm_helper/gmm.h" #include "core/helpers/options.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/helpers/surface_formats.h" #include "runtime/mem_obj/image.h" #include "unit_tests/mocks/mock_device.h" diff --git a/unit_tests/mocks/mock_memory_manager.cpp b/unit_tests/mocks/mock_memory_manager.cpp index 2c781fa0df..2d2b0c28c4 100644 --- a/unit_tests/mocks/mock_memory_manager.cpp +++ b/unit_tests/mocks/mock_memory_manager.cpp @@ -7,9 +7,9 @@ #include "unit_tests/mocks/mock_memory_manager.h" +#include "core/gmm_helper/gmm.h" #include "core/memory_manager/deferred_deleter.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/helpers/surface_formats.h" #include "unit_tests/mocks/mock_allocation_properties.h" diff --git a/unit_tests/os_interface/windows/file_logger_win_tests.cpp b/unit_tests/os_interface/windows/file_logger_win_tests.cpp index f856609c6f..4fe2d0a0c7 100644 --- a/unit_tests/os_interface/windows/file_logger_win_tests.cpp +++ b/unit_tests/os_interface/windows/file_logger_win_tests.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "core/debug_settings/debug_settings_manager.h" -#include "runtime/gmm_helper/gmm.h" +#include "core/gmm_helper/gmm.h" #include "runtime/platform/platform.h" #include "test.h" #include "unit_tests/os_interface/windows/mock_wddm_allocation.h" diff --git a/unit_tests/os_interface/windows/wddm20_tests.cpp b/unit_tests/os_interface/windows/wddm20_tests.cpp index fedbe020cc..cb9b309547 100644 --- a/unit_tests/os_interface/windows/wddm20_tests.cpp +++ b/unit_tests/os_interface/windows/wddm20_tests.cpp @@ -6,6 +6,7 @@ */ #include "core/execution_environment/root_device_environment.h" +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" #include "core/helpers/hw_info.h" #include "core/helpers/options.h" @@ -13,7 +14,6 @@ #include "core/os_interface/windows/wddm_engine_mapper.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" #include "runtime/os_interface/os_time.h" #include "runtime/os_interface/windows/os_context_win.h" diff --git a/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp b/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp index 3ee620c54e..28703acbda 100644 --- a/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp @@ -7,9 +7,9 @@ #include "core/command_stream/preemption.h" #include "core/execution_environment/root_device_environment.h" +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" #include "core/unit_tests/os_interface/windows/mock_gdi_interface.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/memory_manager/memory_manager.h" #include "runtime/os_interface/windows/wddm/wddm.h" #include "runtime/os_interface/windows/wddm_allocation.h" diff --git a/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp b/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp index f20df59548..727d60009c 100644 --- a/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_memory_manager_tests.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 "unit_tests/os_interface/windows/wddm_memory_manager_tests.h" +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.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" #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/sharings/gl/gl_reused_buffers_tests.cpp b/unit_tests/sharings/gl/gl_reused_buffers_tests.cpp index 61c39f9907..bc659ee8dd 100644 --- a/unit_tests/sharings/gl/gl_reused_buffers_tests.cpp +++ b/unit_tests/sharings/gl/gl_reused_buffers_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/gmm_helper/gmm.h" #include "core/gmm_helper/resource_info.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/mem_obj/buffer.h" #include "runtime/sharings/gl/gl_buffer.h" #include "test.h" diff --git a/unit_tests/sharings/gl/gl_sharing_tests.cpp b/unit_tests/sharings/gl/gl_sharing_tests.cpp index 5de2cf0180..2632051db8 100644 --- a/unit_tests/sharings/gl/gl_sharing_tests.cpp +++ b/unit_tests/sharings/gl/gl_sharing_tests.cpp @@ -1,15 +1,15 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "core/gmm_helper/gmm.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_queue/command_queue.h" #include "runtime/device/device.h" #include "runtime/event/user_event.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/helpers/array_count.h" #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/image.h" diff --git a/unit_tests/sharings/unified/unified_sharing_image_tests.cpp b/unit_tests/sharings/unified/unified_sharing_image_tests.cpp index cce0778a1e..764e4249e8 100644 --- a/unit_tests/sharings/unified/unified_sharing_image_tests.cpp +++ b/unit_tests/sharings/unified/unified_sharing_image_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gmm_helper/gmm.h" +#include "core/gmm_helper/gmm.h" #include "runtime/mem_obj/image.h" #include "runtime/sharings/unified/unified_image.h" #include "unit_tests/helpers/raii_hw_helper.h" diff --git a/unit_tests/sharings/va/va_sharing_tests.cpp b/unit_tests/sharings/va/va_sharing_tests.cpp index cbeddd60ed..3b1e014eef 100644 --- a/unit_tests/sharings/va/va_sharing_tests.cpp +++ b/unit_tests/sharings/va/va_sharing_tests.cpp @@ -5,11 +5,11 @@ * */ +#include "core/gmm_helper/gmm.h" #include "core/memory_manager/graphics_allocation.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/api/api.h" #include "runtime/device/device.h" -#include "runtime/gmm_helper/gmm.h" #include "runtime/helpers/array_count.h" #include "runtime/platform/platform.h" #include "runtime/sharings/va/cl_va_api.h"