From 82ed9e9a96a224287122e92a68f6857f7cee83ee Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Mon, 22 May 2023 13:52:14 +0000 Subject: [PATCH] refactor: simplify L0 tools/sysman headers Signed-off-by: Mateusz Jablonski --- level_zero/sysman/source/pci/linux/os_pci_imp.cpp | 2 ++ level_zero/sysman/source/pci/linux/os_pci_imp.h | 7 +++++-- level_zero/sysman/source/pci/os_pci.h | 4 ++-- level_zero/sysman/source/pci/pci.h | 2 +- level_zero/sysman/source/pci/pci_imp.cpp | 3 +++ level_zero/sysman/source/pci/pci_imp.h | 5 ++--- level_zero/sysman/source/pci/windows/os_pci_imp.h | 4 +--- level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp | 2 ++ level_zero/tools/source/sysman/pci/linux/os_pci_imp.h | 5 +++-- level_zero/tools/source/sysman/pci/os_pci.h | 4 ++-- level_zero/tools/source/sysman/pci/pci.h | 5 ++--- level_zero/tools/source/sysman/pci/pci_imp.cpp | 7 ++++++- level_zero/tools/source/sysman/pci/pci_imp.h | 5 ++--- level_zero/tools/source/sysman/pci/windows/os_pci_imp.cpp | 1 + level_zero/tools/source/sysman/pci/windows/os_pci_imp.h | 2 -- .../unit_tests/sources/sysman/pci/windows/test_zes_pci.cpp | 1 + .../sources/sysman/windows/test_sysman_manager.cpp | 1 + 17 files changed, 36 insertions(+), 24 deletions(-) diff --git a/level_zero/sysman/source/pci/linux/os_pci_imp.cpp b/level_zero/sysman/source/pci/linux/os_pci_imp.cpp index f9a6c6dcd6..5ed53b295c 100644 --- a/level_zero/sysman/source/pci/linux/os_pci_imp.cpp +++ b/level_zero/sysman/source/pci/linux/os_pci_imp.cpp @@ -10,6 +10,8 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/utilities/directory.h" +#include "level_zero/sysman/source/linux/fs_access.h" +#include "level_zero/sysman/source/linux/os_sysman_imp.h" #include "level_zero/sysman/source/pci/pci_imp.h" #include "level_zero/sysman/source/sysman_const.h" diff --git a/level_zero/sysman/source/pci/linux/os_pci_imp.h b/level_zero/sysman/source/pci/linux/os_pci_imp.h index 4c693480fb..5ea263b59c 100644 --- a/level_zero/sysman/source/pci/linux/os_pci_imp.h +++ b/level_zero/sysman/source/pci/linux/os_pci_imp.h @@ -9,14 +9,17 @@ #include "shared/source/helpers/non_copyable_or_moveable.h" #include "shared/source/os_interface/linux/sys_calls.h" -#include "level_zero/sysman/source/linux/fs_access.h" -#include "level_zero/sysman/source/linux/os_sysman_imp.h" #include "level_zero/sysman/source/pci/os_pci.h" #include +#include namespace L0 { namespace Sysman { +class SysfsAccess; +class FsAccess; +class LinuxSysmanImp; +struct OsSysman; class LinuxPciImp : public OsPci, NEO::NonCopyableOrMovableClass { public: diff --git a/level_zero/sysman/source/pci/os_pci.h b/level_zero/sysman/source/pci/os_pci.h index 04baa8d7b4..b57790ac2e 100644 --- a/level_zero/sysman/source/pci/os_pci.h +++ b/level_zero/sysman/source/pci/os_pci.h @@ -6,8 +6,7 @@ */ #pragma once - -#include "level_zero/sysman/source/os_sysman.h" +#include #include @@ -16,6 +15,7 @@ namespace Sysman { int64_t convertPcieSpeedFromGTsToBs(double maxLinkSpeedInGt); int32_t convertLinkSpeedToPciGen(double speed); double convertPciGenToLinkSpeed(uint32_t gen); +struct OsSysman; class OsPci { public: virtual ze_result_t getPciBdf(zes_pci_properties_t &pciProperties) = 0; diff --git a/level_zero/sysman/source/pci/pci.h b/level_zero/sysman/source/pci/pci.h index b7757f05a9..1f39a3c39f 100644 --- a/level_zero/sysman/source/pci/pci.h +++ b/level_zero/sysman/source/pci/pci.h @@ -13,7 +13,7 @@ namespace Sysman { class Pci { public: - virtual ~Pci(){}; + virtual ~Pci() = default; virtual ze_result_t pciStaticProperties(zes_pci_properties_t *pProperties) = 0; virtual ze_result_t pciGetInitializedBars(uint32_t *pCount, zes_pci_bar_properties_t *pProperties) = 0; virtual ze_result_t pciGetState(zes_pci_state_t *pState) = 0; diff --git a/level_zero/sysman/source/pci/pci_imp.cpp b/level_zero/sysman/source/pci/pci_imp.cpp index e05e1dd6f2..086bfbd068 100644 --- a/level_zero/sysman/source/pci/pci_imp.cpp +++ b/level_zero/sysman/source/pci/pci_imp.cpp @@ -11,8 +11,11 @@ #include "shared/source/helpers/string.h" #include "shared/source/utilities/directory.h" +#include "level_zero/sysman/source/pci/os_pci.h" #include "level_zero/sysman/source/sysman_const.h" +#include + namespace L0 { namespace Sysman { diff --git a/level_zero/sysman/source/pci/pci_imp.h b/level_zero/sysman/source/pci/pci_imp.h index 091e5df4a0..2528d6c15e 100644 --- a/level_zero/sysman/source/pci/pci_imp.h +++ b/level_zero/sysman/source/pci/pci_imp.h @@ -7,9 +7,7 @@ #pragma once #include "shared/source/helpers/non_copyable_or_moveable.h" -#include "shared/source/memory_manager/memory_manager.h" -#include "level_zero/sysman/source/pci/os_pci.h" #include "level_zero/sysman/source/pci/pci.h" #include @@ -17,6 +15,8 @@ namespace L0 { namespace Sysman { +class OsPci; +struct OsSysman; class PciImp : public L0::Sysman::Pci, NEO::NonCopyableOrMovableClass { public: @@ -26,7 +26,6 @@ class PciImp : public L0::Sysman::Pci, NEO::NonCopyableOrMovableClass { ze_result_t pciGetState(zes_pci_state_t *pState) override; void pciGetStaticFields(); - PciImp() = default; PciImp(L0::Sysman::OsSysman *pOsSysman) : pOsSysman(pOsSysman){}; ~PciImp() override; L0::Sysman::OsPci *pOsPci = nullptr; diff --git a/level_zero/sysman/source/pci/windows/os_pci_imp.h b/level_zero/sysman/source/pci/windows/os_pci_imp.h index 9ca24fb0c4..e31a7e129e 100644 --- a/level_zero/sysman/source/pci/windows/os_pci_imp.h +++ b/level_zero/sysman/source/pci/windows/os_pci_imp.h @@ -9,11 +9,10 @@ #include "shared/source/helpers/non_copyable_or_moveable.h" #include "level_zero/sysman/source/pci/os_pci.h" -#include "level_zero/sysman/source/windows/os_sysman_imp.h" namespace L0 { namespace Sysman { -class KmdSysManager; +struct OsSysman; class WddmPciImp : public OsPci, NEO::NonCopyableOrMovableClass { public: ze_result_t getPciBdf(zes_pci_properties_t &pciProperties) override; @@ -24,7 +23,6 @@ class WddmPciImp : public OsPci, NEO::NonCopyableOrMovableClass { bool resizableBarEnabled(uint32_t barIndex) override; ze_result_t initializeBarProperties(std::vector &pBarProperties) override; WddmPciImp(OsSysman *pOsSysman); - WddmPciImp() = default; ~WddmPciImp() override = default; }; diff --git a/level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp b/level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp index bafc9eae26..4801b5cdd3 100644 --- a/level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp +++ b/level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp @@ -8,10 +8,12 @@ #include "level_zero/tools/source/sysman/pci/linux/os_pci_imp.h" #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/memory_manager/memory_manager.h" #include "shared/source/utilities/directory.h" #include "level_zero/core/source/driver/driver_handle.h" #include "level_zero/tools/source/sysman/linux/fs_access.h" +#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h" #include "level_zero/tools/source/sysman/pci/pci_imp.h" #include "level_zero/tools/source/sysman/sysman_const.h" diff --git a/level_zero/tools/source/sysman/pci/linux/os_pci_imp.h b/level_zero/tools/source/sysman/pci/linux/os_pci_imp.h index 8124ef19f0..9782bcdfaa 100644 --- a/level_zero/tools/source/sysman/pci/linux/os_pci_imp.h +++ b/level_zero/tools/source/sysman/pci/linux/os_pci_imp.h @@ -9,13 +9,14 @@ #include "shared/source/helpers/non_copyable_or_moveable.h" #include "shared/source/os_interface/linux/sys_calls.h" -#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h" #include "level_zero/tools/source/sysman/pci/os_pci.h" +#include namespace L0 { - class SysfsAccess; class FsAccess; +class LinuxSysmanImp; +struct OsSysman; class LinuxPciImp : public OsPci, NEO::NonCopyableOrMovableClass { public: diff --git a/level_zero/tools/source/sysman/pci/os_pci.h b/level_zero/tools/source/sysman/pci/os_pci.h index a6b346c3fe..4ee2d48c2d 100644 --- a/level_zero/tools/source/sysman/pci/os_pci.h +++ b/level_zero/tools/source/sysman/pci/os_pci.h @@ -6,8 +6,7 @@ */ #pragma once - -#include "level_zero/tools/source/sysman/os_sysman.h" +#include #include @@ -15,6 +14,7 @@ namespace L0 { int64_t convertPcieSpeedFromGTsToBs(double maxLinkSpeedInGt); int32_t convertLinkSpeedToPciGen(double speed); double convertPciGenToLinkSpeed(uint32_t gen); +struct OsSysman; class OsPci { public: virtual ze_result_t getPciBdf(zes_pci_properties_t &pciProperties) = 0; diff --git a/level_zero/tools/source/sysman/pci/pci.h b/level_zero/tools/source/sysman/pci/pci.h index 7d59bbc622..3ef63fb2d4 100644 --- a/level_zero/tools/source/sysman/pci/pci.h +++ b/level_zero/tools/source/sysman/pci/pci.h @@ -1,18 +1,17 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #pragma once -#include "level_zero/tools/source/sysman/sysman_const.h" #include namespace L0 { class Pci { public: - virtual ~Pci(){}; + virtual ~Pci() = default; virtual ze_result_t pciStaticProperties(zes_pci_properties_t *pProperties) = 0; virtual ze_result_t pciGetInitializedBars(uint32_t *pCount, zes_pci_bar_properties_t *pProperties) = 0; virtual ze_result_t pciGetState(zes_pci_state_t *pState) = 0; diff --git a/level_zero/tools/source/sysman/pci/pci_imp.cpp b/level_zero/tools/source/sysman/pci/pci_imp.cpp index ebd224e979..3958677712 100644 --- a/level_zero/tools/source/sysman/pci/pci_imp.cpp +++ b/level_zero/tools/source/sysman/pci/pci_imp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,6 +11,11 @@ #include "shared/source/helpers/string.h" #include "shared/source/utilities/directory.h" +#include "level_zero/tools/source/sysman/pci/os_pci.h" +#include "level_zero/tools/source/sysman/sysman_const.h" + +#include + namespace L0 { // diff --git a/level_zero/tools/source/sysman/pci/pci_imp.h b/level_zero/tools/source/sysman/pci/pci_imp.h index 0b98b45d8d..7b48189c65 100644 --- a/level_zero/tools/source/sysman/pci/pci_imp.h +++ b/level_zero/tools/source/sysman/pci/pci_imp.h @@ -7,9 +7,7 @@ #pragma once #include "shared/source/helpers/non_copyable_or_moveable.h" -#include "shared/source/memory_manager/memory_manager.h" -#include "os_pci.h" #include "pci.h" #include @@ -17,6 +15,8 @@ namespace L0 { +class OsPci; +struct OsSysman; class PciImp : public Pci, NEO::NonCopyableOrMovableClass { public: void init() override; @@ -25,7 +25,6 @@ class PciImp : public Pci, NEO::NonCopyableOrMovableClass { ze_result_t pciGetState(zes_pci_state_t *pState) override; void pciGetStaticFields(); - PciImp() = default; PciImp(OsSysman *pOsSysman) : pOsSysman(pOsSysman){}; ~PciImp() override; OsPci *pOsPci = nullptr; diff --git a/level_zero/tools/source/sysman/pci/windows/os_pci_imp.cpp b/level_zero/tools/source/sysman/pci/windows/os_pci_imp.cpp index 6a083c3941..2035afc573 100644 --- a/level_zero/tools/source/sysman/pci/windows/os_pci_imp.cpp +++ b/level_zero/tools/source/sysman/pci/windows/os_pci_imp.cpp @@ -12,6 +12,7 @@ #include "level_zero/core/source/device/device.h" #include "level_zero/core/source/driver/driver_handle.h" #include "level_zero/tools/source/sysman/windows/kmd_sys_manager.h" +#include "level_zero/tools/source/sysman/windows/os_sysman_imp.h" namespace L0 { diff --git a/level_zero/tools/source/sysman/pci/windows/os_pci_imp.h b/level_zero/tools/source/sysman/pci/windows/os_pci_imp.h index 32a8610d8f..26d11f884d 100644 --- a/level_zero/tools/source/sysman/pci/windows/os_pci_imp.h +++ b/level_zero/tools/source/sysman/pci/windows/os_pci_imp.h @@ -9,7 +9,6 @@ #include "shared/source/helpers/non_copyable_or_moveable.h" #include "level_zero/tools/source/sysman/pci/os_pci.h" -#include "level_zero/tools/source/sysman/windows/os_sysman_imp.h" namespace L0 { class KmdSysManager; @@ -23,7 +22,6 @@ class WddmPciImp : public OsPci, NEO::NonCopyableOrMovableClass { bool resizableBarEnabled(uint32_t barIndex) override; ze_result_t initializeBarProperties(std::vector &pBarProperties) override; WddmPciImp(OsSysman *pOsSysman); - WddmPciImp() = default; ~WddmPciImp() override = default; protected: diff --git a/level_zero/tools/test/unit_tests/sources/sysman/pci/windows/test_zes_pci.cpp b/level_zero/tools/test/unit_tests/sources/sysman/pci/windows/test_zes_pci.cpp index 183847694c..cc48909042 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/pci/windows/test_zes_pci.cpp +++ b/level_zero/tools/test/unit_tests/sources/sysman/pci/windows/test_zes_pci.cpp @@ -6,6 +6,7 @@ */ #include "level_zero/core/test/unit_tests/mocks/mock_memory_manager.h" +#include "level_zero/tools/source/sysman/sysman_const.h" #include "level_zero/tools/test/unit_tests/sources/sysman/windows/mock_sysman_fixture.h" #include "mock_pci.h" diff --git a/level_zero/tools/test/unit_tests/sources/sysman/windows/test_sysman_manager.cpp b/level_zero/tools/test/unit_tests/sources/sysman/windows/test_sysman_manager.cpp index ef1de16236..024b3631ee 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/windows/test_sysman_manager.cpp +++ b/level_zero/tools/test/unit_tests/sources/sysman/windows/test_sysman_manager.cpp @@ -6,6 +6,7 @@ */ #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" +#include "level_zero/tools/source/sysman/sysman_const.h" #include "level_zero/tools/source/sysman/sysman_imp.h" #include "level_zero/tools/source/sysman/windows/os_sysman_imp.h" #include "level_zero/tools/test/unit_tests/sources/sysman/windows/mock_kmd_sys_manager.h"