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

Fix segfault on debugData access with SourceLevelDebugger

Browse Source 
- add mock active debugger mode

Related-To: NEO-5290

Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
This commit is contained in:
Mateusz Hoppe
2020-11-20 16:50:52 +01:00
committed by Compute-Runtime-Automation
parent 7f0ba84d2d
commit fc9be73491
4 changed files with 134 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
shared/source/debug_settings/debug_variables_base.inl
View File

@@ -81,6 +81,7 @@ DECLARE_DEBUG_VARIABLE(int32_t, ForceCacheFlushForBcs, -1, "Force cache flush fr
DECLARE_DEBUG_VARIABLE(int32_t, ForceGpgpuSubmissionForBcsEnqueue, -1, "-1: Default, 1: Submit gpgpu command buffer with cache flushing and completion synchronization, 0: Do nothing, if possible")
DECLARE_DEBUG_VARIABLE(int32_t, EnableUsmCompression, -1, "enable compression support for L0 USM Device and Shared Device side: -1 default, 0: disable, 1: enable")
DECLARE_DEBUG_VARIABLE(int32_t, MediaVfeStateMaxSubSlices, -1, ">=0: Programs Media Vfe State Maximum Number of Dual-Subslices to given value ")
DECLARE_DEBUG_VARIABLE(int32_t, EnableMockSourceLevelDebugger, 0, "Switches driver to mode with active debugger. Active modes: 1: opt-disabled, 2: opt-enabled")
/*LOGGING FLAGS*/
DECLARE_DEBUG_VARIABLE(int32_t, PrintDriverDiagnostics, -1, "prints driver diagnostics messages to standard output, value corresponds to hint level")

70
shared/source/source_level_debugger/source_level_debugger.cpp
View File

@@ -7,6 +7,7 @@
#include "shared/source/source_level_debugger/source_level_debugger.h"
#include "shared/source/debug_settings/debug_settings_manager.h"
#include "shared/source/debugger/debugger.h"
#include "shared/source/helpers/debug_helpers.h"
#include "shared/source/kernel/debug_data.h"
@@ -61,6 +62,11 @@ SourceLevelDebugger *SourceLevelDebugger::create() {
}
delete library;
}
if (DebugManager.flags.EnableMockSourceLevelDebugger.get()) {
auto sld = new SourceLevelDebugger(nullptr);
sld->isActive = true;
return sld;
}
return nullptr;
}
SourceLevelDebugger::SourceLevelDebugger(OsLibrary *library) {
@@ -117,9 +123,11 @@ bool SourceLevelDebugger::notifyNewDevice(uint32_t deviceHandle) {
newDevice.version = IGFXDBG_CURRENT_VERSION;
newDevice.dh = reinterpret_cast<GfxDeviceHandle>(static_cast<uint64_t>(deviceHandle));
newDevice.udh = GfxDeviceHandle(0);
int result = sourceLevelDebuggerInterface->notifyNewDeviceFunc(&newDevice);
DEBUG_BREAK_IF(static_cast<IgfxdbgRetVal>(result) != IgfxdbgRetVal::IGFXDBG_SUCCESS);
static_cast<void>(result);
if (sourceLevelDebuggerInterface) {
int result = sourceLevelDebuggerInterface->notifyNewDeviceFunc(&newDevice);
DEBUG_BREAK_IF(static_cast<IgfxdbgRetVal>(result) != IgfxdbgRetVal::IGFXDBG_SUCCESS);
static_cast<void>(result);
}
this->deviceHandle = deviceHandle;
}
return false;
@@ -130,9 +138,11 @@ bool SourceLevelDebugger::notifyDeviceDestruction() {
GfxDbgDeviceDestructionData deviceDestruction;
deviceDestruction.version = IGFXDBG_CURRENT_VERSION;
deviceDestruction.dh = reinterpret_cast<GfxDeviceHandle>(static_cast<uint64_t>(this->deviceHandle));
int result = sourceLevelDebuggerInterface->notifyDeviceDestructionFunc(&deviceDestruction);
DEBUG_BREAK_IF(static_cast<IgfxdbgRetVal>(result) != IgfxdbgRetVal::IGFXDBG_SUCCESS);
static_cast<void>(result);
if (sourceLevelDebuggerInterface) {
int result = sourceLevelDebuggerInterface->notifyDeviceDestructionFunc(&deviceDestruction);
DEBUG_BREAK_IF(static_cast<IgfxdbgRetVal>(result) != IgfxdbgRetVal::IGFXDBG_SUCCESS);
static_cast<void>(result);
}
this->deviceHandle = 0;
return true;
}
@@ -151,9 +161,11 @@ bool SourceLevelDebugger::notifySourceCode(const char *source, size_t sourceSize
sourceCode.sourceName = &fileName[0];
sourceCode.sourceNameMaxLen = sizeof(fileName);
int result = sourceLevelDebuggerInterface->notifySourceCodeFunc(&sourceCode);
DEBUG_BREAK_IF(static_cast<IgfxdbgRetVal>(result) != IgfxdbgRetVal::IGFXDBG_SUCCESS);
static_cast<void>(result);
if (sourceLevelDebuggerInterface) {
int result = sourceLevelDebuggerInterface->notifySourceCodeFunc(&sourceCode);
DEBUG_BREAK_IF(static_cast<IgfxdbgRetVal>(result) != IgfxdbgRetVal::IGFXDBG_SUCCESS);
static_cast<void>(result);
}
file = fileName;
}
return false;
@@ -169,18 +181,22 @@ bool SourceLevelDebugger::isOptimizationDisabled() const {
option.valueLen = sizeof(value);
option.value = &value[0];
int result = sourceLevelDebuggerInterface->getDebuggerOptionFunc(&option);
if (result == 1) {
if (option.value[0] == '1') {
return true;
if (sourceLevelDebuggerInterface) {
int result = sourceLevelDebuggerInterface->getDebuggerOptionFunc(&option);
if (result == 1) {
if (option.value[0] == '1') {
return true;
}
}
} else {
return DebugManager.flags.EnableMockSourceLevelDebugger.get() == 1 ? true : false;
}
}
return false;
}
bool SourceLevelDebugger::notifyKernelDebugData(const DebugData *debugData, const std::string &name, const void *isa, size_t isaSize) const {
if (isActive && debugData->vIsa && debugData->genIsa) {
if (isActive) {
GfxDbgKernelDebugData kernelDebugData;
kernelDebugData.hDevice = reinterpret_cast<GfxDeviceHandle>(static_cast<uint64_t>(this->deviceHandle));
kernelDebugData.version = IGFXDBG_CURRENT_VERSION;
@@ -190,14 +206,18 @@ bool SourceLevelDebugger::notifyKernelDebugData(const DebugData *debugData, cons
kernelDebugData.kernelBinBuffer = const_cast<void *>(isa);
kernelDebugData.KernelBinSize = static_cast<uint32_t>(isaSize);
kernelDebugData.dbgVisaBuffer = debugData->vIsa;
kernelDebugData.dbgVisaSize = debugData->vIsaSize;
kernelDebugData.dbgGenIsaBuffer = debugData->genIsa;
kernelDebugData.dbgGenIsaSize = debugData->genIsaSize;
if (debugData) {
kernelDebugData.dbgVisaBuffer = debugData->vIsa;
kernelDebugData.dbgVisaSize = debugData->vIsaSize;
kernelDebugData.dbgGenIsaBuffer = debugData->genIsa;
kernelDebugData.dbgGenIsaSize = debugData->genIsaSize;
}
int result = sourceLevelDebuggerInterface->notifyKernelDebugDataFunc(&kernelDebugData);
DEBUG_BREAK_IF(static_cast<IgfxdbgRetVal>(result) != IgfxdbgRetVal::IGFXDBG_SUCCESS);
static_cast<void>(result);
if (sourceLevelDebuggerInterface) {
int result = sourceLevelDebuggerInterface->notifyKernelDebugDataFunc(&kernelDebugData);
DEBUG_BREAK_IF(static_cast<IgfxdbgRetVal>(result) != IgfxdbgRetVal::IGFXDBG_SUCCESS);
static_cast<void>(result);
}
}
return false;
}
@@ -205,9 +225,11 @@ bool SourceLevelDebugger::notifyKernelDebugData(const DebugData *debugData, cons
bool SourceLevelDebugger::initialize(bool useLocalMemory) {
if (isActive) {
GfxDbgTargetCaps caps = {IGFXDBG_CURRENT_VERSION, useLocalMemory};
int result = sourceLevelDebuggerInterface->initFunc(&caps);
if (static_cast<IgfxdbgRetVal>(result) != IgfxdbgRetVal::IGFXDBG_SUCCESS) {
isActive = false;
if (sourceLevelDebuggerInterface) {
int result = sourceLevelDebuggerInterface->initFunc(&caps);
if (static_cast<IgfxdbgRetVal>(result) != IgfxdbgRetVal::IGFXDBG_SUCCESS) {
isActive = false;
}
}
}
return false;