intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 14:55:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Move all constants in sysman namespace

Browse Source 
- Use inline constexpr for declaring global variables
- Avoid using Macros
- Use string_view type instead of std::string

Signed-off-by: Jitendra Sharma <jitendra.sharma@intel.com>
This commit is contained in:
Jitendra Sharma
2024-09-21 22:22:17 +00:00
committed by Compute-Runtime-Automation
parent 7f6b259f0e
commit 82eacc88bf
13 changed files with 91 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
level_zero/sysman/source/shared/linux/kmd_interface/sysman_kmd_interface_i915_prelim.cpp
View File

@@ -166,7 +166,7 @@ void SysmanKmdInterfaceI915Prelim::getDriverVersion(char (&driverVersion)[ZES_ST
ze_result_t result = pFsAccess->read(agamaVersionFile, strVal);
if (ZE_RESULT_SUCCESS != result) {
NEO::printDebugString(NEO::debugManager.flags.PrintDebugMessages.get(), stderr, "Error@ %s(): Failed to read driver version from %s and returning error:0x%x \n", __FUNCTION__, agamaVersionFile.c_str(), result);
std::strncpy(driverVersion, unknown.c_str(), ZES_STRING_PROPERTY_SIZE);
std::strncpy(driverVersion, unknown.data(), ZES_STRING_PROPERTY_SIZE);
} else {
std::strncpy(driverVersion, strVal.c_str(), ZES_STRING_PROPERTY_SIZE);
}

2
level_zero/sysman/source/shared/linux/kmd_interface/sysman_kmd_interface_i915_upstream.cpp
View File

@@ -133,7 +133,7 @@ void SysmanKmdInterfaceI915Upstream::getDriverVersion(char (&driverVersion)[ZES_
ze_result_t result = pFsAccess->read(srcVersionFile, strVal);
if (ZE_RESULT_SUCCESS != result) {
NEO::printDebugString(NEO::debugManager.flags.PrintDebugMessages.get(), stderr, "Error@ %s(): Failed to read driver version from %s and returning error:0x%x\n", __FUNCTION__, srcVersionFile.c_str(), result);
std::strncpy(driverVersion, unknown.c_str(), ZES_STRING_PROPERTY_SIZE);
std::strncpy(driverVersion, unknown.data(), ZES_STRING_PROPERTY_SIZE);
} else {
std::strncpy(driverVersion, strVal.c_str(), ZES_STRING_PROPERTY_SIZE);
}

2
level_zero/sysman/source/shared/linux/kmd_interface/sysman_kmd_interface_xe.cpp
View File

@@ -140,7 +140,7 @@ void SysmanKmdInterfaceXe::getDriverVersion(char (&driverVersion)[ZES_STRING_PRO
ze_result_t result = pFsAccess->read(srcVersionFile, strVal);
if (ZE_RESULT_SUCCESS != result) {
NEO::printDebugString(NEO::debugManager.flags.PrintDebugMessages.get(), stderr, "Error@ %s(): Failed to read driver version from %s and returning error:0x%x\n", __FUNCTION__, srcVersionFile.c_str(), result);
std::strncpy(driverVersion, unknown.c_str(), ZES_STRING_PROPERTY_SIZE);
std::strncpy(driverVersion, unknown.data(), ZES_STRING_PROPERTY_SIZE);
} else {
std::strncpy(driverVersion, strVal.c_str(), ZES_STRING_PROPERTY_SIZE);
}

12
level_zero/sysman/source/shared/linux/product_helper/xe2_hpg_core/bmg/sysman_product_helper_bmg.cpp
View File

@@ -305,7 +305,7 @@ static ze_result_t getPciStatsValues(zes_pci_stats_t *pStats, std::map<std::stri
return ZE_RESULT_ERROR_NOT_AVAILABLE;
}
uint64_t rxCounter = PACK_INTO_64BIT(rxCounterMsb, rxCounterLsb);
uint64_t rxCounter = packInto64Bit(rxCounterMsb, rxCounterLsb);
uint32_t txCounterLsb = 0;
if (!PlatformMonitoringTech::readValue(keyOffsetMap, telemNodeDir, "reg_PCIESS_tx_bytecount_lsb", telemOffset, txCounterLsb)) {
@@ -317,7 +317,7 @@ static ze_result_t getPciStatsValues(zes_pci_stats_t *pStats, std::map<std::stri
return ZE_RESULT_ERROR_NOT_AVAILABLE;
}
uint64_t txCounter = PACK_INTO_64BIT(txCounterMsb, txCounterLsb);
uint64_t txCounter = packInto64Bit(txCounterMsb, txCounterLsb);
uint32_t rxPacketCounterLsb = 0;
if (!PlatformMonitoringTech::readValue(keyOffsetMap, telemNodeDir, "reg_PCIESS_rx_pktcount_lsb", telemOffset, rxPacketCounterLsb)) {
@@ -329,7 +329,7 @@ static ze_result_t getPciStatsValues(zes_pci_stats_t *pStats, std::map<std::stri
return ZE_RESULT_ERROR_NOT_AVAILABLE;
}
uint64_t rxPacketCounter = PACK_INTO_64BIT(rxPacketCounterMsb, rxPacketCounterLsb);
uint64_t rxPacketCounter = packInto64Bit(rxPacketCounterMsb, rxPacketCounterLsb);
uint32_t txPacketCounterLsb = 0;
if (!PlatformMonitoringTech::readValue(keyOffsetMap, telemNodeDir, "reg_PCIESS_tx_pktcount_lsb", telemOffset, txPacketCounterLsb)) {
@@ -341,7 +341,7 @@ static ze_result_t getPciStatsValues(zes_pci_stats_t *pStats, std::map<std::stri
return ZE_RESULT_ERROR_NOT_AVAILABLE;
}
uint64_t txPacketCounter = PACK_INTO_64BIT(txPacketCounterMsb, txPacketCounterLsb);
uint64_t txPacketCounter = packInto64Bit(txPacketCounterMsb, txPacketCounterLsb);
pStats->speed.gen = -1;
pStats->speed.width = -1;
@@ -493,7 +493,7 @@ static ze_result_t getMemoryBandwidthTimestamp(const std::map<std::string, uint6
return ZE_RESULT_ERROR_NOT_AVAILABLE;
}
pBandwidth->timestamp = PACK_INTO_64BIT(timeStampH, timeStampL);
pBandwidth->timestamp = packInto64Bit(timeStampH, timeStampL);
return ZE_RESULT_SUCCESS;
}
@@ -514,7 +514,7 @@ static ze_result_t getCounterValues(const std::vector<std::pair<const std::strin
return ZE_RESULT_ERROR_NOT_AVAILABLE;
}
totalCounter += PACK_INTO_64BIT(regH, regL);
totalCounter += packInto64Bit(regH, regL);
}
return ZE_RESULT_SUCCESS;

14
level_zero/sysman/source/shared/windows/product_helper/xe2_hpg_core/bmg/sysman_product_helper_bmg.cpp
View File

@@ -18,8 +18,6 @@
namespace L0 {
namespace Sysman {
#define PACK_INTO_64BIT(valueH, valueL) ((static_cast<uint64_t>(valueH) << 32) | static_cast<uint64_t>(valueL))
constexpr static auto gfxProduct = IGFX_BMG;
static std::map<unsigned long, std::map<std::string, uint32_t>> guidToKeyOffsetMap = {
@@ -396,7 +394,7 @@ ze_result_t SysmanProductHelperHw<gfxProduct>::getPciStats(zes_pci_stats_t *pSta
"readValue call failed for register key rx_byte_count_msb\n");
return status;
}
pStats->rxCounter = PACK_INTO_64BIT(rxCounterH, rxCounterL);
pStats->rxCounter = packInto64Bit(rxCounterH, rxCounterL);
// tx counter calculation
uint32_t txCounterL = 0;
@@ -414,7 +412,7 @@ ze_result_t SysmanProductHelperHw<gfxProduct>::getPciStats(zes_pci_stats_t *pSta
"readValue call failed for register key tx_byte_count_msb\n");
return status;
}
pStats->txCounter = PACK_INTO_64BIT(txCounterH, txCounterL);
pStats->txCounter = packInto64Bit(txCounterH, txCounterL);
// packet counter calculation
uint32_t rxPacketCounterL = 0;
@@ -449,7 +447,7 @@ ze_result_t SysmanProductHelperHw<gfxProduct>::getPciStats(zes_pci_stats_t *pSta
return status;
}
pStats->packetCounter = PACK_INTO_64BIT(txPacketCounterH, txPacketCounterL) + PACK_INTO_64BIT(rxPacketCounterH, rxPacketCounterL);
pStats->packetCounter = packInto64Bit(txPacketCounterH, txPacketCounterL) + packInto64Bit(rxPacketCounterH, rxPacketCounterL);
pStats->timestamp = SysmanDevice::getSysmanTimestamp();
return status;
@@ -524,7 +522,7 @@ ze_result_t SysmanProductHelperHw<gfxProduct>::getMemoryBandWidth(zes_mem_bandwi
return status;
}
uint64_t readCounter = PACK_INTO_64BIT(readRegisterH, readRegisterL);
uint64_t readCounter = packInto64Bit(readRegisterH, readRegisterL);
pBandwidth->readCounter += readCounter;
}
@@ -546,7 +544,7 @@ ze_result_t SysmanProductHelperHw<gfxProduct>::getMemoryBandWidth(zes_mem_bandwi
return status;
}
uint64_t writeCounter = PACK_INTO_64BIT(writeRegisterH, writeRegisterL);
uint64_t writeCounter = packInto64Bit(writeRegisterH, writeRegisterL);
pBandwidth->writeCounter += writeCounter;
}
@@ -581,7 +579,7 @@ ze_result_t SysmanProductHelperHw<gfxProduct>::getMemoryBandWidth(zes_mem_bandwi
return status;
}
pBandwidth->timestamp = PACK_INTO_64BIT(timeStampH, timeStampL);
pBandwidth->timestamp = packInto64Bit(timeStampH, timeStampL);
return status;
}