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

fix: init releaseHelper after ipVersion setup

Browse Source 
Related-To: NEO-7786
Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
This commit is contained in:
Kamil Kopryk
2023-06-06 11:41:57 +00:00
committed by Compute-Runtime-Automation
parent 831363e51b
commit dadd19e17b
6 changed files with 86 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
shared/source/os_interface/device_factory.cpp
View File

@@ -57,7 +57,13 @@ bool DeviceFactory::prepareDeviceEnvironmentsForProductFamilyOverride(ExecutionE
for (auto rootDeviceIndex = 0u; rootDeviceIndex < numRootDevices; rootDeviceIndex++) {
auto &rootDeviceEnvironment = *executionEnvironment.rootDeviceEnvironments[rootDeviceIndex].get();
rootDeviceEnvironment.setHwInfoAndInitHelpers(hwInfoConst);
rootDeviceEnvironment.setHwInfo(hwInfoConst);
rootDeviceEnvironment.initProductHelper();
rootDeviceEnvironment.initGfxCoreHelper();
rootDeviceEnvironment.initApiGfxCoreHelper();
rootDeviceEnvironment.initCompilerProductHelper();
auto hardwareInfo = rootDeviceEnvironment.getMutableHardwareInfo();
if (DebugManager.flags.OverrideRevision.get() != -1) {
@@ -92,6 +98,8 @@ bool DeviceFactory::prepareDeviceEnvironmentsForProductFamilyOverride(ExecutionE
hardwareInfo->ipVersion = DebugManager.flags.OverrideHwIpVersion.get();
}
rootDeviceEnvironment.initReleaseHelper();
if (DebugManager.flags.OverrideGpuAddressSpace.get() != -1) {
hardwareInfo->capabilityTable.gpuAddressSpace = maxNBitValue(static_cast<uint64_t>(DebugManager.flags.OverrideGpuAddressSpace.get()));
}

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

@@ -430,7 +430,11 @@ int Drm::setupHardwareInfo(const DeviceDescriptor *device, bool setupFeatureTabl
auto deviceId = hwInfo->platform.usDeviceID;
auto revisionId = hwInfo->platform.usRevId;
rootDeviceEnvironment.setHwInfoAndInitHelpers(device->pHwInfo);
rootDeviceEnvironment.setHwInfo(device->pHwInfo);
rootDeviceEnvironment.initProductHelper();
rootDeviceEnvironment.initGfxCoreHelper();
rootDeviceEnvironment.initApiGfxCoreHelper();
rootDeviceEnvironment.initCompilerProductHelper();
hwInfo->platform.usDeviceID = deviceId;
hwInfo->platform.usRevId = revisionId;
@@ -438,6 +442,7 @@ int Drm::setupHardwareInfo(const DeviceDescriptor *device, bool setupFeatureTabl
const auto productFamily = hwInfo->platform.eProductFamily;
setupIoctlHelper(productFamily);
ioctlHelper->setupIpVersion();
rootDeviceEnvironment.initReleaseHelper();
Drm::QueryTopologyData topologyData = {};