intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-24 21:18:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Refactor Drm::queryTopology() to take struct"

Browse Source 
This reverts commit f83b51e628.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2021-04-26 00:18:32 +02:00
committed by Compute-Runtime-Automation
parent a92798ec4f
commit 6bb76c82e3
6 changed files with 29 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
shared/source/os_interface/linux/hw_info_config.cpp
View File

@@ -90,43 +90,37 @@ int HwInfoConfig::configureHwInfo(const HardwareInfo *inHwInfo, HardwareInfo *ou
}
platform->usRevId = static_cast<unsigned short>(val);
Drm::QueryTopologyData topologyData = {};
int sliceCount;
int subSliceCount;
int euCount;
bool status = drm->queryTopology(*outHwInfo, topologyData);
bool status = drm->queryTopology(*outHwInfo, sliceCount, subSliceCount, euCount);
if (!status) {
PRINT_DEBUG_STRING(DebugManager.flags.PrintDebugMessages.get(), stderr, "%s", "WARNING: Topology query failed!\n");
topologyData.sliceCount = gtSystemInfo->SliceCount;
sliceCount = gtSystemInfo->SliceCount;
ret = drm->getEuTotal(topologyData.euCount);
ret = drm->getEuTotal(euCount);
if (ret != 0) {
PRINT_DEBUG_STRING(DebugManager.flags.PrintDebugMessages.get(), stderr, "%s", "FATAL: Cannot query EU total parameter!\n");
*outHwInfo = {};
return ret;
}
ret = drm->getSubsliceTotal(topologyData.subSliceCount);
ret = drm->getSubsliceTotal(subSliceCount);
if (ret != 0) {
PRINT_DEBUG_STRING(DebugManager.flags.PrintDebugMessages.get(), stderr, "%s", "FATAL: Cannot query subslice total parameter!\n");
*outHwInfo = {};
return ret;
}
topologyData.maxEuCount = topologyData.euCount / topologyData.subSliceCount;
topologyData.maxSliceCount = topologyData.sliceCount;
topologyData.maxSubSliceCount = topologyData.subSliceCount;
}
gtSystemInfo->SliceCount = static_cast<uint32_t>(topologyData.sliceCount);
gtSystemInfo->SubSliceCount = static_cast<uint32_t>(topologyData.subSliceCount);
gtSystemInfo->EUCount = static_cast<uint32_t>(topologyData.euCount);
gtSystemInfo->SliceCount = static_cast<uint32_t>(sliceCount);
gtSystemInfo->SubSliceCount = static_cast<uint32_t>(subSliceCount);
gtSystemInfo->EUCount = static_cast<uint32_t>(euCount);
gtSystemInfo->ThreadCount = this->threadsPerEu * gtSystemInfo->EUCount;
gtSystemInfo->MaxEuPerSubSlice = topologyData.maxEuCount;
gtSystemInfo->MaxSubSlicesSupported = topologyData.maxSubSliceCount;
gtSystemInfo->MaxSlicesSupported = topologyData.maxSliceCount;
uint64_t gttSizeQuery = 0;
featureTable->ftrSVM = true;