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

fix: correct query topology on xe

Browse Source 
Related-To: NEO-7996
Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
This commit is contained in:
Kamil Kopryk
2023-06-20 07:34:12 +00:00
committed by Compute-Runtime-Automation
parent 74082703ed
commit 082d33bb7c
17 changed files with 643 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
level_zero/tools/test/unit_tests/sources/debug/linux/debug_session_fixtures_linux.cpp
View File

@@ -30,7 +30,7 @@ void DebugApiLinuxFixture::setUp(NEO::HardwareInfo *hwInfo) {
mockDrm->storedSSVal = hwInfo->gtSystemInfo.SubSliceCount;
mockDrm->storedEUVal = hwInfo->gtSystemInfo.EUCount;
}
NEO::Drm::QueryTopologyData topologyData = {};
NEO::DrmQueryTopologyData topologyData = {};
mockDrm->queryTopology(neoDevice->getHardwareInfo(), topologyData);
auto &rootDeviceEnvironment = *neoDevice->executionEnvironment->rootDeviceEnvironments[0];
auto gtSystemInfo = &rootDeviceEnvironment.getMutableHardwareInfo()->gtSystemInfo;
@@ -61,7 +61,7 @@ void DebugApiLinuxMultiDeviceFixture::setUp() {
auto engineInfo = mockDrm->getEngineInfo();
ASSERT_NE(nullptr, engineInfo->getEngineInstance(1, hwInfo.capabilityTable.defaultEngineType));
NEO::Drm::QueryTopologyData topologyData = {};
NEO::DrmQueryTopologyData topologyData = {};
mockDrm->queryTopology(neoDevice->getHardwareInfo(), topologyData);
auto &rootDeviceEnvironment = *neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[0];
auto gtSystemInfo = &rootDeviceEnvironment.getMutableHardwareInfo()->gtSystemInfo;

6
level_zero/tools/test/unit_tests/sources/debug/linux/test_debug_api_linux.cpp
View File

@@ -183,7 +183,7 @@ TEST(DebugSessionLinuxTest, WhenConvertingThreadIDsForDeviceWithSingleSliceThenS
mockDrm->storedEUVal = hwInfo.gtSystemInfo.EUCount;
mockDrm->disableSomeTopology = true;
NEO::Drm::QueryTopologyData topologyData = {};
NEO::DrmQueryTopologyData topologyData = {};
mockDrm->queryTopology(neoDevice->getHardwareInfo(), topologyData);
neoDevice->executionEnvironment->rootDeviceEnvironments[0]->osInterface.reset(new NEO::OSInterface);
@@ -228,7 +228,7 @@ TEST(DebugSessionLinuxTest, WhenConvertingThreadIDsForDeviceWithMultipleSlicesTh
mockDrm->storedEUVal = hwInfo.gtSystemInfo.EUCount;
mockDrm->disableSomeTopology = true;
NEO::Drm::QueryTopologyData topologyData = {};
NEO::DrmQueryTopologyData topologyData = {};
mockDrm->queryTopology(neoDevice->getHardwareInfo(), topologyData);
neoDevice->executionEnvironment->rootDeviceEnvironments[0]->osInterface.reset(new NEO::OSInterface);
@@ -271,7 +271,7 @@ TEST(DebugSessionLinuxTest, GivenDeviceWithSingleSliceWhenCallingAreRequestedThr
mockDrm->storedSSVal = hwInfo.gtSystemInfo.SubSliceCount;
mockDrm->storedEUVal = hwInfo.gtSystemInfo.EUCount;
NEO::Drm::QueryTopologyData topologyData = {};
NEO::DrmQueryTopologyData topologyData = {};
mockDrm->queryTopology(neoDevice->getHardwareInfo(), topologyData);
neoDevice->executionEnvironment->rootDeviceEnvironments[0]->osInterface.reset(new NEO::OSInterface);
neoDevice->executionEnvironment->rootDeviceEnvironments[0]->osInterface->setDriverModel(std::unique_ptr<DriverModel>(mockDrm));