Cleanup includes 47

Cleaned up files: level_zero/tools/source/debug/windows/debug_session.h level_zero/tools/source/sysman/memory/windows/os_memory_imp.h level_zero/tools/source/sysman/windows/kmd_sys_manager.h opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and shared/source/command_container/command_encoder.inl shared/source/command_stream/command_stream_receiver_hw_xehp_and_later.inl shared/source/helpers/blit_commands_helper_base.inl shared/test/unit_test/image/image_surface_state_fixture.h shared/test/unit_test/os_interface/windows/os_interface_win_tests.h Related-To: NEO-5548 Signed-off-by: Warchulski, Jaroslaw <jaroslaw.warchulski@intel.com>
2026-01-03 06:49:52 +08:00 · 2023-02-03 16:43:19 +00:00
parent 1a4755694e
commit a2e6a8284b
31 changed files with 41 additions and 66 deletions
--- a/shared/source/command_container/command_encoder.inl
+++ b/shared/source/command_container/command_encoder.inl
@@ -13,7 +13,6 @@
 #include "shared/source/device/device.h"
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
-#include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/bindless_heaps_helper.h"
--- a/shared/source/command_stream/command_stream_receiver_hw_xehp_and_later.inl
+++ b/shared/source/command_stream/command_stream_receiver_hw_xehp_and_later.inl
@@ -9,7 +9,6 @@
 #include "shared/source/command_stream/command_stream_receiver_hw_base.inl"
 #include "shared/source/command_stream/device_command_stream.h"
 #include "shared/source/command_stream/scratch_space_controller_xehp_and_later.h"
-#include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/helpers/preamble.h"
 #include "shared/source/kernel/grf_config.h"
 #include "shared/source/os_interface/hw_info_config.h"
--- a/shared/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp
+++ b/shared/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -11,6 +11,7 @@ using Family = NEO::Gen12LpFamily;

 #include "shared/source/command_stream/command_stream_receiver_hw_bdw_and_later.inl"
 #include "shared/source/command_stream/device_command_stream.h"
+#include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/helpers/blit_commands_helper_bdw_and_later.inl"
 #include "shared/source/helpers/populate_factory.h"

--- a/shared/source/helpers/blit_commands_helper_base.inl
+++ b/shared/source/helpers/blit_commands_helper_base.inl
@@ -6,9 +6,9 @@
 */

 #include "shared/source/command_container/command_encoder.h"
-#include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/gmm_helper/resource_info.h"
+#include "shared/source/helpers/blit_commands_helper.h"
 #include "shared/source/helpers/blit_properties.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/register_offsets.h"
--- a/shared/source/helpers/blit_commands_helper_xehp_and_later.inl
+++ b/shared/source/helpers/blit_commands_helper_xehp_and_later.inl
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

 #include "shared/source/gmm_helper/client_context/gmm_client_context.h"
+#include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/helpers/blit_commands_helper_base.inl"
 #include "shared/source/helpers/local_memory_access_modes.h"

--- a/shared/source/helpers/timestamp_packet_container.h
+++ b/shared/source/helpers/timestamp_packet_container.h
@@ -7,9 +7,11 @@

 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
