refactor: move GPR15 to separate debugger context

Signed-off-by: Jemale Lockett <jemale.lockett@intel.com>
This commit is contained in:
Jemale Lockett
2024-04-15 21:30:35 +00:00
committed by Compute-Runtime-Automation
parent da9df9f0e7
commit 79f8993220
7 changed files with 22 additions and 16 deletions

View File

@@ -115,8 +115,8 @@ HWTEST2_F(DebuggerSingleAddressSpaceAub, GivenSingleAddressSpaceWhenCmdListIsExe
uint32_t low = sbaAddress & 0xffffffff;
uint32_t high = (sbaAddress >> 32) & 0xffffffff;
expectMMIO<FamilyType>(RegisterOffsets::csGprR15, low);
expectMMIO<FamilyType>(RegisterOffsets::csGprR15 + 4, high);
expectMMIO<FamilyType>(DebuggerRegisterOffsets::csGprR15, low);
expectMMIO<FamilyType>(DebuggerRegisterOffsets::csGprR15 + 4, high);
auto instructionHeapBaseAddress = memoryManager->getInternalHeapBaseAddress(rootDeviceIndex,
memoryManager->isLocalMemoryUsedForIsa(rootDeviceIndex));

View File

@@ -150,7 +150,7 @@ HWTEST2_F(singleAddressSpaceModeTest, givenImmediateCommandListWhenExecutingWith
MI_LOAD_REGISTER_IMM *miLoad = genCmdCast<MI_LOAD_REGISTER_IMM *>(*miLoadImm[i]);
ASSERT_NE(nullptr, miLoad);
if (miLoad->getRegisterOffset() == RegisterOffsets::csGprR15) {
if (miLoad->getRegisterOffset() == DebuggerRegisterOffsets::csGprR15) {
gpr15Found = true;
break;
}
@@ -197,7 +197,7 @@ HWTEST2_F(singleAddressSpaceModeTest, givenUseCsrImmediateSubmissionEnabledAndSh
MI_LOAD_REGISTER_IMM *miLoad = genCmdCast<MI_LOAD_REGISTER_IMM *>(*miLoadImm[i]);
ASSERT_NE(nullptr, miLoad);
if (miLoad->getRegisterOffset() == RegisterOffsets::csGprR15) {
if (miLoad->getRegisterOffset() == DebuggerRegisterOffsets::csGprR15) {
gpr15Found = true;
break;
}

View File

@@ -447,11 +447,11 @@ HWTEST2_F(L0DebuggerSingleAddressSpace, givenDebuggingEnabledWhenCommandListIsEx
MI_LOAD_REGISTER_IMM *miLoad = genCmdCast<MI_LOAD_REGISTER_IMM *>(*miLoadImm[i]);
ASSERT_NE(nullptr, miLoad);
if (miLoad->getRegisterOffset() == RegisterOffsets::csGprR15) {
if (miLoad->getRegisterOffset() == DebuggerRegisterOffsets::csGprR15) {
gpr15RegisterCount++;
gprMiLoadindex = i;
}
if (miLoad->getRegisterOffset() == RegisterOffsets::csGprR15 + 4) {
if (miLoad->getRegisterOffset() == DebuggerRegisterOffsets::csGprR15 + 4) {
gpr15RegisterCount++;
}
}
@@ -464,11 +464,11 @@ HWTEST2_F(L0DebuggerSingleAddressSpace, givenDebuggingEnabledWhenCommandListIsEx
uint32_t high = (sbaGpuVa >> 32) & 0xffffffff;
MI_LOAD_REGISTER_IMM *miLoad = genCmdCast<MI_LOAD_REGISTER_IMM *>(*miLoadImm[gprMiLoadindex]);
EXPECT_EQ(RegisterOffsets::csGprR15, miLoad->getRegisterOffset());
EXPECT_EQ(DebuggerRegisterOffsets::csGprR15, miLoad->getRegisterOffset());
EXPECT_EQ(low, miLoad->getDataDword());
miLoad = genCmdCast<MI_LOAD_REGISTER_IMM *>(*miLoadImm[gprMiLoadindex + 1]);
EXPECT_EQ(RegisterOffsets::csGprR15 + 4, miLoad->getRegisterOffset());
EXPECT_EQ(DebuggerRegisterOffsets::csGprR15 + 4, miLoad->getRegisterOffset());
EXPECT_EQ(high, miLoad->getDataDword());
for (auto i = 0u; i < numCommandLists; i++) {