From bd81b5546d10c3e57394ed85f60ffc7bc7350d9c Mon Sep 17 00:00:00 2001 From: "Warchulski, Jaroslaw" Date: Mon, 9 Jan 2023 17:14:18 +0000 Subject: [PATCH] Cleanup includes 25 Cleaned up files: level_zero/core/source/device/device.h opencl/source/helpers/dispatch_info.h shared/source/os_interface/os_interface.h Related-To: NEO-5548 Signed-off-by: Warchulski, Jaroslaw --- level_zero/core/source/CMakeLists.txt | 3 ++- .../context/context_imp_drm_or_wddm.cpp | 4 ++- level_zero/core/source/device/device.cpp | 26 +++++++++++++++++++ level_zero/core/source/device/device.h | 13 +++++----- level_zero/core/source/device/device_imp.cpp | 1 + level_zero/core/source/device/device_imp.h | 1 + level_zero/core/source/image/image_hw.inl | 1 + level_zero/core/source/image/image_imp.cpp | 3 ++- level_zero/core/source/sampler/sampler_hw.inl | 3 ++- .../test_device_pci_speed_info_windows.cpp | 3 ++- .../source/debug/windows/debug_session.cpp | 3 ++- .../firmware_util/firmware_util_imp.cpp | 3 ++- .../sysman/firmware_util/firmware_util_imp.h | 3 ++- .../linux/os_frequency_imp_prelim.cpp | 1 + .../source/sysman/linux/nl_api/iaf_nl_api.cpp | 3 ++- .../source/sysman/linux/nl_api/nl_api.cpp | 7 ++++- .../tools/source/sysman/linux/nl_api/nl_api.h | 8 ++++-- .../tools/source/sysman/linux/pmt/pmt.cpp | 3 ++- .../memory/linux/os_memory_imp_prelim.cpp | 3 ++- .../linux/os_performance_imp_prelim.cpp | 4 ++- .../sysman/ecc/windows/test_zes_ecc.cpp | 4 ++- .../sysman/linux/nl_api/mock_nl_api_prelim.h | 2 +- opencl/source/helpers/dispatch_info.cpp | 12 +++++++++ opencl/source/helpers/dispatch_info.h | 11 ++------ .../execution_environment_tests.cpp | 2 ++ .../create_direct_submission_hw.inl | 1 + .../execution_environment.cpp | 3 ++- .../execution_environment_drm_or_wddm.cpp | 3 ++- .../create_command_stream_receiver.inl | 3 ++- .../create_os_context_drm_or_wddm.cpp | 3 ++- .../source/os_interface/linux/hw_device_id.h | 3 ++- shared/source/os_interface/os_interface.h | 8 +++--- .../os_interface/windows/hw_device_id.h | 3 ++- shared/test/common/mocks/mock_driver_model.h | 3 ++- .../unit_test/device/neo_device_tests.cpp | 2 ++ .../os_interface/windows/wddm_tests.cpp | 1 + 36 files changed, 117 insertions(+), 43 deletions(-) create mode 100644 level_zero/core/source/device/device.cpp diff --git a/level_zero/core/source/CMakeLists.txt b/level_zero/core/source/CMakeLists.txt index 6c4a9d1549..8b148d339e 100644 --- a/level_zero/core/source/CMakeLists.txt +++ b/level_zero/core/source/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2020-2022 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -36,6 +36,7 @@ set(L0_RUNTIME_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/device${BRANCH_DIR_SUFFIX}device_imp_helper.cpp ${CMAKE_CURRENT_SOURCE_DIR}/device/bcs_split.cpp ${CMAKE_CURRENT_SOURCE_DIR}/device/bcs_split.h + ${CMAKE_CURRENT_SOURCE_DIR}/device/device.cpp ${CMAKE_CURRENT_SOURCE_DIR}/device/device.h ${CMAKE_CURRENT_SOURCE_DIR}/device/device_imp_${DRIVER_MODEL}/device_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/device/device_imp.cpp diff --git a/level_zero/core/source/context/context_imp_drm_or_wddm.cpp b/level_zero/core/source/context/context_imp_drm_or_wddm.cpp index e1c1450248..431ad81106 100644 --- a/level_zero/core/source/context/context_imp_drm_or_wddm.cpp +++ b/level_zero/core/source/context/context_imp_drm_or_wddm.cpp @@ -1,11 +1,13 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/source/device/device.h" #include "shared/source/execution_environment/root_device_environment.h" +#include "shared/source/helpers/driver_model_type.h" #include "shared/source/memory_manager/memory_manager.h" #include "shared/source/os_interface/os_interface.h" diff --git a/level_zero/core/source/device/device.cpp b/level_zero/core/source/device/device.cpp new file mode 100644 index 0000000000..e073421f76 --- /dev/null +++ b/level_zero/core/source/device/device.cpp @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2023 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "level_zero/core/source/device/device.h" + +#include "shared/source/device/device.h" + +namespace L0 { + +uint32_t Device::getRootDeviceIndex() const { + return neoDevice->getRootDeviceIndex(); +} + +NEO::SourceLevelDebugger *Device::getSourceLevelDebugger() { + return getNEODevice()->getSourceLevelDebugger(); +} + +NEO::DebuggerL0 *Device::getL0Debugger() { + return getNEODevice()->getL0Debugger(); +} + +} // namespace L0 \ No newline at end of file diff --git a/level_zero/core/source/device/device.h b/level_zero/core/source/device/device.h index dbf9c1e988..1bfd5d73b6 100644 --- a/level_zero/core/source/device/device.h +++ b/level_zero/core/source/device/device.h @@ -7,13 +7,13 @@ #pragma once -#include "shared/source/device/device.h" -#include "shared/source/memory_manager/allocation_type.h" #include "shared/source/os_interface/hw_info_config.h" #include #include +#include + static_assert(NEO::ProductHelper::uuidSize == ZE_MAX_DEVICE_UUID_SIZE); struct _ze_device_handle_t {}; @@ -39,9 +39,8 @@ class L0GfxCoreHelper; enum class ModuleType; struct Device : _ze_device_handle_t { - uint32_t getRootDeviceIndex() const { - return neoDevice->getRootDeviceIndex(); - } + uint32_t getRootDeviceIndex() const; + NEO::Device *getNEODevice() const { return this->neoDevice; } @@ -123,8 +122,8 @@ struct Device : _ze_device_handle_t { virtual NEO::PreemptionMode getDevicePreemptionMode() const = 0; virtual const NEO::DeviceInfo &getDeviceInfo() const = 0; - NEO::SourceLevelDebugger *getSourceLevelDebugger() { return getNEODevice()->getSourceLevelDebugger(); } - NEO::DebuggerL0 *getL0Debugger() { return getNEODevice()->getL0Debugger(); } + NEO::SourceLevelDebugger *getSourceLevelDebugger(); + NEO::DebuggerL0 *getL0Debugger(); virtual NEO::GraphicsAllocation *getDebugSurface() const = 0; diff --git a/level_zero/core/source/device/device_imp.cpp b/level_zero/core/source/device/device_imp.cpp index 02e5885f67..670aa5d036 100644 --- a/level_zero/core/source/device/device_imp.cpp +++ b/level_zero/core/source/device/device_imp.cpp @@ -28,6 +28,7 @@ #include "shared/source/memory_manager/allocation_properties.h" #include "shared/source/memory_manager/allocations_list.h" #include "shared/source/memory_manager/memory_manager.h" +#include "shared/source/os_interface/driver_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/os_interface.h" #include "shared/source/os_interface/os_time.h" diff --git a/level_zero/core/source/device/device_imp.h b/level_zero/core/source/device/device_imp.h index f7e55f5003..de916f4d21 100644 --- a/level_zero/core/source/device/device_imp.h +++ b/level_zero/core/source/device/device_imp.h @@ -7,6 +7,7 @@ #pragma once +#include "shared/source/device/device.h" #include "shared/source/helpers/topology_map.h" #include "shared/source/memory_manager/memadvise_flags.h" #include "shared/source/memory_manager/unified_memory_manager.h" diff --git a/level_zero/core/source/image/image_hw.inl b/level_zero/core/source/image/image_hw.inl index 6d44ec13ae..f498362508 100644 --- a/level_zero/core/source/image/image_hw.inl +++ b/level_zero/core/source/image/image_hw.inl @@ -8,6 +8,7 @@ #pragma once #include "shared/source/command_container/command_encoder.h" +#include "shared/source/device/device.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gmm_helper/gmm.h" #include "shared/source/helpers/basic_math.h" diff --git a/level_zero/core/source/image/image_imp.cpp b/level_zero/core/source/image/image_imp.cpp index 41b16f1081..76c4c5cbee 100644 --- a/level_zero/core/source/image/image_imp.cpp +++ b/level_zero/core/source/image/image_imp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #include "level_zero/core/source/image/image_imp.h" +#include "shared/source/device/device.h" #include "shared/source/memory_manager/memory_manager.h" #include "level_zero/core/source/device/device.h" diff --git a/level_zero/core/source/sampler/sampler_hw.inl b/level_zero/core/source/sampler/sampler_hw.inl index 77805e6ec0..213d29fae2 100644 --- a/level_zero/core/source/sampler/sampler_hw.inl +++ b/level_zero/core/source/sampler/sampler_hw.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #pragma once +#include "shared/source/device/device.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/ptr_math.h" #include "shared/source/helpers/string.h" diff --git a/level_zero/core/test/unit_tests/sources/device/windows/test_device_pci_speed_info_windows.cpp b/level_zero/core/test/unit_tests/sources/device/windows/test_device_pci_speed_info_windows.cpp index ba250ad0fc..5352ec7cb8 100644 --- a/level_zero/core/test/unit_tests/sources/device/windows/test_device_pci_speed_info_windows.cpp +++ b/level_zero/core/test/unit_tests/sources/device/windows/test_device_pci_speed_info_windows.cpp @@ -1,10 +1,11 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/source/os_interface/driver_info.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/ult_device_factory.h" diff --git a/level_zero/tools/source/debug/windows/debug_session.cpp b/level_zero/tools/source/debug/windows/debug_session.cpp index 0681977770..de3860d245 100644 --- a/level_zero/tools/source/debug/windows/debug_session.cpp +++ b/level_zero/tools/source/debug/windows/debug_session.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 "level_zero/tools/source/debug/windows/debug_session.h" +#include "shared/source/device/device.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/register_offsets.h" diff --git a/level_zero/tools/source/sysman/firmware_util/firmware_util_imp.cpp b/level_zero/tools/source/sysman/firmware_util/firmware_util_imp.cpp index 7d985b6393..acb326a2e3 100644 --- a/level_zero/tools/source/sysman/firmware_util/firmware_util_imp.cpp +++ b/level_zero/tools/source/sysman/firmware_util/firmware_util_imp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,6 +8,7 @@ #include "level_zero/tools/source/sysman/firmware_util/firmware_util_imp.h" #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/helpers/debug_helpers.h" #include "shared/source/utilities/directory.h" namespace L0 { diff --git a/level_zero/tools/source/sysman/firmware_util/firmware_util_imp.h b/level_zero/tools/source/sysman/firmware_util/firmware_util_imp.h index 7234e74046..8e15213791 100644 --- a/level_zero/tools/source/sysman/firmware_util/firmware_util_imp.h +++ b/level_zero/tools/source/sysman/firmware_util/firmware_util_imp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,6 +8,7 @@ #pragma once #include "shared/source/helpers/non_copyable_or_moveable.h" +#include "shared/source/os_interface/os_library.h" #include "level_zero/core/source/device/device.h" #include "level_zero/tools/source/sysman/firmware_util/firmware_util.h" diff --git a/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.cpp b/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.cpp index 5726ff638a..b72a935ab8 100644 --- a/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.cpp +++ b/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.cpp @@ -8,6 +8,7 @@ #include "level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.h" #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/device/device.h" #include "igfxfmid.h" #include "sysman/linux/os_sysman_imp.h" diff --git a/level_zero/tools/source/sysman/linux/nl_api/iaf_nl_api.cpp b/level_zero/tools/source/sysman/linux/nl_api/iaf_nl_api.cpp index aa4ab5b985..6e9a269727 100644 --- a/level_zero/tools/source/sysman/linux/nl_api/iaf_nl_api.cpp +++ b/level_zero/tools/source/sysman/linux/nl_api/iaf_nl_api.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,6 +11,7 @@ #include "shared/source/utilities/directory.h" #include +#include #include #include #include diff --git a/level_zero/tools/source/sysman/linux/nl_api/nl_api.cpp b/level_zero/tools/source/sysman/linux/nl_api/nl_api.cpp index dc04eb8668..27cb9780ee 100644 --- a/level_zero/tools/source/sysman/linux/nl_api/nl_api.cpp +++ b/level_zero/tools/source/sysman/linux/nl_api/nl_api.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,9 @@ #include "nl_api.h" +#include "shared/source/helpers/debug_helpers.h" +#include "shared/source/os_interface/os_library.h" + namespace L0 { static constexpr std::string_view libgenlFile = "libnl-genl-3.so.200"; @@ -250,4 +253,6 @@ NlApi::NlApi() { genlLibraryHandle.reset(NEO::OsLibrary::load(std::string(libgenlFile))); } +NlApi::~NlApi() = default; + } // namespace L0 diff --git a/level_zero/tools/source/sysman/linux/nl_api/nl_api.h b/level_zero/tools/source/sysman/linux/nl_api/nl_api.h index 8c184ed0e8..5bbd7b2966 100644 --- a/level_zero/tools/source/sysman/linux/nl_api/nl_api.h +++ b/level_zero/tools/source/sysman/linux/nl_api/nl_api.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -19,6 +19,10 @@ #include #include +namespace NEO { +class OsLibrary; +} // namespace NEO + namespace L0 { typedef int (*pGenlConnect)(struct nl_sock *); @@ -92,7 +96,7 @@ class NlApi : public NEO::NonCopyableOrMovableClass { MOCKABLE_VIRTUAL bool loadEntryPoints(); NlApi(); - MOCKABLE_VIRTUAL ~NlApi() = default; + MOCKABLE_VIRTUAL ~NlApi(); protected: template diff --git a/level_zero/tools/source/sysman/linux/pmt/pmt.cpp b/level_zero/tools/source/sysman/linux/pmt/pmt.cpp index bff94e9104..90c3951957 100644 --- a/level_zero/tools/source/sysman/linux/pmt/pmt.cpp +++ b/level_zero/tools/source/sysman/linux/pmt/pmt.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 "level_zero/tools/source/sysman/linux/pmt/pmt.h" #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/helpers/debug_helpers.h" #include "level_zero/tools/source/sysman/sysman_imp.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 54676fb776..2de81b93c9 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,6 +8,7 @@ #include "level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.h" #include "shared/source/debug_settings/debug_settings_manager.h" +#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/system_info.h" diff --git a/level_zero/tools/source/sysman/performance/linux/os_performance_imp_prelim.cpp b/level_zero/tools/source/sysman/performance/linux/os_performance_imp_prelim.cpp index a66d5404cc..c8321f1d30 100644 --- a/level_zero/tools/source/sysman/performance/linux/os_performance_imp_prelim.cpp +++ b/level_zero/tools/source/sysman/performance/linux/os_performance_imp_prelim.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/source/sysman/performance/linux/os_performance_imp_prelim.h" +#include "shared/source/device/device.h" + #include namespace L0 { diff --git a/level_zero/tools/test/unit_tests/sources/sysman/ecc/windows/test_zes_ecc.cpp b/level_zero/tools/test/unit_tests/sources/sysman/ecc/windows/test_zes_ecc.cpp index 85960d324c..26c55756cb 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/ecc/windows/test_zes_ecc.cpp +++ b/level_zero/tools/test/unit_tests/sources/sysman/ecc/windows/test_zes_ecc.cpp @@ -1,10 +1,12 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/source/os_interface/driver_info.h" + #include "level_zero/tools/test/unit_tests/sources/sysman/ecc/windows/mock_ecc.h" extern bool sysmanUltsEnable; diff --git a/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_nl_api_prelim.h b/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_nl_api_prelim.h index a239c23f15..5813c8e3e3 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_nl_api_prelim.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_nl_api_prelim.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/opencl/source/helpers/dispatch_info.cpp b/opencl/source/helpers/dispatch_info.cpp index 5c32e814aa..b0813daa94 100644 --- a/opencl/source/helpers/dispatch_info.cpp +++ b/opencl/source/helpers/dispatch_info.cpp @@ -10,8 +10,10 @@ #include "shared/source/compiler_interface/compiler_cache.h" #include "opencl/source/kernel/kernel.h" +#include "opencl/source/mem_obj/mem_obj.h" namespace NEO { + bool DispatchInfo::usesSlm() const { return (kernel == nullptr) ? false : kernel->getSlmTotalSize() > 0; } @@ -28,6 +30,16 @@ uint32_t DispatchInfo::getRequiredPrivateScratchSize() const { return (kernel == nullptr) ? 0 : kernel->getPrivateScratchSize(); } +MultiDispatchInfo::~MultiDispatchInfo() { + for (MemObj *redescribedSurface : redescribedSurfaces) { + redescribedSurface->release(); + } +} + +void MultiDispatchInfo::pushRedescribedMemObj(std::unique_ptr memObj) { + redescribedSurfaces.push_back(memObj.release()); +} + Kernel *MultiDispatchInfo::peekMainKernel() const { if (dispatchInfos.size() == 0) { return nullptr; diff --git a/opencl/source/helpers/dispatch_info.h b/opencl/source/helpers/dispatch_info.h index b9d425639c..c645921a3e 100644 --- a/opencl/source/helpers/dispatch_info.h +++ b/opencl/source/helpers/dispatch_info.h @@ -12,7 +12,6 @@ #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/kernel/kernel_objects_for_aux_translation.h" -#include "opencl/source/mem_obj/mem_obj.h" #include #include @@ -85,11 +84,7 @@ class DispatchInfo { }; struct MultiDispatchInfo { - ~MultiDispatchInfo() { - for (MemObj *redescribedSurface : redescribedSurfaces) { - redescribedSurface->release(); - } - } + ~MultiDispatchInfo(); explicit MultiDispatchInfo(Kernel *mainKernel) : mainKernel(mainKernel) {} explicit MultiDispatchInfo(const BuiltinOpParams &operationParams) : builtinOpParams(operationParams) {} @@ -182,9 +177,7 @@ struct MultiDispatchInfo { return redescribedSurfaces; } - void pushRedescribedMemObj(std::unique_ptr memObj) { - redescribedSurfaces.push_back(memObj.release()); - } + void pushRedescribedMemObj(std::unique_ptr memObj); Kernel *peekMainKernel() const; diff --git a/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp b/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp index 6d9bc1d226..0537c90796 100644 --- a/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp +++ b/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp @@ -14,8 +14,10 @@ #include "shared/source/direct_submission/direct_submission_controller.h" #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/gmm_helper/gmm_helper.h" +#include "shared/source/helpers/driver_model_type.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/device_factory.h" +#include "shared/source/os_interface/driver_info.h" #include "shared/source/os_interface/os_interface.h" #include "shared/source/source_level_debugger/source_level_debugger.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" diff --git a/shared/source/direct_submission/create_direct_submission_drm_or_wddm/create_direct_submission_hw.inl b/shared/source/direct_submission/create_direct_submission_drm_or_wddm/create_direct_submission_hw.inl index d7600e10b1..6a5b945f48 100644 --- a/shared/source/direct_submission/create_direct_submission_drm_or_wddm/create_direct_submission_hw.inl +++ b/shared/source/direct_submission/create_direct_submission_drm_or_wddm/create_direct_submission_hw.inl @@ -7,6 +7,7 @@ #include "shared/source/direct_submission/linux/drm_direct_submission.h" #include "shared/source/direct_submission/windows/wddm_direct_submission.h" +#include "shared/source/helpers/driver_model_type.h" #include "shared/source/os_interface/os_interface.h" namespace NEO { diff --git a/shared/source/execution_environment/execution_environment.cpp b/shared/source/execution_environment/execution_environment.cpp index 92d6586eff..e9c5f93092 100644 --- a/shared/source/execution_environment/execution_environment.cpp +++ b/shared/source/execution_environment/execution_environment.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,6 +13,7 @@ #include "shared/source/direct_submission/direct_submission_controller.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/affinity_mask.h" +#include "shared/source/helpers/driver_model_type.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/string_helpers.h" diff --git a/shared/source/execution_environment/execution_environment_drm_or_wddm.cpp b/shared/source/execution_environment/execution_environment_drm_or_wddm.cpp index a2a407ab5f..bbf02e498b 100644 --- a/shared/source/execution_environment/execution_environment_drm_or_wddm.cpp +++ b/shared/source/execution_environment/execution_environment_drm_or_wddm.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" +#include "shared/source/helpers/driver_model_type.h" #include "shared/source/os_interface/os_interface.h" namespace NEO { diff --git a/shared/source/os_interface/create_command_stream_receiver_drm_or_wddm/create_command_stream_receiver.inl b/shared/source/os_interface/create_command_stream_receiver_drm_or_wddm/create_command_stream_receiver.inl index 559aaaf743..567eb74d68 100644 --- a/shared/source/os_interface/create_command_stream_receiver_drm_or_wddm/create_command_stream_receiver.inl +++ b/shared/source/os_interface/create_command_stream_receiver_drm_or_wddm/create_command_stream_receiver.inl @@ -1,11 +1,12 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/execution_environment/root_device_environment.h" +#include "shared/source/helpers/driver_model_type.h" #include "shared/source/os_interface/linux/device_command_stream.inl" #include "shared/source/os_interface/os_interface.h" #include "shared/source/os_interface/windows/device_command_stream.inl" diff --git a/shared/source/os_interface/create_os_context_drm_or_wddm.cpp b/shared/source/os_interface/create_os_context_drm_or_wddm.cpp index 3158064d1b..978e1efb94 100644 --- a/shared/source/os_interface/create_os_context_drm_or_wddm.cpp +++ b/shared/source/os_interface/create_os_context_drm_or_wddm.cpp @@ -1,10 +1,11 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/source/helpers/driver_model_type.h" #include "shared/source/os_interface/linux/os_context_linux.h" #include "shared/source/os_interface/os_context.h" #include "shared/source/os_interface/os_interface.h" diff --git a/shared/source/os_interface/linux/hw_device_id.h b/shared/source/os_interface/linux/hw_device_id.h index b2d16be2b8..9d410bf034 100644 --- a/shared/source/os_interface/linux/hw_device_id.h +++ b/shared/source/os_interface/linux/hw_device_id.h @@ -1,11 +1,12 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #pragma once +#include "shared/source/helpers/driver_model_type.h" #include "shared/source/os_interface/os_interface.h" #include diff --git a/shared/source/os_interface/os_interface.h b/shared/source/os_interface/os_interface.h index 11aaf48a09..60b226b30a 100644 --- a/shared/source/os_interface/os_interface.h +++ b/shared/source/os_interface/os_interface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,14 +7,16 @@ #pragma once #include "shared/source/helpers/debug_helpers.h" -#include "shared/source/helpers/driver_model_type.h" #include "shared/source/helpers/non_copyable_or_moveable.h" #include "shared/source/helpers/topology_map.h" -#include "shared/source/os_interface/driver_info.h" +#include #include namespace NEO { +struct PhysicalDevicePciBusInfo; +struct PhysicalDevicePciSpeedInfo; +enum class DriverModelType; class ExecutionEnvironment; class MemoryManager; class OsContext; diff --git a/shared/source/os_interface/windows/hw_device_id.h b/shared/source/os_interface/windows/hw_device_id.h index 6802a1d06e..e8e551d77a 100644 --- a/shared/source/os_interface/windows/hw_device_id.h +++ b/shared/source/os_interface/windows/hw_device_id.h @@ -1,11 +1,12 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #pragma once +#include "shared/source/helpers/driver_model_type.h" #include "shared/source/os_interface/os_interface.h" #include "shared/source/os_interface/windows/wddm/um_km_data_translator.h" #include "shared/source/os_interface/windows/windows_wrapper.h" diff --git a/shared/test/common/mocks/mock_driver_model.h b/shared/test/common/mocks/mock_driver_model.h index 3d377f156a..f4723915e2 100644 --- a/shared/test/common/mocks/mock_driver_model.h +++ b/shared/test/common/mocks/mock_driver_model.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #pragma once +#include "shared/source/helpers/driver_model_type.h" #include "shared/source/os_interface/driver_info.h" #include "shared/source/os_interface/os_interface.h" diff --git a/shared/test/unit_test/device/neo_device_tests.cpp b/shared/test/unit_test/device/neo_device_tests.cpp index b773ee40c9..d63ac3cf86 100644 --- a/shared/test/unit_test/device/neo_device_tests.cpp +++ b/shared/test/unit_test/device/neo_device_tests.cpp @@ -8,7 +8,9 @@ #include "shared/source/compiler_interface/compiler_cache.h" #include "shared/source/device/device.h" #include "shared/source/gmm_helper/gmm.h" +#include "shared/source/helpers/driver_model_type.h" #include "shared/source/os_interface/device_factory.h" +#include "shared/source/os_interface/driver_info.h" #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" diff --git a/shared/test/unit_test/os_interface/windows/wddm_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm_tests.cpp index ad25b35788..7d565d73d2 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/gmm_helper/gmm.h" #include "shared/source/helpers/string.h" +#include "shared/source/os_interface/driver_info.h" #include "shared/source/os_interface/windows/wddm_allocation.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/os_interface/windows/wddm_fixture.h"