refactor: simplify L0 tools/sysman headers

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

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"
 

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 <fcntl.h>
+#include <memory>
 
 namespace L0 {
 namespace Sysman {
+class SysfsAccess;
+class FsAccess;
+class LinuxSysmanImp;
+struct OsSysman;
 
 class LinuxPciImp : public OsPci, NEO::NonCopyableOrMovableClass {
   public:

level_zero/sysman/source/pci/os_pci.h

@@ -6,8 +6,7 @@
  */
 
 #pragma once
-
-#include "level_zero/sysman/source/os_sysman.h"
+#include <level_zero/zes_api.h>
 
 #include <vector>
 
@@ -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;

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;

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 <algorithm>
+
 namespace L0 {
 namespace Sysman {
 

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 <mutex>
@@ -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;

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<zes_pci_bar_properties_t *> &pBarProperties) override;
     WddmPciImp(OsSysman *pOsSysman);
-    WddmPciImp() = default;
     ~WddmPciImp() override = default;
 };
 

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"
 

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 <memory>
 namespace L0 {
-
 class SysfsAccess;
 class FsAccess;
+class LinuxSysmanImp;
+struct OsSysman;
 
 class LinuxPciImp : public OsPci, NEO::NonCopyableOrMovableClass {
   public:

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 <level_zero/zes_api.h>
 
 #include <vector>
 
@@ -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;

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 <level_zero/zes_api.h>
 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;

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 <algorithm>
+
 namespace L0 {
 
 //

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 <mutex>
@@ -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;

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 {
 

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<zes_pci_bar_properties_t *> &pBarProperties) override;
     WddmPciImp(OsSysman *pOsSysman);
-    WddmPciImp() = default;
     ~WddmPciImp() override = default;
 
   protected:

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"

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"