intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-04 15:53:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Remove duplicate FsAccess class definition

Browse Source 
Related-To: NEO-9661

Signed-off-by: Bellekallu Rajkiran <bellekallu.rajkiran@intel.com>
This commit is contained in:
Bellekallu Rajkiran
2023-11-30 16:56:59 +00:00
committed by Compute-Runtime-Automation
parent b92b5892b8
commit 3349fcaf75
83 changed files with 306 additions and 1057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
level_zero/sysman/source/api/ras/linux/sysman_os_ras_imp.cpp
View File

@@ -11,6 +11,7 @@
#include "shared/source/helpers/string.h"
#include "shared/source/os_interface/linux/system_info.h"
#include "level_zero/sysman/source/shared/linux/sysman_fs_access_interface.h"
#include "level_zero/sysman/source/shared/linux/zes_os_sysman_imp.h"
#include "drm/intel_hwconfig_types.h"

9
level_zero/sysman/source/api/ras/linux/sysman_os_ras_imp.h
View File

@@ -11,7 +11,6 @@
#include "level_zero/sysman/source/api/ras/sysman_os_ras.h"
#include "level_zero/sysman/source/device/sysman_device_imp.h"
#include "level_zero/sysman/source/shared/linux/pmu/sysman_pmu_imp.h"
#include "level_zero/sysman/source/shared/linux/sysman_fs_access.h"
#include "level_zero/sysman/source/sysman_const.h"
#include <map>
@@ -24,6 +23,8 @@ namespace Sysman {
class LinuxSysmanImp;
class FirmwareUtil;
class FsAccessInterface;
class SysFsAccessInterface;
class LinuxRasSources : NEO::NonCopyableOrMovableClass {
public:
@@ -43,7 +44,7 @@ class LinuxRasImp : public OsRas, NEO::NonCopyableOrMovableClass {
protected:
zes_ras_error_type_t osRasErrorType = {};
FsAccess *pFsAccess = nullptr;
FsAccessInterface *pFsAccess = nullptr;
LinuxSysmanImp *pLinuxSysmanImp = nullptr;
std::vector<std::unique_ptr<L0::Sysman::LinuxRasSources>> rasSources = {};
@@ -67,8 +68,8 @@ class LinuxRasSourceGt : public LinuxRasSources {
LinuxSysmanImp *pLinuxSysmanImp = nullptr;
zes_ras_error_type_t osRasErrorType = {};
PmuInterface *pPmuInterface = nullptr;
FsAccess *pFsAccess = nullptr;
SysfsAccess *pSysfsAccess = nullptr;
FsAccessInterface *pFsAccess = nullptr;
SysFsAccessInterface *pSysfsAccess = nullptr;
private:
void initRasErrors(ze_bool_t clear);

6
level_zero/sysman/source/api/ras/linux/sysman_os_ras_imp_gt.cpp
View File

@@ -8,9 +8,11 @@
#include "shared/source/debug_settings/debug_settings_manager.h"
#include "level_zero/sysman/source/api/ras/linux/sysman_os_ras_imp.h"
#include "level_zero/sysman/source/shared/linux/sysman_fs_access_interface.h"
#include "level_zero/sysman/source/shared/linux/zes_os_sysman_imp.h"
#include <cstring>
#include <sstream>
namespace L0 {
namespace Sysman {
@@ -59,7 +61,7 @@ static ze_result_t readI915EventsDirectory(LinuxSysmanImp *pLinuxSysmanImp, std:
// /sys/devices/i915_0000_01_00.0/events/
// all events are enumerated in sysfs at /sys/devices/i915_0000_01_00.0/events/
// For above example device is in PCI slot 0000:01:00.0:
SysfsAccess *pSysfsAccess = &pLinuxSysmanImp->getSysfsAccess();
SysFsAccessInterface *pSysfsAccess = &pLinuxSysmanImp->getSysfsAccess();
const std::string deviceDir("device");
const std::string sysDevicesDir("/sys/devices/");
std::string bdfDir;
@@ -76,7 +78,7 @@ static ze_result_t readI915EventsDirectory(LinuxSysmanImp *pLinuxSysmanImp, std:
if (eventDirectory != nullptr) {
*eventDirectory = sysfsNode;
}
FsAccess *pFsAccess = &pLinuxSysmanImp->getFsAccess();
FsAccessInterface *pFsAccess = &pLinuxSysmanImp->getFsAccess();
result = pFsAccess->listDirectory(sysfsNode, listOfEvents);
if (ZE_RESULT_SUCCESS != result) {
NEO::printDebugString(NEO::debugManager.flags.PrintDebugMessages.get(), stderr, "Error@ %s(): Failed to list directories from %s and returning error:0x%x \n", __FUNCTION__, sysfsNode.c_str(), ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);