+#include "shared/source/utilities/stackvec.h"

 namespace NEO {

+class CommandStreamReceiver;
 class TagNodeBase;

 class TimestampPacketContainer : public NonCopyableClass {
--- a/shared/source/memory_manager/multi_graphics_allocation.cpp
+++ b/shared/source/memory_manager/multi_graphics_allocation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -7,7 +7,6 @@

 #include "shared/source/memory_manager/multi_graphics_allocation.h"

-#include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/source/memory_manager/migration_sync_data.h"

--- a/shared/source/os_interface/linux/drm_memory_manager_create_multi_host_allocation.cpp
+++ b/shared/source/os_interface/linux/drm_memory_manager_create_multi_host_allocation.cpp
@@ -1,11 +1,10 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/memory_manager/allocation_properties.h"
--- a/shared/source/os_interface/windows/driver_info_windows.cpp
+++ b/shared/source/os_interface/windows/driver_info_windows.cpp
@@ -7,10 +7,8 @@

 #include "shared/source/os_interface/windows/driver_info_windows.h"

-#include "shared/source/os_interface/os_interface.h"
 #include "shared/source/os_interface/windows/debug_registry_reader.h"
 #include "shared/source/os_interface/windows/sys_calls.h"
-#include "shared/source/os_interface/windows/wddm/wddm.h"

 #include <algorithm>

--- a/shared/source/os_interface/windows/wddm/read_preemption_regkey.cpp
+++ b/shared/source/os_interface/windows/wddm/read_preemption_regkey.cpp
@@ -1,12 +1,13 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

 #include "shared/source/os_interface/windows/debug_registry_reader.h"
-#include "shared/source/os_interface/windows/wddm/wddm.h"
+
+#include <memory>

 namespace NEO {

--- a/shared/source/xe_hpc_core/command_stream_receiver_hw_xe_hpc_core.cpp
+++ b/shared/source/xe_hpc_core/command_stream_receiver_hw_xe_hpc_core.cpp
@@ -12,6 +12,7 @@ using Family = NEO::XeHpcCoreFamily;

 #include "shared/source/command_stream/command_stream_receiver_hw_dg2_and_later.inl"
 #include "shared/source/command_stream/command_stream_receiver_hw_xehp_and_later.inl"
+#include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/helpers/blit_commands_helper_xehp_and_later.inl"
 #include "shared/source/helpers/blit_properties.h"
 #include "shared/source/helpers/populate_factory.h"
--- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp
+++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp
@@ -6,7 +6,6 @@
 */

 #include "shared/source/command_container/encode_surface_state.h"
-#include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/bindless_heaps_helper.h"
 #include "shared/source/helpers/gfx_core_helper.h"
@@ -18,7 +17,6 @@
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/device_binary_format/patchtokens_tests.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/mocks/mock_device.h"
--- a/shared/test/unit_test/helpers/app_resource_tests.cpp
+++ b/shared/test/unit_test/helpers/app_resource_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -7,16 +7,12 @@

 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
-#include "shared/source/gmm_helper/gmm.h"
-#include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/app_resource_defines.h"
 #include "shared/source/helpers/app_resource_helper.h"
-#include "shared/source/helpers/hw_info.h"
-#include "shared/source/helpers/string.h"
+#include "shared/source/memory_manager/definitions/storage_info.h"
 #include "shared/test/common/fixtures/mock_execution_environment_gmm_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/common/mocks/mock_graphics_allocation.h"
-#include "shared/test/common/mocks/mock_memory_manager.h"
+#include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/test_macros/test.h"

 using MockExecutionEnvironmentTagTest = Test<NEO::MockExecutionEnvironmentGmmFixture>;
--- a/shared/test/unit_test/image/image_surface_state_fixture.h
+++ b/shared/test/unit_test/image/image_surface_state_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -7,7 +7,6 @@

 #pragma once

-#include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/basic_math.h"
--- a/shared/test/unit_test/os_interface/windows/os_interface_win_tests.h
+++ b/shared/test/unit_test/os_interface/windows/os_interface_win_tests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -10,7 +10,6 @@
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/source/os_interface/os_interface.h"
-#include "shared/source/os_interface/windows/wddm/wddm.h"

 #include "gtest/gtest.h"

--- a/shared/test/unit_test/os_interface/windows/wddm_adapter_luid_tests.cpp
+++ b/shared/test/unit_test/os_interface/windows/wddm_adapter_luid_tests.cpp
@@ -1,13 +1,10 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "shared/source/gmm_helper/gmm.h"
-#include "shared/source/helpers/string.h"
-#include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/os_interface/windows/wddm_fixture.h"
 #include "shared/test/common/test_macros/hw_test.h"

--- a/shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp
+++ b/shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp
@@ -7,15 +7,14 @@

 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/command_stream/stream_properties.h"
-#include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/gmm_helper/gmm_lib.h"
 #include "shared/source/helpers/definitions/mi_flush_args.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/kernel/kernel_descriptor.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/test_macros/test.h"