fix: stop using gpr15 in non-debug context

Resolves: NEO-11027

Signed-off-by: Jemale Lockett <jemale.lockett@intel.com>
This commit is contained in:
Jemale Lockett 2024-04-08 23:38:43 +00:00 committed by Compute-Runtime-Automation
parent 5b6acb4f3f
commit dd884a0733
4 changed files with 6 additions and 6 deletions

View File

@ -68,7 +68,7 @@ void validateTimestampRegisters(GenCmdList &cmdList,
{
ASSERT_NE(cmdList.end(), itor);
auto cmdMem = genCmdCast<MI_STORE_REGISTER_MEM *>(*itor);
EXPECT_EQ(RegisterOffsets::csGprR15, cmdMem->getRegisterAddress());
EXPECT_EQ(RegisterOffsets::csGprR12, cmdMem->getRegisterAddress());
EXPECT_EQ(firstStoreRegMemAddress, cmdMem->getMemoryAddress());
if (workloadPartition) {
EXPECT_TRUE(UnitTestHelper<FamilyType>::getWorkloadPartitionForStoreRegisterMemCmd(*cmdMem));
@ -104,7 +104,7 @@ void validateTimestampRegisters(GenCmdList &cmdList,
{
ASSERT_NE(cmdList.end(), itor);
auto cmdMem = genCmdCast<MI_STORE_REGISTER_MEM *>(*itor);
EXPECT_EQ(RegisterOffsets::csGprR15, cmdMem->getRegisterAddress());
EXPECT_EQ(RegisterOffsets::csGprR12, cmdMem->getRegisterAddress());
EXPECT_EQ(secondStoreRegMemAddress, cmdMem->getMemoryAddress());
if (workloadPartition) {
EXPECT_TRUE(UnitTestHelper<FamilyType>::getWorkloadPartitionForStoreRegisterMemCmd(*cmdMem));

View File

@ -156,9 +156,9 @@ void EncodeMathMMIO<Family>::encodeBitwiseAndVal(CommandContainer &container, ui
EncodeSetMMIO<Family>::encodeIMM(container, RegisterOffsets::csGprR14, immVal, true);
EncodeMath<Family>::bitwiseAnd(container, AluRegisters::gpr13,
AluRegisters::gpr14,
AluRegisters::gpr15);
AluRegisters::gpr12);
EncodeStoreMMIO<Family>::encode(*container.getCommandStream(),
RegisterOffsets::csGprR15, dstAddress, workloadPartition, outCmdBuffer);
RegisterOffsets::csGprR12, dstAddress, workloadPartition, outCmdBuffer);
}
/*

View File

@ -185,7 +185,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterCommandEncoderTest, givenOffsetAndValue
ASSERT_NE(commands.end(), itor);
auto cmdMem = genCmdCast<MI_STORE_REGISTER_MEM *>(*itor);
EXPECT_EQ(cmdMem, storeRegMem);
EXPECT_EQ(RegisterOffsets::csGprR15, cmdMem->getRegisterAddress());
EXPECT_EQ(RegisterOffsets::csGprR12, cmdMem->getRegisterAddress());
EXPECT_EQ(dstAddress, cmdMem->getMemoryAddress());
EXPECT_TRUE(cmdMem->getWorkloadPartitionIdOffsetEnable());
}

View File

@ -216,7 +216,7 @@ HWTEST_F(CommandEncoderMathTest, givenOffsetAndValueWhenEncodeBitwiseAndValIsCal
EXPECT_NE(commands.end(), itor);
auto cmdMem = genCmdCast<MI_STORE_REGISTER_MEM *>(*itor);
EXPECT_EQ(cmdMem, storeRegMem);
EXPECT_EQ(cmdMem->getRegisterAddress(), RegisterOffsets::csGprR15);
EXPECT_EQ(cmdMem->getRegisterAddress(), RegisterOffsets::csGprR12);
EXPECT_EQ(cmdMem->getMemoryAddress(), dstAddress);
}