From dd884a0733d41ea2cada003185baf0244c96dc05 Mon Sep 17 00:00:00 2001 From: Jemale Lockett Date: Mon, 8 Apr 2024 23:38:43 +0000 Subject: [PATCH] fix: stop using gpr15 in non-debug context Resolves: NEO-11027 Signed-off-by: Jemale Lockett --- level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.inl | 4 ++-- shared/source/command_container/command_encoder.inl | 4 ++-- .../encoders/command_encoder_tests_xehp_and_later.cpp | 2 +- shared/test/unit_test/encoders/test_encode_math.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.inl b/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.inl index 8f30ef84b8..71612e6518 100644 --- a/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.inl +++ b/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.inl @@ -68,7 +68,7 @@ void validateTimestampRegisters(GenCmdList &cmdList, { ASSERT_NE(cmdList.end(), itor); auto cmdMem = genCmdCast(*itor); - EXPECT_EQ(RegisterOffsets::csGprR15, cmdMem->getRegisterAddress()); + EXPECT_EQ(RegisterOffsets::csGprR12, cmdMem->getRegisterAddress()); EXPECT_EQ(firstStoreRegMemAddress, cmdMem->getMemoryAddress()); if (workloadPartition) { EXPECT_TRUE(UnitTestHelper::getWorkloadPartitionForStoreRegisterMemCmd(*cmdMem)); @@ -104,7 +104,7 @@ void validateTimestampRegisters(GenCmdList &cmdList, { ASSERT_NE(cmdList.end(), itor); auto cmdMem = genCmdCast(*itor); - EXPECT_EQ(RegisterOffsets::csGprR15, cmdMem->getRegisterAddress()); + EXPECT_EQ(RegisterOffsets::csGprR12, cmdMem->getRegisterAddress()); EXPECT_EQ(secondStoreRegMemAddress, cmdMem->getMemoryAddress()); if (workloadPartition) { EXPECT_TRUE(UnitTestHelper::getWorkloadPartitionForStoreRegisterMemCmd(*cmdMem)); diff --git a/shared/source/command_container/command_encoder.inl b/shared/source/command_container/command_encoder.inl index 87915d1de7..cd3ff5aea2 100644 --- a/shared/source/command_container/command_encoder.inl +++ b/shared/source/command_container/command_encoder.inl @@ -156,9 +156,9 @@ void EncodeMathMMIO::encodeBitwiseAndVal(CommandContainer &container, ui EncodeSetMMIO::encodeIMM(container, RegisterOffsets::csGprR14, immVal, true); EncodeMath::bitwiseAnd(container, AluRegisters::gpr13, AluRegisters::gpr14, - AluRegisters::gpr15); + AluRegisters::gpr12); EncodeStoreMMIO::encode(*container.getCommandStream(), - RegisterOffsets::csGprR15, dstAddress, workloadPartition, outCmdBuffer); + RegisterOffsets::csGprR12, dstAddress, workloadPartition, outCmdBuffer); } /* diff --git a/shared/test/unit_test/encoders/command_encoder_tests_xehp_and_later.cpp b/shared/test/unit_test/encoders/command_encoder_tests_xehp_and_later.cpp index e39f025681..66002ee762 100644 --- a/shared/test/unit_test/encoders/command_encoder_tests_xehp_and_later.cpp +++ b/shared/test/unit_test/encoders/command_encoder_tests_xehp_and_later.cpp @@ -185,7 +185,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterCommandEncoderTest, givenOffsetAndValue ASSERT_NE(commands.end(), itor); auto cmdMem = genCmdCast(*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()); } diff --git a/shared/test/unit_test/encoders/test_encode_math.cpp b/shared/test/unit_test/encoders/test_encode_math.cpp index cc03762eeb..5929166f07 100644 --- a/shared/test/unit_test/encoders/test_encode_math.cpp +++ b/shared/test/unit_test/encoders/test_encode_math.cpp @@ -216,7 +216,7 @@ HWTEST_F(CommandEncoderMathTest, givenOffsetAndValueWhenEncodeBitwiseAndValIsCal EXPECT_NE(commands.end(), itor); auto cmdMem = genCmdCast(*itor); EXPECT_EQ(cmdMem, storeRegMem); - EXPECT_EQ(cmdMem->getRegisterAddress(), RegisterOffsets::csGprR15); + EXPECT_EQ(cmdMem->getRegisterAddress(), RegisterOffsets::csGprR12); EXPECT_EQ(cmdMem->getMemoryAddress(), dstAddress); }