From 11764dd9bf3b1cfe7bb16649822a4ead5c060404 Mon Sep 17 00:00:00 2001 From: "Warchulski, Jaroslaw" Date: Mon, 23 Jan 2023 14:55:52 +0000 Subject: [PATCH] Cleanup includes 40 Cleaned up files: shared/source/os_interface/linux/drm_neo.h shared/source/os_interface/windows/wddm/um_km_data_translator.h Related-To: NEO-5548 Signed-off-by: Warchulski, Jaroslaw --- .../device/device_imp_drm/device_imp_peer.cpp | 1 + .../source/fabric/linux/fabric_device_iaf.cpp | 1 + .../linux/test_driver_handle_imp_linux.cpp | 1 + .../sources/fabric/linux/test_fabric_iaf.cpp | 1 + .../source/debug/linux/prelim/drm_helper.cpp | 4 +- .../linux/os_metric_ip_sampling_imp_linux.cpp | 1 + .../memory/linux/os_memory_imp_prelim.cpp | 1 + .../linux/debug_session_fixtures_linux.cpp | 4 +- .../debug/linux/test_debug_api_linux.cpp | 1 + .../linux/tile_debug_session_linux_tests.cpp | 1 + ...st_metric_ip_sampling_linux_pvc_prelim.cpp | 1 + .../sources/sysman/ecc/linux/test_zes_ecc.cpp | 2 + .../linux/mock_sysfs_scheduler_prelim.h | 2 + .../unit_test/windows/os_interface_tests.cpp | 3 +- .../linux/drm_direct_submission.inl | 1 + .../source/os_interface/linux/clos_cache.cpp | 3 +- .../os_interface/linux/device_time_drm.cpp | 3 +- .../source/os_interface/linux/drm_debug.cpp | 3 +- .../os_interface/linux/drm_memory_manager.cpp | 1 + shared/source/os_interface/linux/drm_neo.cpp | 2 + shared/source/os_interface/linux/drm_neo.h | 18 +++++--- .../os_interface/linux/os_context_linux.cpp | 1 + .../os_interface/windows/CMakeLists.txt | 3 +- .../windows/driver_info_windows.cpp | 4 +- ...igure_device_address_space_drm_or_wddm.cpp | 3 +- .../wddm/create_um_km_data_translator.cpp | 4 +- .../windows/wddm/um_km_data_temp_storage.h | 46 +++++++++++++++++++ .../windows/wddm/um_km_data_translator.cpp | 7 ++- .../windows/wddm/um_km_data_translator.h | 43 ++--------------- .../source/os_interface/windows/wddm/wddm.cpp | 2 + .../windows/wddm/wddm_interface.cpp | 3 +- .../common/libult/linux/drm_mock_engine.cpp | 3 +- .../linux/drm_memory_manager_fixture.h | 1 + .../os_interface/linux/drm_bind_tests.cpp | 3 +- .../linux/drm_buffer_object_tests.cpp | 1 + .../linux/drm_engine_info_prelim_tests.cpp | 1 + .../linux/drm_engine_info_tests.cpp | 3 +- .../linux/drm_memory_info_prelim_tests.cpp | 1 + .../linux/drm_pci_speed_info_tests.cpp | 3 +- .../linux/drm_query_topology_prelim_tests.cpp | 1 + .../os_interface/linux/drm_tests.cpp | 2 + .../linux/drm_with_prelim_tests.cpp | 2 + .../linux/ioctl_helper_tests_upstream.cpp | 3 +- .../windows/um_km_data_translator_tests.cpp | 4 +- 44 files changed, 135 insertions(+), 64 deletions(-) create mode 100644 shared/source/os_interface/windows/wddm/um_km_data_temp_storage.h diff --git a/level_zero/core/source/device/device_imp_drm/device_imp_peer.cpp b/level_zero/core/source/device/device_imp_drm/device_imp_peer.cpp index e672ec9c1d..001a2bb7a2 100644 --- a/level_zero/core/source/device/device_imp_drm/device_imp_peer.cpp +++ b/level_zero/core/source/device/device_imp_drm/device_imp_peer.cpp @@ -8,6 +8,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/os_interface/linux/drm_neo.h" +#include "shared/source/os_interface/linux/ioctl_helper.h" #include "shared/source/os_interface/linux/sys_calls.h" #include "shared/source/utilities/directory.h" diff --git a/level_zero/core/source/fabric/linux/fabric_device_iaf.cpp b/level_zero/core/source/fabric/linux/fabric_device_iaf.cpp index 00657a54bd..8056caa283 100644 --- a/level_zero/core/source/fabric/linux/fabric_device_iaf.cpp +++ b/level_zero/core/source/fabric/linux/fabric_device_iaf.cpp @@ -10,6 +10,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/os_interface/linux/drm_neo.h" +#include "shared/source/os_interface/linux/ioctl_helper.h" #include "shared/source/os_interface/linux/pci_path.h" #include "shared/source/os_interface/os_interface.h" diff --git a/level_zero/core/test/unit_tests/sources/driver/linux/test_driver_handle_imp_linux.cpp b/level_zero/core/test/unit_tests/sources/driver/linux/test_driver_handle_imp_linux.cpp index 23144689a3..a5e99754c8 100644 --- a/level_zero/core/test/unit_tests/sources/driver/linux/test_driver_handle_imp_linux.cpp +++ b/level_zero/core/test/unit_tests/sources/driver/linux/test_driver_handle_imp_linux.cpp @@ -9,6 +9,7 @@ #include "shared/source/os_interface/device_factory.h" #include "shared/source/os_interface/linux/drm_memory_operations_handler_bind.h" #include "shared/source/os_interface/linux/drm_neo.h" +#include "shared/source/os_interface/linux/ioctl_helper.h" #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/libult/linux/drm_mock.h" #include "shared/test/common/mocks/mock_compilers.h" diff --git a/level_zero/core/test/unit_tests/sources/fabric/linux/test_fabric_iaf.cpp b/level_zero/core/test/unit_tests/sources/fabric/linux/test_fabric_iaf.cpp index 883c054ac4..be983f3d9e 100644 --- a/level_zero/core/test/unit_tests/sources/fabric/linux/test_fabric_iaf.cpp +++ b/level_zero/core/test/unit_tests/sources/fabric/linux/test_fabric_iaf.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/os_interface/device_factory.h" +#include "shared/source/os_interface/linux/ioctl_helper.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/libult/linux/drm_mock.h" #include "shared/test/common/mocks/ult_device_factory.h" diff --git a/level_zero/tools/source/debug/linux/prelim/drm_helper.cpp b/level_zero/tools/source/debug/linux/prelim/drm_helper.cpp index 0bf943ad82..6c28913720 100644 --- a/level_zero/tools/source/debug/linux/prelim/drm_helper.cpp +++ b/level_zero/tools/source/debug/linux/prelim/drm_helper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,6 +8,8 @@ #include "level_zero/tools/source/debug/linux/prelim/drm_helper.h" #include "shared/source/os_interface/linux/drm_neo.h" +#include "shared/source/os_interface/linux/engine_info.h" +#include "shared/source/os_interface/linux/ioctl_helper.h" #include "level_zero/core/source/device/device.h" diff --git a/level_zero/tools/source/metrics/linux/os_metric_ip_sampling_imp_linux.cpp b/level_zero/tools/source/metrics/linux/os_metric_ip_sampling_imp_linux.cpp index cd5bc31bac..cdd73aae63 100644 --- a/level_zero/tools/source/metrics/linux/os_metric_ip_sampling_imp_linux.cpp +++ b/level_zero/tools/source/metrics/linux/os_metric_ip_sampling_imp_linux.cpp @@ -9,6 +9,7 @@ #include "shared/source/helpers/constants.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/linux/drm_neo.h" +#include "shared/source/os_interface/linux/engine_info.h" #include "shared/source/os_interface/linux/i915.h" #include "shared/source/os_interface/linux/ioctl_helper.h" #include "shared/source/os_interface/linux/sys_calls.h" diff --git a/level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.cpp b/level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.cpp index 8342965bee..43b0c38109 100644 --- a/level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.cpp +++ b/level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.cpp @@ -11,6 +11,7 @@ #include "shared/source/device/device.h" #include "shared/source/memory_manager/memory_manager.h" #include "shared/source/os_interface/linux/i915.h" +#include "shared/source/os_interface/linux/ioctl_helper.h" #include "shared/source/os_interface/linux/system_info.h" #include "level_zero/core/source/driver/driver_handle.h" diff --git a/level_zero/tools/test/unit_tests/sources/debug/linux/debug_session_fixtures_linux.cpp b/level_zero/tools/test/unit_tests/sources/debug/linux/debug_session_fixtures_linux.cpp index a422227cb9..f27ddf929d 100644 --- a/level_zero/tools/test/unit_tests/sources/debug/linux/debug_session_fixtures_linux.cpp +++ b/level_zero/tools/test/unit_tests/sources/debug/linux/debug_session_fixtures_linux.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,8 @@ #include "level_zero/tools/test/unit_tests/sources/debug/linux/debug_session_fixtures_linux.h" +#include "shared/source/os_interface/linux/engine_info.h" + namespace L0 { namespace ult { diff --git a/level_zero/tools/test/unit_tests/sources/debug/linux/test_debug_api_linux.cpp b/level_zero/tools/test/unit_tests/sources/debug/linux/test_debug_api_linux.cpp index 880a728c67..d6eed05062 100644 --- a/level_zero/tools/test/unit_tests/sources/debug/linux/test_debug_api_linux.cpp +++ b/level_zero/tools/test/unit_tests/sources/debug/linux/test_debug_api_linux.cpp @@ -13,6 +13,7 @@ #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/os_interface/linux/drm_debug.h" +#include "shared/source/os_interface/linux/engine_info.h" #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/gtest_helpers.h" diff --git a/level_zero/tools/test/unit_tests/sources/debug/linux/tile_debug_session_linux_tests.cpp b/level_zero/tools/test/unit_tests/sources/debug/linux/tile_debug_session_linux_tests.cpp index ddce1d710f..5bd2acf1a1 100644 --- a/level_zero/tools/test/unit_tests/sources/debug/linux/tile_debug_session_linux_tests.cpp +++ b/level_zero/tools/test/unit_tests/sources/debug/linux/tile_debug_session_linux_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/os_interface/linux/engine_info.h" #include "shared/test/common/helpers/gtest_helpers.h" #include "shared/test/common/test_macros/test.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp index b497995671..b53b5048ad 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp @@ -7,6 +7,7 @@ #include "shared/source/compiler_interface/compiler_cache.h" #include "shared/source/os_interface/linux/drm_neo.h" +#include "shared/source/os_interface/linux/engine_info.h" #include "shared/source/os_interface/linux/i915.h" #include "shared/source/os_interface/linux/ioctl_helper.h" #include "shared/source/os_interface/linux/sys_calls.h" diff --git a/level_zero/tools/test/unit_tests/sources/sysman/ecc/linux/test_zes_ecc.cpp b/level_zero/tools/test/unit_tests/sources/sysman/ecc/linux/test_zes_ecc.cpp index d92095993f..b4a5b5d8d8 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/ecc/linux/test_zes_ecc.cpp +++ b/level_zero/tools/test/unit_tests/sources/sysman/ecc/linux/test_zes_ecc.cpp @@ -5,6 +5,8 @@ * */ +#include "shared/source/os_interface/driver_info.h" + #include "level_zero/tools/test/unit_tests/sources/sysman/ecc/linux/mock_ecc.h" extern bool sysmanUltsEnable; diff --git a/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/mock_sysfs_scheduler_prelim.h b/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/mock_sysfs_scheduler_prelim.h index 8ff7608d54..3178caa0da 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/mock_sysfs_scheduler_prelim.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/mock_sysfs_scheduler_prelim.h @@ -7,7 +7,9 @@ #pragma once +#include "shared/source/os_interface/linux/engine_info.h" #include "shared/source/os_interface/linux/i915_prelim.h" +#include "shared/source/os_interface/linux/ioctl_helper.h" #include "level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp.h" diff --git a/opencl/test/unit_test/windows/os_interface_tests.cpp b/opencl/test/unit_test/windows/os_interface_tests.cpp index 3852995ebe..03de21e49b 100644 --- a/opencl/test/unit_test/windows/os_interface_tests.cpp +++ b/opencl/test/unit_test/windows/os_interface_tests.cpp @@ -1,10 +1,11 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/source/gmm_helper/gmm_lib.h" #include "shared/source/helpers/constants.h" #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/mocks/mock_execution_environment.h" diff --git a/shared/source/direct_submission/linux/drm_direct_submission.inl b/shared/source/direct_submission/linux/drm_direct_submission.inl index 26bc0322ff..8e4a5a4557 100644 --- a/shared/source/direct_submission/linux/drm_direct_submission.inl +++ b/shared/source/direct_submission/linux/drm_direct_submission.inl @@ -14,6 +14,7 @@ #include "shared/source/os_interface/linux/drm_buffer_object.h" #include "shared/source/os_interface/linux/drm_neo.h" #include "shared/source/os_interface/linux/drm_wrappers.h" +#include "shared/source/os_interface/linux/ioctl_helper.h" #include "shared/source/os_interface/linux/os_context_linux.h" #include "shared/source/utilities/wait_util.h" diff --git a/shared/source/os_interface/linux/clos_cache.cpp b/shared/source/os_interface/linux/clos_cache.cpp index 539fdedb1e..04c3eb3f4a 100644 --- a/shared/source/os_interface/linux/clos_cache.cpp +++ b/shared/source/os_interface/linux/clos_cache.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,6 +8,7 @@ #include "shared/source/os_interface/linux/clos_cache.h" #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/helpers/common_types.h" #include "shared/source/os_interface/linux/drm_neo.h" #include "shared/source/os_interface/linux/ioctl_helper.h" diff --git a/shared/source/os_interface/linux/device_time_drm.cpp b/shared/source/os_interface/linux/device_time_drm.cpp index b30ac4a61d..37cfc6e021 100644 --- a/shared/source/os_interface/linux/device_time_drm.cpp +++ b/shared/source/os_interface/linux/device_time_drm.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,6 +10,7 @@ #include "shared/source/helpers/register_offsets.h" #include "shared/source/os_interface/linux/drm_neo.h" #include "shared/source/os_interface/linux/drm_wrappers.h" +#include "shared/source/os_interface/linux/ioctl_helper.h" #include "shared/source/os_interface/os_interface.h" #include diff --git a/shared/source/os_interface/linux/drm_debug.cpp b/shared/source/os_interface/linux/drm_debug.cpp index 8bec8ba2a8..c61917a746 100644 --- a/shared/source/os_interface/linux/drm_debug.cpp +++ b/shared/source/os_interface/linux/drm_debug.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,6 +10,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/string.h" #include "shared/source/os_interface/linux/drm_neo.h" +#include "shared/source/os_interface/linux/ioctl_helper.h" #include #include diff --git a/shared/source/os_interface/linux/drm_memory_manager.cpp b/shared/source/os_interface/linux/drm_memory_manager.cpp index 4f3d298684..70b58d6f63 100644 --- a/shared/source/os_interface/linux/drm_memory_manager.cpp +++ b/shared/source/os_interface/linux/drm_memory_manager.cpp @@ -37,6 +37,7 @@ #include "shared/source/os_interface/linux/drm_memory_operations_handler.h" #include "shared/source/os_interface/linux/drm_neo.h" #include "shared/source/os_interface/linux/drm_wrappers.h" +#include "shared/source/os_interface/linux/memory_info.h" #include "shared/source/os_interface/linux/os_context_linux.h" #include "shared/source/os_interface/os_interface.h" diff --git a/shared/source/os_interface/linux/drm_neo.cpp b/shared/source/os_interface/linux/drm_neo.cpp index 11bd061211..40aa0a45a1 100644 --- a/shared/source/os_interface/linux/drm_neo.cpp +++ b/shared/source/os_interface/linux/drm_neo.cpp @@ -30,8 +30,10 @@ #include "shared/source/os_interface/linux/drm_memory_manager.h" #include "shared/source/os_interface/linux/drm_memory_operations_handler_bind.h" #include "shared/source/os_interface/linux/drm_wrappers.h" +#include "shared/source/os_interface/linux/engine_info.h" #include "shared/source/os_interface/linux/hw_device_id.h" #include "shared/source/os_interface/linux/ioctl_helper.h" +#include "shared/source/os_interface/linux/memory_info.h" #include "shared/source/os_interface/linux/os_context_linux.h" #include "shared/source/os_interface/linux/os_inc.h" #include "shared/source/os_interface/linux/pci_path.h" diff --git a/shared/source/os_interface/linux/drm_neo.h b/shared/source/os_interface/linux/drm_neo.h index 1ddd807d64..67ec5f1862 100644 --- a/shared/source/os_interface/linux/drm_neo.h +++ b/shared/source/os_interface/linux/drm_neo.h @@ -7,17 +7,14 @@ #pragma once #include "shared/source/gmm_helper/gmm_lib.h" -#include "shared/source/helpers/common_types.h" +#include "shared/source/helpers/driver_model_type.h" #include "shared/source/memory_manager/definitions/engine_limits.h" -#include "shared/source/os_interface/driver_info.h" -#include "shared/source/os_interface/linux/cache_info.h" #include "shared/source/os_interface/linux/drm_debug.h" -#include "shared/source/os_interface/linux/engine_info.h" +#include "shared/source/os_interface/linux/drm_wrappers.h" #include "shared/source/os_interface/linux/hw_device_id.h" -#include "shared/source/os_interface/linux/memory_info.h" #include "shared/source/os_interface/os_interface.h" +#include "shared/source/utilities/stackvec.h" -#include "aubstream/engine_node.h" #include "igfxfmid.h" #include @@ -32,17 +29,26 @@ struct GT_SYSTEM_INFO; +namespace aub_stream { +enum EngineType : uint32_t; +} + namespace NEO { constexpr uint32_t contextPrivateParamBoost = 0x80000000; enum class AllocationType; +enum class CachePolicy : uint32_t; +enum class CacheRegion : uint16_t; enum class SubmissionStatus : uint32_t; class BufferObject; class DeviceFactory; +class MemoryInfo; class OsContext; class OsContextLinux; class Gmm; +struct CacheInfo; +struct EngineInfo; struct HardwareInfo; struct RootDeviceEnvironment; struct SystemInfo; diff --git a/shared/source/os_interface/linux/os_context_linux.cpp b/shared/source/os_interface/linux/os_context_linux.cpp index 2c76a7b3e0..9fe4607d65 100644 --- a/shared/source/os_interface/linux/os_context_linux.cpp +++ b/shared/source/os_interface/linux/os_context_linux.cpp @@ -14,6 +14,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/linux/drm_neo.h" +#include "shared/source/os_interface/linux/ioctl_helper.h" #include "shared/source/os_interface/os_context.h" #include "shared/source/os_interface/os_interface.h" diff --git a/shared/source/os_interface/windows/CMakeLists.txt b/shared/source/os_interface/windows/CMakeLists.txt index ede54463d4..00bae71c84 100644 --- a/shared/source/os_interface/windows/CMakeLists.txt +++ b/shared/source/os_interface/windows/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2019-2022 Intel Corporation +# Copyright (C) 2019-2023 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -100,6 +100,7 @@ set(NEO_CORE_OS_INTERFACE_WDDM ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_manager_${DRIVER_MODEL}.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_manager.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_manager.h + ${CMAKE_CURRENT_SOURCE_DIR}/wddm/um_km_data_temp_storage.h ${CMAKE_CURRENT_SOURCE_DIR}/wddm/um_km_data_translator.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wddm/um_km_data_translator.h ${CMAKE_CURRENT_SOURCE_DIR}/wddm/create_um_km_data_translator.cpp diff --git a/shared/source/os_interface/windows/driver_info_windows.cpp b/shared/source/os_interface/windows/driver_info_windows.cpp index 19c847227d..e41dc351a5 100644 --- a/shared/source/os_interface/windows/driver_info_windows.cpp +++ b/shared/source/os_interface/windows/driver_info_windows.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,6 +12,8 @@ #include "shared/source/os_interface/windows/sys_calls.h" #include "shared/source/os_interface/windows/wddm/wddm.h" +#include + std::string getCurrentLibraryPath() { std::string returnValue; WCHAR pathW[MAX_PATH]; diff --git a/shared/source/os_interface/windows/wddm/configure_device_address_space_drm_or_wddm.cpp b/shared/source/os_interface/windows/wddm/configure_device_address_space_drm_or_wddm.cpp index 373225c6c5..8c042f37d4 100644 --- a/shared/source/os_interface/windows/wddm/configure_device_address_space_drm_or_wddm.cpp +++ b/shared/source/os_interface/windows/wddm/configure_device_address_space_drm_or_wddm.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -20,6 +20,7 @@ #include "shared/source/os_interface/linux/allocator_helper.h" #include "shared/source/os_interface/windows/gdi_interface.h" #include "shared/source/os_interface/windows/gfx_escape_wrapper.h" +#include "shared/source/os_interface/windows/wddm/um_km_data_temp_storage.h" #include "shared/source/os_interface/windows/wddm/wddm.h" #include "gmm_memory.h" diff --git a/shared/source/os_interface/windows/wddm/create_um_km_data_translator.cpp b/shared/source/os_interface/windows/wddm/create_um_km_data_translator.cpp index 77f7b64478..df5cfdb6da 100644 --- a/shared/source/os_interface/windows/wddm/create_um_km_data_translator.cpp +++ b/shared/source/os_interface/windows/wddm/create_um_km_data_translator.cpp @@ -1,11 +1,12 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/gmm_helper/client_context/gmm_handle_allocator.h" #include "shared/source/helpers/debug_helpers.h" #include "shared/source/helpers/string.h" #include "shared/source/os_interface/os_inc_base.h" @@ -20,6 +21,7 @@ #include #include +#include namespace NEO { diff --git a/shared/source/os_interface/windows/wddm/um_km_data_temp_storage.h b/shared/source/os_interface/windows/wddm/um_km_data_temp_storage.h new file mode 100644 index 0000000000..5988b8339c --- /dev/null +++ b/shared/source/os_interface/windows/wddm/um_km_data_temp_storage.h @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2023 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#pragma once +#include "shared/source/utilities/stackvec.h" + +namespace NEO { + +template +struct UmKmDataTempStorageBase { + UmKmDataTempStorageBase() = default; + UmKmDataTempStorageBase(size_t dynSize) { + this->resize(dynSize); + } + + void *data() { + return storage.data(); + } + + void resize(size_t dynSize) { + auto oldSize = storage.size() * sizeof(uint64_t); + storage.resize((dynSize + sizeof(uint64_t) - 1) / sizeof(uint64_t)); + requestedSize = dynSize; + memset(reinterpret_cast(data()) + oldSize, 0, storage.size() * sizeof(uint64_t) - oldSize); + } + + size_t size() const { + return requestedSize; + } + + protected: + static constexpr size_t staticSizeQwordsCount = (StaticSize + sizeof(uint64_t) - 1) / sizeof(uint64_t); + StackVec storage; + size_t requestedSize = 0U; +}; + +template > +struct UmKmDataTempStorage : BaseT { + using BaseT::BaseT; +}; + +} // namespace NEO \ No newline at end of file diff --git a/shared/source/os_interface/windows/wddm/um_km_data_translator.cpp b/shared/source/os_interface/windows/wddm/um_km_data_translator.cpp index 81a60b0de9..14740aa774 100644 --- a/shared/source/os_interface/windows/wddm/um_km_data_translator.cpp +++ b/shared/source/os_interface/windows/wddm/um_km_data_translator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #include "shared/source/os_interface/windows/wddm/um_km_data_translator.h" +#include "shared/source/gmm_helper/client_context/gmm_handle_allocator.h" #include "shared/source/helpers/string.h" namespace NEO { @@ -47,4 +48,8 @@ bool UmKmDataTranslator::translateGmmGfxPartitioningFromInternalRepresentation(G return (0 == memcpy_s(&dst, sizeof(GMM_GFX_PARTITIONING), src, srcSize)); } +std::unique_ptr UmKmDataTranslator::createGmmHandleAllocator() { + return {}; +} + } // namespace NEO diff --git a/shared/source/os_interface/windows/wddm/um_km_data_translator.h b/shared/source/os_interface/windows/wddm/um_km_data_translator.h index 965e80f6aa..c7aa690538 100644 --- a/shared/source/os_interface/windows/wddm/um_km_data_translator.h +++ b/shared/source/os_interface/windows/wddm/um_km_data_translator.h @@ -1,15 +1,13 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #pragma once - -#include "shared/source/gmm_helper/client_context/gmm_handle_allocator.h" +#include "shared/source/gmm_helper/gmm_lib.h" #include "shared/source/os_interface/windows/sharedata_wrapper.h" -#include "shared/source/utilities/stackvec.h" #include @@ -41,47 +39,12 @@ class UmKmDataTranslator { return isEnabled; } - virtual std::unique_ptr createGmmHandleAllocator() { - return {}; - } + virtual std::unique_ptr createGmmHandleAllocator(); protected: bool isEnabled = false; }; -template -struct UmKmDataTempStorageBase { - UmKmDataTempStorageBase() = default; - UmKmDataTempStorageBase(size_t dynSize) { - this->resize(dynSize); - } - - void *data() { - return storage.data(); - } - - void resize(size_t dynSize) { - auto oldSize = storage.size() * sizeof(uint64_t); - storage.resize((dynSize + sizeof(uint64_t) - 1) / sizeof(uint64_t)); - requestedSize = dynSize; - memset(reinterpret_cast(data()) + oldSize, 0, storage.size() * sizeof(uint64_t) - oldSize); - } - - size_t size() const { - return requestedSize; - } - - protected: - static constexpr size_t staticSizeQwordsCount = (StaticSize + sizeof(uint64_t) - 1) / sizeof(uint64_t); - StackVec storage; - size_t requestedSize = 0U; -}; - -template > -struct UmKmDataTempStorage : BaseT { - using BaseT::BaseT; -}; - std::unique_ptr createUmKmDataTranslator(const Gdi &gdi, D3DKMT_HANDLE adapter); } // namespace NEO diff --git a/shared/source/os_interface/windows/wddm/wddm.cpp b/shared/source/os_interface/windows/wddm/wddm.cpp index 559ce076ba..7bcf3f6bdf 100644 --- a/shared/source/os_interface/windows/wddm/wddm.cpp +++ b/shared/source/os_interface/windows/wddm/wddm.cpp @@ -12,6 +12,7 @@ #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gmm_helper/client_context/gmm_client_context.h" +#include "shared/source/gmm_helper/client_context/gmm_handle_allocator.h" #include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/gmm_helper/page_table_mngr.h" @@ -33,6 +34,7 @@ #include "shared/source/os_interface/windows/os_environment_win.h" #include "shared/source/os_interface/windows/sharedata_wrapper.h" #include "shared/source/os_interface/windows/wddm/adapter_factory.h" +#include "shared/source/os_interface/windows/wddm/um_km_data_temp_storage.h" #include "shared/source/os_interface/windows/wddm/um_km_data_translator.h" #include "shared/source/os_interface/windows/wddm/wddm_interface.h" #include "shared/source/os_interface/windows/wddm/wddm_residency_logger.h" diff --git a/shared/source/os_interface/windows/wddm/wddm_interface.cpp b/shared/source/os_interface/windows/wddm/wddm_interface.cpp index 9cae280d9a..376c4c2256 100644 --- a/shared/source/os_interface/windows/wddm/wddm_interface.cpp +++ b/shared/source/os_interface/windows/wddm/wddm_interface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,6 +12,7 @@ #include "shared/source/helpers/constants.h" #include "shared/source/os_interface/windows/gdi_interface.h" #include "shared/source/os_interface/windows/os_context_win.h" +#include "shared/source/os_interface/windows/wddm/um_km_data_temp_storage.h" #include "shared/source/os_interface/windows/wddm/wddm.h" using namespace NEO; diff --git a/shared/test/common/libult/linux/drm_mock_engine.cpp b/shared/test/common/libult/linux/drm_mock_engine.cpp index da0fc9862c..18d2c7d30b 100644 --- a/shared/test/common/libult/linux/drm_mock_engine.cpp +++ b/shared/test/common/libult/linux/drm_mock_engine.cpp @@ -1,11 +1,12 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/os_interface/linux/i915.h" +#include "shared/source/os_interface/linux/ioctl_helper.h" #include "shared/test/common/libult/linux/drm_mock.h" #include "shared/test/common/os_interface/linux/drm_mock_device_blob.h" diff --git a/shared/test/common/os_interface/linux/drm_memory_manager_fixture.h b/shared/test/common/os_interface/linux/drm_memory_manager_fixture.h index b9eda3dc01..7f82fcba3e 100644 --- a/shared/test/common/os_interface/linux/drm_memory_manager_fixture.h +++ b/shared/test/common/os_interface/linux/drm_memory_manager_fixture.h @@ -8,6 +8,7 @@ #pragma once #include "shared/source/memory_manager/allocation_properties.h" +#include "shared/source/os_interface/linux/memory_info.h" #include "shared/test/common/fixtures/memory_management_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_device.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_bind_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_bind_tests.cpp index 320303d7bb..fa2714909c 100644 --- a/shared/test/unit_test/os_interface/linux/drm_bind_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_bind_tests.cpp @@ -1,11 +1,12 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/ptr_math.h" +#include "shared/source/os_interface/linux/ioctl_helper.h" #include "shared/source/os_interface/linux/os_context_linux.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/libult/linux/drm_mock.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp index e35d0706a5..7fbb5c2cfc 100644 --- a/shared/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/os_interface/linux/ioctl_helper.h" #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/gtest_helpers.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_engine_info_prelim_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_engine_info_prelim_tests.cpp index ca7766bd04..94cecefee9 100644 --- a/shared/test/unit_test/os_interface/linux/drm_engine_info_prelim_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_engine_info_prelim_tests.cpp @@ -10,6 +10,7 @@ #include "shared/source/memory_manager/memory_banks.h" #include "shared/source/os_interface/linux/engine_info.h" #include "shared/source/os_interface/linux/i915.h" +#include "shared/source/os_interface/linux/memory_info.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/variable_backup.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp index 376dd719b5..a10bb19614 100644 --- a/shared/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 Intel Corporation + * Copyright (C) 2019-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #include "shared/source/os_interface/linux/engine_info.h" #include "shared/source/os_interface/linux/i915.h" +#include "shared/source/os_interface/linux/memory_info.h" #include "shared/test/common/libult/linux/drm_mock.h" #include "shared/test/common/mocks/mock_execution_environment.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_memory_info_prelim_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_memory_info_prelim_tests.cpp index aadb198afb..f9cdf0ce63 100644 --- a/shared/test/unit_test/os_interface/linux/drm_memory_info_prelim_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_memory_info_prelim_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/memory_manager/memory_banks.h" #include "shared/source/os_interface/linux/i915.h" +#include "shared/source/os_interface/linux/memory_info.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/libult/linux/drm_mock_helper.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_pci_speed_info_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_pci_speed_info_tests.cpp index bf3786b0b7..a08ecdb1fa 100644 --- a/shared/test/unit_test/os_interface/linux/drm_pci_speed_info_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_pci_speed_info_tests.cpp @@ -1,11 +1,12 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/string.h" +#include "shared/source/os_interface/driver_info.h" #include "shared/source/os_interface/linux/os_context_linux.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/helpers/variable_backup.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_query_topology_prelim_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_query_topology_prelim_tests.cpp index b68c4fabc8..6c6c621f83 100644 --- a/shared/test/unit_test/os_interface/linux/drm_query_topology_prelim_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_query_topology_prelim_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" +#include "shared/source/os_interface/linux/engine_info.h" #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_tests.cpp index 16a422e06d..ae171c61dd 100644 --- a/shared/test/unit_test/os_interface/linux/drm_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_tests.cpp @@ -9,7 +9,9 @@ #include "shared/source/helpers/file_io.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/device_factory.h" +#include "shared/source/os_interface/driver_info.h" #include "shared/source/os_interface/linux/i915.h" +#include "shared/source/os_interface/linux/memory_info.h" #include "shared/source/os_interface/linux/os_context_linux.h" #include "shared/source/os_interface/linux/os_inc.h" #include "shared/source/os_interface/os_interface.h" diff --git a/shared/test/unit_test/os_interface/linux/drm_with_prelim_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_with_prelim_tests.cpp index d803759467..49f4c17d77 100644 --- a/shared/test/unit_test/os_interface/linux/drm_with_prelim_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_with_prelim_tests.cpp @@ -6,8 +6,10 @@ */ #include "shared/source/os_interface/hw_info_config.h" +#include "shared/source/os_interface/linux/engine_info.h" #include "shared/source/os_interface/linux/i915_prelim.h" #include "shared/source/os_interface/linux/ioctl_helper.h" +#include "shared/source/os_interface/linux/memory_info.h" #include "shared/source/os_interface/linux/os_context_linux.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" diff --git a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp index ae38f9cdc2..1b9253f0a0 100644 --- a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp +++ b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp @@ -5,7 +5,8 @@ * */ -#include "shared/source/os_interface/linux/ioctl_helper.h" +#include "shared/source/os_interface/linux/engine_info.h" +#include "shared/source/os_interface/linux/memory_info.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_execution_environment.h" diff --git a/shared/test/unit_test/os_interface/windows/um_km_data_translator_tests.cpp b/shared/test/unit_test/os_interface/windows/um_km_data_translator_tests.cpp index e6d1e5b16c..e01bbb602e 100644 --- a/shared/test/unit_test/os_interface/windows/um_km_data_translator_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/um_km_data_translator_tests.cpp @@ -1,12 +1,14 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/gmm_helper/client_context/gmm_handle_allocator.h" #include "shared/source/os_interface/windows/gdi_interface.h" +#include "shared/source/os_interface/windows/wddm/um_km_data_temp_storage.h" #include "shared/source/os_interface/windows/wddm/um_km_data_translator.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/test_macros/hw_test.h"