Move gmm to core

Change-Id: I787dfcb3ca3926ce10e2e3c748594713df5fc467 Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
2026-01-04 15:53:45 +08:00 · 2020-01-09 16:10:48 +01:00
parent 81e9591c31
commit fd4ae3b369
48 changed files with 63 additions and 61 deletions
--- 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"
--- 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"
--- 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"

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

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