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

Fix zetDebugResume() within subslice

Browse Source 
- single slice devices need subslice remapping
- convert api thread ids to physical ids within specific device index

Related-To: NEO-6950

Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
This commit is contained in:
Mateusz Hoppe
2022-05-11 16:42:09 +00:00
committed by Compute-Runtime-Automation
parent 2e9681d7ab
commit d8b161e21e
8 changed files with 487 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
level_zero/tools/source/debug/linux/prelim/debug_session.cpp
View File

@@ -1448,15 +1448,50 @@ void DebugSessionLinux::applyResumeWa(std::vector<ze_device_thread_t> threads, u
return;
}
ze_device_thread_t DebugSessionLinux::convertToPhysical(ze_device_thread_t thread, uint32_t &deviceIndex) {
uint32_t DebugSessionLinux::getDeviceIndexFromApiThread(ze_device_thread_t thread) {
uint32_t deviceIndex = 0;
auto deviceCount = std::max(1u, connectedDevice->getNEODevice()->getNumSubDevices());
const auto &topologyMap = DrmHelper::getTopologyMap(connectedDevice);
if (connectedDevice->getNEODevice()->isSubDevice()) {
auto deviceBitfield = connectedDevice->getNEODevice()->getDeviceBitfield();
return Math::log2(static_cast<uint32_t>(deviceBitfield.to_ulong()));
}
if (deviceCount > 1) {
if (thread.slice == UINT32_MAX) {
deviceIndex = UINT32_MAX;
} else {
uint32_t sliceId = thread.slice;
for (uint32_t i = 0; i < topologyMap.size(); i++) {
if (sliceId < topologyMap.at(i).sliceIndices.size()) {
deviceIndex = i;
}
sliceId = sliceId - static_cast<uint32_t>(topologyMap.at(i).sliceIndices.size());
}
}
}
return deviceIndex;
}
ze_device_thread_t DebugSessionLinux::convertToPhysicalWithinDevice(ze_device_thread_t thread, uint32_t deviceIndex) {
auto deviceImp = static_cast<DeviceImp *>(connectedDevice);
const auto &topologyMap = DrmHelper::getTopologyMap(connectedDevice);
// set slice for single slice config to allow subslice remapping
auto mapping = topologyMap.find(deviceIndex);
if (thread.slice == UINT32_MAX && mapping != topologyMap.end() && mapping->second.sliceIndices.size() == 1) {
thread.slice = 0;
}
if (thread.slice != UINT32_MAX) {
if (thread.subslice != UINT32_MAX) {
deviceImp->toPhysicalSliceId(DrmHelper::getTopologyMap(connectedDevice), thread.slice, thread.subslice, deviceIndex);
deviceImp->toPhysicalSliceId(topologyMap, thread.slice, thread.subslice, deviceIndex);
} else {
uint32_t dummy = 0;
deviceImp->toPhysicalSliceId(DrmHelper::getTopologyMap(connectedDevice), thread.slice, dummy, deviceIndex);
deviceImp->toPhysicalSliceId(topologyMap, thread.slice, dummy, deviceIndex);
}
}

3
level_zero/tools/source/debug/linux/prelim/debug_session.h
View File

@@ -41,7 +41,8 @@ struct DebugSessionLinux : DebugSessionImp {
ze_result_t writeMemory(ze_device_thread_t thread, const zet_debug_memory_space_desc_t *desc, size_t size, const void *buffer) override;
ze_result_t acknowledgeEvent(const zet_debug_event_t *event) override;
ze_device_thread_t convertToPhysical(ze_device_thread_t thread, uint32_t &deviceIndex) override;
uint32_t getDeviceIndexFromApiThread(ze_device_thread_t thread) override;
ze_device_thread_t convertToPhysicalWithinDevice(ze_device_thread_t thread, uint32_t deviceIndex) override;
EuThread::ThreadId convertToThreadId(ze_device_thread_t thread) override;
ze_device_thread_t convertToApi(EuThread::ThreadId threadId) override;