refactor: remove intel_hwconfig_types file from third party

remove not needed querying of vs/hs/ds/ps/gs threads

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2023-12-27 11:31:10 +00:00
committed by Compute-Runtime-Automation
parent 8360d90fa3
commit 368070069e
25 changed files with 99 additions and 356 deletions

View File

@@ -882,11 +882,6 @@ void Drm::setupSystemInfo(HardwareInfo *hwInfo, SystemInfo *sysInfo) {
GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
gtSysInfo->ThreadCount = gtSysInfo->EUCount * sysInfo->getNumThreadsPerEu();
gtSysInfo->MemoryType = sysInfo->getMemoryType();
gtSysInfo->TotalVsThreads = sysInfo->getTotalVsThreads();
gtSysInfo->TotalHsThreads = sysInfo->getTotalHsThreads();
gtSysInfo->TotalDsThreads = sysInfo->getTotalDsThreads();
gtSysInfo->TotalGsThreads = sysInfo->getTotalGsThreads();
gtSysInfo->TotalPsThreadsWindowerRange = sysInfo->getTotalPsThreads();
gtSysInfo->MaxEuPerSubSlice = sysInfo->getMaxEuPerDualSubSlice();
gtSysInfo->MaxSlicesSupported = sysInfo->getMaxSlicesSupported();
if (sysInfo->getMaxDualSubSlicesSupported() > 0) {

View File

@@ -11,8 +11,6 @@
#include "shared/source/helpers/debug_helpers.h"
#include "shared/source/helpers/hw_info.h"
#include "drm/intel_hwconfig_types.h"
namespace NEO {
SystemInfo::SystemInfo(const std::vector<uint32_t> &inputData) {
@@ -29,46 +27,31 @@ void SystemInfo::parseDeviceBlob(const std::vector<uint32_t> &inputData) {
/* Attribute IDs range */
DEBUG_BREAK_IF(data[i] < 1);
if (INTEL_HWCONFIG_MAX_SLICES_SUPPORTED == data[i]) {
if (DeviceBlobConstants::maxSlicesSupported == data[i]) {
maxSlicesSupported = data[i + 2];
}
if (INTEL_HWCONFIG_MAX_DUAL_SUBSLICES_SUPPORTED == data[i]) {
if (DeviceBlobConstants::maxDualSubSlicesSupported == data[i]) {
maxDualSubSlicesSupported = data[i + 2];
}
if (INTEL_HWCONFIG_MAX_NUM_EU_PER_DSS == data[i]) {
if (DeviceBlobConstants::maxEuPerDualSubSlice == data[i]) {
maxEuPerDualSubSlice = data[i + 2];
}
if (INTEL_HWCONFIG_MAX_MEMORY_CHANNELS == data[i]) {
if (DeviceBlobConstants::maxMemoryChannels == data[i]) {
maxMemoryChannels = data[i + 2];
}
if (INTEL_HWCONFIG_MEMORY_TYPE == data[i]) {
if (DeviceBlobConstants::memoryType == data[i]) {
memoryType = data[i + 2];
}
if (INTEL_HWCONFIG_NUM_THREADS_PER_EU == data[i]) {
if (DeviceBlobConstants::numThreadsPerEu == data[i]) {
numThreadsPerEu = data[i + 2];
}
if (INTEL_HWCONFIG_TOTAL_VS_THREADS == data[i]) {
totalVsThreads = data[i + 2];
}
if (INTEL_HWCONFIG_TOTAL_HS_THREADS == data[i]) {
totalHsThreads = data[i + 2];
}
if (INTEL_HWCONFIG_TOTAL_DS_THREADS == data[i]) {
totalDsThreads = data[i + 2];
}
if (INTEL_HWCONFIG_TOTAL_GS_THREADS == data[i]) {
totalGsThreads = data[i + 2];
}
if (INTEL_HWCONFIG_TOTAL_PS_THREADS == data[i]) {
totalPsThreads = data[i + 2];
}
if (INTEL_HWCONFIG_MAX_RCS == data[i]) {
if (DeviceBlobConstants::maxRcs == data[i]) {
maxRCS = data[i + 2];
}
if (INTEL_HWCONFIG_MAX_CCS == data[i]) {
if (DeviceBlobConstants::maxCcs == data[i]) {
maxCCS = data[i + 2];
}
if (INTEL_HWCONFIG_L3_BANK_SIZE_IN_KB == data[i]) {
if (DeviceBlobConstants::l3BankSizeInKb == data[i]) {
l3BankSizeInKb = data[i + 2];
}
/* Skip to next attribute */

View File

@@ -12,6 +12,26 @@
namespace NEO {
struct HardwareInfo;
namespace DeviceBlobConstants {
constexpr uint32_t maxSlicesSupported = 1;
constexpr uint32_t maxDualSubSlicesSupported = 2;
constexpr uint32_t maxEuPerDualSubSlice = 3;
constexpr uint32_t maxMemoryChannels = 10;
constexpr uint32_t memoryType = 11;
constexpr uint32_t numThreadsPerEu = 15;
constexpr uint32_t maxRcs = 23;
constexpr uint32_t maxCcs = 24;
constexpr uint32_t l3BankSizeInKb = 64;
enum MemoryType {
lpddr4,
lpddr5,
hbm2,
hbm2e,
gddr6
};
} // namespace DeviceBlobConstants
struct SystemInfo {
SystemInfo(const std::vector<uint32_t> &inputData);
@@ -24,11 +44,6 @@ struct SystemInfo {
uint32_t getMemoryType() const { return memoryType; }
uint32_t getMaxMemoryChannels() const { return maxMemoryChannels; }
uint32_t getNumThreadsPerEu() const { return numThreadsPerEu; }
uint32_t getTotalVsThreads() const { return totalVsThreads; }
uint32_t getTotalHsThreads() const { return totalHsThreads; }
uint32_t getTotalDsThreads() const { return totalDsThreads; }
uint32_t getTotalGsThreads() const { return totalGsThreads; }
uint32_t getTotalPsThreads() const { return totalPsThreads; }
uint32_t getMaxRCS() const { return maxRCS; }
uint32_t getMaxCCS() const { return maxCCS; }
uint32_t getL3BankSizeInKb() const { return l3BankSizeInKb; }
@@ -44,11 +59,6 @@ struct SystemInfo {
uint32_t memoryType = 0;
uint32_t maxMemoryChannels = 0;
uint32_t numThreadsPerEu = 0;
uint32_t totalVsThreads = 0;
uint32_t totalHsThreads = 0;
uint32_t totalDsThreads = 0;
uint32_t totalGsThreads = 0;
uint32_t totalPsThreads = 0;
uint32_t maxRCS = 0;
uint32_t maxCCS = 0;
uint32_t l3BankSizeInKb = 0;