Move gmm to core

Change-Id: I787dfcb3ca3926ce10e2e3c748594713df5fc467
Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>

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

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"

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"
 

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"

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"
 

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"

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

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;

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 <algorithm>

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"

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"
 

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"

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"
 

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"

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"

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 <cassert>

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"

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"

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"

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;

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"