refactor: simplify L0 tools/sysman headers

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2023-05-22 13:52:14 +00:00
committed by Compute-Runtime-Automation
parent 6e93dd8068
commit 82ed9e9a96
17 changed files with 36 additions and 24 deletions

View File

@@ -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"

View File

@@ -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:

View File

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

View File

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

View File

@@ -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 {

View File

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

View File

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