Refactor SourceLevelDebugger

Change-Id: I5d34b43e822ffa5bdbcf0bef7d4d15baf0534252
Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
This commit is contained in:
Mateusz Hoppe
2020-03-05 19:21:51 +01:00
committed by sys_ocldev
parent 156fd41c5d
commit 67c39d2c52
7 changed files with 29 additions and 23 deletions

View File

@ -73,7 +73,7 @@ class MockActiveSourceLevelDebugger : public SourceLevelDebugger {
filename = sourceCodeFilename;
return true;
}
bool notifyKernelDebugData(const KernelInfo *kernelInfo) const override {
bool notifyKernelDebugData(const DebugData *debugData, const std::string &name, const void *isa, size_t isaSize) const override {
return false;
}
bool initialize(bool useLocalMemory) override {
@ -98,7 +98,7 @@ class GMockSourceLevelDebugger : public SourceLevelDebugger {
}
MOCK_METHOD0(notifyDeviceDestruction, bool(void));
MOCK_CONST_METHOD1(notifyKernelDebugData, bool(const KernelInfo *));
MOCK_CONST_METHOD4(notifyKernelDebugData, bool(const DebugData *debugData, const std::string &name, const void *isa, size_t isaSize));
MOCK_CONST_METHOD0(isOptimizationDisabled, bool());
MOCK_METHOD1(notifyNewDevice, bool(uint32_t));
MOCK_CONST_METHOD3(notifySourceCode, bool(const char *, size_t, std::string &));

View File

@ -207,7 +207,7 @@ TEST_F(ProgramWithKernelDebuggingTest, givenEnabledKernelDebugWhenProgramIsBuilt
EXPECT_CALL(*sourceLevelDebugger, isOptimizationDisabled()).Times(1);
EXPECT_CALL(*sourceLevelDebugger, notifySourceCode(::testing::_, ::testing::_, ::testing::_)).Times(1);
EXPECT_CALL(*sourceLevelDebugger, notifyKernelDebugData(::testing::_)).Times(1);
EXPECT_CALL(*sourceLevelDebugger, notifyKernelDebugData(::testing::_, ::testing::_, ::testing::_, ::testing::_)).Times(1);
sourceLevelDebugger->setActive(true);
pDevice->executionEnvironment->debugger.reset(sourceLevelDebugger);
@ -226,7 +226,7 @@ TEST_F(ProgramWithKernelDebuggingTest, givenEnabledKernelDebugWhenProgramIsLinke
EXPECT_CALL(*sourceLevelDebugger, isOptimizationDisabled()).Times(2);
EXPECT_CALL(*sourceLevelDebugger, notifySourceCode(::testing::_, ::testing::_, ::testing::_)).Times(1);
EXPECT_CALL(*sourceLevelDebugger, notifyKernelDebugData(::testing::_)).Times(1);
EXPECT_CALL(*sourceLevelDebugger, notifyKernelDebugData(::testing::_, ::testing::_, ::testing::_, ::testing::_)).Times(1);
sourceLevelDebugger->setActive(true);
pDevice->executionEnvironment->debugger.reset(sourceLevelDebugger);

View File

@ -299,7 +299,7 @@ TEST(SourceLevelDebugger, givenKernelDebuggerLibraryActiveWhenNotifyKernelDebugD
info.heapInfo.pKernelHeader = &kernelHeader;
info.heapInfo.pKernelHeap = isa;
debugger.notifyKernelDebugData(&info);
debugger.notifyKernelDebugData(&info.debugData, info.name, info.heapInfo.pKernelHeap, info.heapInfo.pKernelHeader->KernelHeapSize);
EXPECT_TRUE(interceptor.kernelDebugDataCalled);
@ -342,7 +342,7 @@ TEST(SourceLevelDebugger, givenNoVisaWhenNotifyKernelDebugDataIsCalledThenDebugg
info.heapInfo.pKernelHeader = &kernelHeader;
info.heapInfo.pKernelHeap = isa;
debugger.notifyKernelDebugData(&info);
debugger.notifyKernelDebugData(&info.debugData, info.name, info.heapInfo.pKernelHeap, info.heapInfo.pKernelHeader->KernelHeapSize);
EXPECT_FALSE(interceptor.kernelDebugDataCalled);
}
@ -371,7 +371,7 @@ TEST(SourceLevelDebugger, givenNoGenIsaWhenNotifyKernelDebugDataIsCalledThenDebu
info.heapInfo.pKernelHeader = &kernelHeader;
info.heapInfo.pKernelHeap = isa;
debugger.notifyKernelDebugData(&info);
debugger.notifyKernelDebugData(&info.debugData, info.name, isa, sizeof(isa));
EXPECT_FALSE(interceptor.kernelDebugDataCalled);
}
@ -387,7 +387,7 @@ TEST(SourceLevelDebugger, givenKernelDebuggerLibraryNotActiveWhenNotifyKernelDeb
debugger.setActive(false);
KernelInfo info;
debugger.notifyKernelDebugData(&info);
debugger.notifyKernelDebugData(&info.debugData, info.name, nullptr, 0);
EXPECT_FALSE(interceptor.kernelDebugDataCalled);
}