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

Revert "fix: using canonized addr in xe kmd"

Browse Source 
This reverts commit 683d7c7acf.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2025-02-21 17:04:42 +01:00
committed by Compute-Runtime-Automation
parent 91c07e24f6
commit 66c4288494
6 changed files with 8 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
level_zero/tools/source/debug/linux/debug_session.cpp
View File

@@ -315,7 +315,7 @@ ze_result_t DebugSessionLinux::readGpuMemory(uint64_t vmHandle, char *output, si
int64_t retVal = 0;
auto gmmHelper = connectedDevice->getNEODevice()->getGmmHelper();
gpuVa = gmmHelper->canonize(gpuVa);
gpuVa = gmmHelper->decanonize(gpuVa);
if (flushVmCache(vmDebugFd) != 0) {
return ZE_RESULT_ERROR_UNKNOWN;
}
@@ -377,7 +377,7 @@ ze_result_t DebugSessionLinux::writeGpuMemory(uint64_t vmHandle, const char *inp
int64_t retVal = 0;
auto gmmHelper = connectedDevice->getNEODevice()->getGmmHelper();
gpuVa = gmmHelper->canonize(gpuVa);
gpuVa = gmmHelper->decanonize(gpuVa);
if (flushVmCache(vmDebugFd) != 0) {
return ZE_RESULT_ERROR_UNKNOWN;
}

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

@@ -641,8 +641,8 @@ bool DebugSessionLinuxi915::handleVmBindEvent(prelim_drm_i915_debug_event_vm_bin
std::unique_lock<std::mutex> memLock(asyncThreadMutex);
isaMap[vmBind->va_start] = std::move(isa);
// Expect canonical va_start
DEBUG_BREAK_IF(gmmHelper->canonize(vmBind->va_start) != vmBind->va_start);
// Expect non canonical va_start
DEBUG_BREAK_IF(gmmHelper->decanonize(vmBind->va_start) != vmBind->va_start);
bool apiEventNeedsAck = (vmBind->base.flags & PRELIM_DRM_I915_DEBUG_EVENT_NEED_ACK);
// If ACK flag is not set when triggering MODULE LOAD event, auto-ack immediately

2
level_zero/tools/source/debug/linux/xe/debug_session.cpp
View File

@@ -466,7 +466,6 @@ bool DebugSessionLinuxXe::handleVmBind(VmBindData &vmBindData) {
if (vmBindOp.base.flags & euDebugInterface->getParamValue(NEO::EuDebugParam::eventBitCreate)) {
{
std::lock_guard<std::mutex> lock(asyncThreadMutex);
if (metaDataEntry.metadata.type == euDebugInterface->getParamValue(NEO::EuDebugParam::metadataSbaArea)) {
connection->vmToStateBaseAreaBindInfo[vmBindData.vmBind.vmHandle] = {vmBindOp.addr, vmBindOp.range};
}
@@ -474,7 +473,6 @@ bool DebugSessionLinuxXe::handleVmBind(VmBindData &vmBindData) {
connection->vmToContextStateSaveAreaBindInfo[vmBindData.vmBind.vmHandle] = {vmBindOp.addr, vmBindOp.range};
}
if (metaDataEntry.metadata.type == euDebugInterface->getParamValue(NEO::EuDebugParam::metadataModuleArea)) {
isaAddr = vmBindOp.addr;
if (connection->isaMap[tileIndex].find(vmBindOp.addr) == connection->isaMap[tileIndex].end()) {
auto &isaMap = connection->isaMap[tileIndex];