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

test: fix DebugSession ult

Browse Source 
- copy generated stateSaveArea to readMemory return buffer

Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
This commit is contained in:
Mateusz Hoppe
2023-08-30 12:18:49 +00:00
committed by Compute-Runtime-Automation
parent 16166bf580
commit 25cc198430
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
level_zero/tools/test/unit_tests/sources/debug/debug_session_tests.cpp
View File

@@ -1750,9 +1750,12 @@ TEST_F(DebugSessionTest, givenTssMagicCorruptedWhenStateSaveAreIsReadThenHeaderI
Mock<L0::DeviceImp> deviceImp(neoDevice, neoDevice->getExecutionEnvironment());
auto session = std::make_unique<MockDebugSession>(config, &deviceImp);
session->readMemoryBuffer.resize(stateSaveAreaHeader.size());
memcpy_s(session->readMemoryBuffer.data(), session->readMemoryBuffer.size(), stateSaveAreaHeader.data(), stateSaveAreaHeader.size());
EuThread::ThreadId thread0(0, 0, 0, 0, 0);
session->stateSaveAreaHeader.clear();
session->validateAndSetStateSaveAreaHeader(session->allThreads[thread0]->getMemoryHandle(), reinterpret_cast<uint64_t>(session->readMemoryBuffer));
session->validateAndSetStateSaveAreaHeader(session->allThreads[thread0]->getMemoryHandle(), reinterpret_cast<uint64_t>(session->readMemoryBuffer.data()));
EXPECT_TRUE(session->stateSaveAreaHeader.empty());
}
@@ -2591,7 +2594,9 @@ TEST_F(DebugSessionRegistersAccessTest, WhenReadingSbaRegistersThenCorrectAddres
sbaExpected[i] = i * 0x1000;
}
sbaExpected[ZET_DEBUG_SBA_SURFACE_STATE_INTEL_GPU] = reinterpret_cast<uint64_t>(session->readMemoryBuffer);
session->readMemoryBuffer.assign(4 * gfxCoreHelper.getRenderSurfaceStateSize(), 5);
sbaExpected[ZET_DEBUG_SBA_SURFACE_STATE_INTEL_GPU] = reinterpret_cast<uint64_t>(session->readMemoryBuffer.data());
session->sba.instructionBaseAddress = sbaExpected[ZET_DEBUG_SBA_INSTRUCTION_INTEL_GPU];
session->sba.indirectObjectBaseAddress = sbaExpected[ZET_DEBUG_SBA_INDIRECT_OBJECT_INTEL_GPU];
@@ -2605,7 +2610,7 @@ TEST_F(DebugSessionRegistersAccessTest, WhenReadingSbaRegistersThenCorrectAddres
if (gfxCoreHelper.isScratchSpaceSurfaceStateAccessible()) {
const uint32_t ptss = 128;
gfxCoreHelper.setRenderSurfaceStateForScratchResource(neoDevice->getRootDeviceEnvironment(),
&session->readMemoryBuffer[1 * (gfxCoreHelper.getRenderSurfaceStateSize() / sizeof(std::decay<decltype(MockDebugSession::readMemoryBuffer[0])>::type))], 1, scratchAllocationBase, 0,
&session->readMemoryBuffer[1 * (gfxCoreHelper.getRenderSurfaceStateSize())], 1, scratchAllocationBase, 0,
ptss, nullptr, false, 6, false, true);
r0Thread0[5] = 1 << 10; // first surface state
@@ -2624,7 +2629,7 @@ TEST_F(DebugSessionRegistersAccessTest, WhenReadingSbaRegistersThenCorrectAddres
if (gfxCoreHelper.isScratchSpaceSurfaceStateAccessible()) {
const uint32_t ptss = 128;
gfxCoreHelper.setRenderSurfaceStateForScratchResource(neoDevice->getRootDeviceEnvironment(),
&session->readMemoryBuffer[1 * (gfxCoreHelper.getRenderSurfaceStateSize() / sizeof(std::decay<decltype(MockDebugSession::readMemoryBuffer[0])>::type))], 1, scratchAllocationBase, 0,
&session->readMemoryBuffer[1 * (gfxCoreHelper.getRenderSurfaceStateSize())], 1, scratchAllocationBase, 0,
ptss, nullptr, false, 6, false, true);
r0Thread0[5] = 1 << 10; // first surface state
@@ -2653,7 +2658,7 @@ TEST_F(DebugSessionRegistersAccessTest, WhenReadingSbaRegistersThenCorrectAddres
if (gfxCoreHelper.isScratchSpaceSurfaceStateAccessible()) {
const uint32_t ptss = 128;
gfxCoreHelper.setRenderSurfaceStateForScratchResource(neoDevice->getRootDeviceEnvironment(),
&session->readMemoryBuffer[2 * (gfxCoreHelper.getRenderSurfaceStateSize() / sizeof(std::decay<decltype(MockDebugSession::readMemoryBuffer[0])>::type))], 1, scratchAllocationBase2Canonized, 0,
&session->readMemoryBuffer[2 * (gfxCoreHelper.getRenderSurfaceStateSize())], 1, scratchAllocationBase2Canonized, 0,
ptss, nullptr, false, 6, false, true);
r0Thread1[5] = 2 << 10; // second surface state

9
level_zero/tools/test/unit_tests/sources/debug/mock_debug_session.h
View File

@@ -285,9 +285,10 @@ struct MockDebugSession : public L0::DebugSessionImp {
memcpy_s(output, size, reinterpret_cast<void *>(gpuVa), size);
}
else if (gpuVa != 0 && gpuVa >= reinterpret_cast<uint64_t>(readMemoryBuffer) &&
gpuVa <= reinterpret_cast<uint64_t>(ptrOffset(readMemoryBuffer, sizeof(readMemoryBuffer)))) {
memcpy_s(output, size, reinterpret_cast<void *>(gpuVa), std::min(size, sizeof(readMemoryBuffer)));
else if (!readMemoryBuffer.empty() &&
(gpuVa != 0 && gpuVa >= reinterpret_cast<uint64_t>(readMemoryBuffer.data()) &&
gpuVa <= reinterpret_cast<uint64_t>(ptrOffset(readMemoryBuffer.data(), readMemoryBuffer.size())))) {
memcpy_s(output, size, reinterpret_cast<void *>(gpuVa), std::min(size, readMemoryBuffer.size()));
}
return readMemoryResult;
}
@@ -511,7 +512,7 @@ struct MockDebugSession : public L0::DebugSessionImp {
std::vector<std::vector<EuThread::ThreadId>> resumedThreads;
NEO::SbaTrackedAddresses sba;
uint64_t readMemoryBuffer[64];
std::vector<uint8_t> readMemoryBuffer;
uint64_t regs[16];
int returnTimeDiff = -1;