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 Drm::queryTopology() to take struct

Browse Source 
Related-To: NEO-5640

Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
This commit is contained in:
Mateusz Hoppe
2021-04-22 20:53:25 +00:00
committed by Compute-Runtime-Automation
parent 495841812f
commit f83b51e628
6 changed files with 109 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
shared/source/os_interface/linux/drm_neo.cpp
View File

@@ -307,33 +307,40 @@ int Drm::getErrno() {
int Drm::setupHardwareInfo(DeviceDescriptor *device, bool setupFeatureTableAndWorkaroundTable) {
HardwareInfo *hwInfo = const_cast<HardwareInfo *>(device->pHwInfo);
int ret;
int sliceTotal;
int subSliceTotal;
int euTotal;
bool status = queryTopology(*hwInfo, sliceTotal, subSliceTotal, euTotal);
Drm::QueryTopologyData topologyData = {};
bool status = queryTopology(*hwInfo, topologyData);
if (!status) {
PRINT_DEBUG_STRING(DebugManager.flags.PrintDebugMessages.get(), stderr, "%s", "WARNING: Topology query failed!\n");
sliceTotal = hwInfo->gtSystemInfo.SliceCount;
topologyData.sliceCount = hwInfo->gtSystemInfo.SliceCount;
ret = getEuTotal(euTotal);
ret = getEuTotal(topologyData.euCount);
if (ret != 0) {
PRINT_DEBUG_STRING(DebugManager.flags.PrintDebugMessages.get(), stderr, "%s", "FATAL: Cannot query EU total parameter!\n");
return ret;
}
ret = getSubsliceTotal(subSliceTotal);
ret = getSubsliceTotal(topologyData.subSliceCount);
if (ret != 0) {
PRINT_DEBUG_STRING(DebugManager.flags.PrintDebugMessages.get(), stderr, "%s", "FATAL: Cannot query subslice total parameter!\n");
return ret;
}
topologyData.maxEuCount = topologyData.euCount;
topologyData.maxSliceCount = topologyData.sliceCount;
topologyData.maxSubSliceCount = topologyData.subSliceCount;
}
hwInfo->gtSystemInfo.SliceCount = static_cast<uint32_t>(sliceTotal);
hwInfo->gtSystemInfo.SubSliceCount = static_cast<uint32_t>(subSliceTotal);
hwInfo->gtSystemInfo.EUCount = static_cast<uint32_t>(euTotal);
hwInfo->gtSystemInfo.SliceCount = static_cast<uint32_t>(topologyData.sliceCount);
hwInfo->gtSystemInfo.SubSliceCount = static_cast<uint32_t>(topologyData.subSliceCount);
hwInfo->gtSystemInfo.EUCount = static_cast<uint32_t>(topologyData.euCount);
hwInfo->gtSystemInfo.MaxSubSlicesSupported = topologyData.maxSubSliceCount;
hwInfo->gtSystemInfo.MaxDualSubSlicesSupported = topologyData.maxSubSliceCount;
hwInfo->gtSystemInfo.MaxSlicesSupported = topologyData.maxSliceCount;
status = querySystemInfo();
if (!status) {

12
shared/source/os_interface/linux/drm_neo.h
View File

@@ -65,6 +65,16 @@ class Drm {
MaxSize
};
struct QueryTopologyData {
int sliceCount;
int subSliceCount;
int euCount;
int maxSliceCount;
int maxSubSliceCount;
int maxEuCount;
};
virtual ~Drm();
virtual int ioctl(unsigned long request, void *arg);
@@ -104,7 +114,7 @@ class Drm {
MOCKABLE_VIRTUAL bool querySystemInfo();
MOCKABLE_VIRTUAL bool queryEngineInfo();
MOCKABLE_VIRTUAL bool queryMemoryInfo();
bool queryTopology(const HardwareInfo &hwInfo, int &sliceCount, int &subSliceCount, int &euCount);
bool queryTopology(const HardwareInfo &hwInfo, QueryTopologyData &data);
bool createVirtualMemoryAddressSpace(uint32_t vmCount);
void destroyVirtualMemoryAddressSpace();
uint32_t getVirtualMemoryAddressSpace(uint32_t vmId);

8
shared/source/os_interface/linux/drm_query_extended.cpp
View File

@@ -11,7 +11,7 @@
namespace NEO {
bool Drm::queryTopology(const HardwareInfo &hwInfo, int &sliceCount, int &subSliceCount, int &euCount) {
bool Drm::queryTopology(const HardwareInfo &hwInfo, QueryTopologyData &topologyData) {
int32_t length;
auto dataQuery = this->query(DRM_I915_QUERY_TOPOLOGY_INFO, DrmQueryItemFlags::topology, length);
auto data = reinterpret_cast<drm_i915_query_topology_info *>(dataQuery.get());
@@ -20,7 +20,11 @@ bool Drm::queryTopology(const HardwareInfo &hwInfo, int &sliceCount, int &subSli
return false;
}
return translateTopologyInfo(data, sliceCount, subSliceCount, euCount);
topologyData.maxSliceCount = data->max_slices;
topologyData.maxSubSliceCount = data->max_subslices;
topologyData.maxEuCount = data->max_eus_per_subslice;
return translateTopologyInfo(data, topologyData.sliceCount, topologyData.subSliceCount, topologyData.euCount);
}
bool Drm::isDebugAttachAvailable() {

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

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