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

Revert "feature: Improving information transfer about the copy engine"

Browse Source 
This reverts commit 17ffdff4f1.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2024-08-15 04:39:34 +02:00
committed by Compute-Runtime-Automation
parent c2be925419
commit 9b652f4a34
32 changed files with 150 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
shared/test/unit_test/command_container/command_encoder_tests.cpp
View File

@@ -680,45 +680,6 @@ HWTEST2_F(CommandEncoderTests, whenUsingDefaultFilteringAndAppendSamplerStatePar
EXPECT_EQ(SAMPLER_STATE::LOW_QUALITY_FILTER_DISABLE, state.getLowQualityFilter());
}
HWTEST2_F(CommandEncoderTests, givenMiStoreRegisterMemwhenRemapAndIsBcsThenRegisterOffsetsBcs0Base, IsAtLeastGen12lp) {
using MI_STORE_REGISTER_MEM = typename FamilyType::MI_STORE_REGISTER_MEM;
uint64_t baseAddr = 0x10;
uint32_t offset = 0x20;
constexpr size_t bufferSize = 256;
uint8_t buffer[bufferSize];
LinearStream cmdStream(buffer, bufferSize);
auto buf = cmdStream.getSpaceForCmd<MI_STORE_REGISTER_MEM>();
bool remap = true;
bool isBcs = true;
EncodeStoreMMIO<FamilyType>::encode(buf, offset, baseAddr, true, remap, isBcs);
auto storeRegMem = genCmdCast<MI_STORE_REGISTER_MEM *>(buffer);
ASSERT_NE(nullptr, storeRegMem);
EXPECT_EQ(storeRegMem->getRegisterAddress(), RegisterOffsets::bcs0Base + offset);
remap = true;
isBcs = false;
EncodeStoreMMIO<FamilyType>::encode(buf, offset, baseAddr, true, remap, isBcs);
storeRegMem = genCmdCast<MI_STORE_REGISTER_MEM *>(buffer);
ASSERT_NE(nullptr, storeRegMem);
EXPECT_EQ(storeRegMem->getRegisterAddress(), offset);
remap = false;
isBcs = true;
EncodeStoreMMIO<FamilyType>::encode(buf, offset, baseAddr, true, remap, isBcs);
storeRegMem = genCmdCast<MI_STORE_REGISTER_MEM *>(buffer);
ASSERT_NE(nullptr, storeRegMem);
EXPECT_EQ(storeRegMem->getRegisterAddress(), offset);
remap = false;
isBcs = false;
EncodeStoreMMIO<FamilyType>::encode(buf, offset, baseAddr, true, remap, isBcs);
storeRegMem = genCmdCast<MI_STORE_REGISTER_MEM *>(buffer);
ASSERT_NE(nullptr, storeRegMem);
EXPECT_EQ(storeRegMem->getRegisterAddress(), offset);
}
HWTEST2_F(CommandEncoderTests, whenForcingLowQualityFilteringAndAppendSamplerStateParamsThenEnableLowQualityFilter, IsAtLeastGen12lp) {
DebugManagerStateRestore dbgRestore;

4
shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp
View File

@@ -750,7 +750,7 @@ HWTEST_F(DirectSubmissionTest, givenDirectSubmissionAvailableWhenProgrammingEndi
uint8_t buffer[128];
mockCsr->commandStream.replaceBuffer(&buffer[0], 128u);
mockCsr->commandStream.replaceGraphicsAllocation(&mockAllocation);
mockCsr->programEndingCmd(mockCsr->commandStream, &location, ret, false, false);
mockCsr->programEndingCmd(mockCsr->commandStream, &location, ret, false);
EXPECT_EQ(sizeof(MI_BATCH_BUFFER_START), mockCsr->commandStream.getUsed());
DispatchFlags dispatchFlags = DispatchFlagsHelper::createDefaultDispatchFlags();
@@ -794,7 +794,7 @@ HWTEST_F(DirectSubmissionTest, givenDebugFlagSetWhenProgrammingEndingCommandThen
auto currectBbStartCmd = reinterpret_cast<MI_BATCH_BUFFER_START *>(cmdStream.getSpace(0));
uint64_t expectedGpuVa = cmdStream.getGraphicsAllocation()->getGpuAddress() + cmdStream.getUsed();
mockCsr->programEndingCmd(cmdStream, &location, ret, false, false);
mockCsr->programEndingCmd(cmdStream, &location, ret, false);
EncodeNoop<FamilyType>::alignToCacheLine(cmdStream);
if (value == 0) {

24
shared/test/unit_test/direct_submission/direct_submission_tests_2.cpp
View File

@@ -2163,15 +2163,15 @@ HWTEST2_F(DirectSubmissionRelaxedOrderingTests, givenBcsRelaxedOrderingEnabledWh
auto endingPtr = commandStream.getSpace(0);
ultCsr->programEndingCmd(commandStream, &endingPtr, true, true, true);
ultCsr->programEndingCmd(commandStream, &endingPtr, true, true);
auto lrrCmd = reinterpret_cast<MI_LOAD_REGISTER_REG *>(commandStream.getCpuBase());
EXPECT_EQ(lrrCmd->getSourceRegisterAddress(), RegisterOffsets::bcs0Base + RegisterOffsets::csGprR3);
EXPECT_EQ(lrrCmd->getDestinationRegisterAddress(), RegisterOffsets::bcs0Base + RegisterOffsets::csGprR0);
EXPECT_EQ(lrrCmd->getSourceRegisterAddress(), RegisterOffsets::csGprR3);
EXPECT_EQ(lrrCmd->getDestinationRegisterAddress(), RegisterOffsets::csGprR0);
lrrCmd++;
EXPECT_EQ(lrrCmd->getSourceRegisterAddress(), RegisterOffsets::bcs0Base + RegisterOffsets::csGprR3 + 4);
EXPECT_EQ(lrrCmd->getDestinationRegisterAddress(), RegisterOffsets::bcs0Base + RegisterOffsets::csGprR0 + 4);
EXPECT_EQ(lrrCmd->getSourceRegisterAddress(), RegisterOffsets::csGprR3 + 4);
EXPECT_EQ(lrrCmd->getDestinationRegisterAddress(), RegisterOffsets::csGprR0 + 4);
auto bbStartCmd = reinterpret_cast<MI_BATCH_BUFFER_START *>(++lrrCmd);
EXPECT_EQ(1u, bbStartCmd->getIndirectAddressEnable());
@@ -2196,7 +2196,7 @@ HWTEST2_F(DirectSubmissionRelaxedOrderingTests, givenBcsRelaxedOrderingDisabledW
auto endingPtr = commandStream.getSpace(0);
ultCsr->programEndingCmd(commandStream, &endingPtr, true, false, true);
ultCsr->programEndingCmd(commandStream, &endingPtr, true, false);
auto bbStartCmd = genCmdCast<MI_BATCH_BUFFER_START *>(commandStream.getCpuBase());
ASSERT_NE(nullptr, bbStartCmd);
@@ -2219,15 +2219,15 @@ HWTEST2_F(DirectSubmissionRelaxedOrderingTests, whenProgrammingEndingCmdsThenSet
auto endingPtr = commandStream.getSpace(0);
ultCsr->programEndingCmd(commandStream, &endingPtr, true, true, true);
ultCsr->programEndingCmd(commandStream, &endingPtr, true, true);
auto lrrCmd = reinterpret_cast<MI_LOAD_REGISTER_REG *>(commandStream.getCpuBase());
EXPECT_EQ(lrrCmd->getSourceRegisterAddress(), RegisterOffsets::bcs0Base + RegisterOffsets::csGprR3);
EXPECT_EQ(lrrCmd->getDestinationRegisterAddress(), RegisterOffsets::bcs0Base + RegisterOffsets::csGprR0);
EXPECT_EQ(lrrCmd->getSourceRegisterAddress(), RegisterOffsets::csGprR3);
EXPECT_EQ(lrrCmd->getDestinationRegisterAddress(), RegisterOffsets::csGprR0);
lrrCmd++;
EXPECT_EQ(lrrCmd->getSourceRegisterAddress(), RegisterOffsets::bcs0Base + RegisterOffsets::csGprR3 + 4);
EXPECT_EQ(lrrCmd->getDestinationRegisterAddress(), RegisterOffsets::bcs0Base + RegisterOffsets::csGprR0 + 4);
EXPECT_EQ(lrrCmd->getSourceRegisterAddress(), RegisterOffsets::csGprR3 + 4);
EXPECT_EQ(lrrCmd->getDestinationRegisterAddress(), RegisterOffsets::csGprR0 + 4);
auto bbStartCmd = reinterpret_cast<MI_BATCH_BUFFER_START *>(++lrrCmd);
EXPECT_EQ(1u, bbStartCmd->getIndirectAddressEnable());
@@ -2248,7 +2248,7 @@ HWTEST2_F(DirectSubmissionRelaxedOrderingTests, givenBbWithoutRelaxedOrderingDep
auto endingPtr = commandStream.getSpace(0);
ultCsr->programEndingCmd(commandStream, &endingPtr, true, false, false);
ultCsr->programEndingCmd(commandStream, &endingPtr, true, false);
auto bbStartCmd = genCmdCast<MI_BATCH_BUFFER_START *>(commandStream.getCpuBase());
ASSERT_NE(nullptr, bbStartCmd);

6
shared/test/unit_test/encoders/command_encoder_tests_xehp_and_later.cpp
View File

@@ -119,8 +119,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterHardwareCommandsTest, givenWorkloadPart
offset,
gpuAddress,
true,
nullptr,
false);
nullptr);
auto storeRegMem = genCmdCast<MI_STORE_REGISTER_MEM *>(buffer);
ASSERT_NE(nullptr, storeRegMem);
@@ -132,8 +131,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterHardwareCommandsTest, givenWorkloadPart
offset,
gpuAddress,
true,
&outCmdBuffer,
false);
&outCmdBuffer);
storeRegMem = genCmdCast<MI_STORE_REGISTER_MEM *>(ptrOffset(buffer, beforeEncode));
ASSERT_NE(nullptr, storeRegMem);

18
shared/test/unit_test/encoders/test_encode_set_mmio.cpp
View File

@@ -47,7 +47,7 @@ HWTEST_F(CommandSetMMIOTest, WhenProgrammingThenLoadRegisterImmIsUsed) {
}
HWTEST_F(CommandSetMMIOTest, WhenProgrammingThenLoadRegisterMemIsUsed) {
EncodeSetMMIO<FamilyType>::encodeMEM(*cmdContainer.get(), 0x2000, 0xDEADBEEFCAF0, false);
EncodeSetMMIO<FamilyType>::encodeMEM(*cmdContainer.get(), 0x2000, 0xDEADBEEFCAF0);
GenCmdList commands;
CmdParse<FamilyType>::parseCommandBuffer(commands, ptrOffset(cmdContainer->getCommandStream()->getCpuBase(), 0), cmdContainer->getCommandStream()->getUsed());
@@ -63,7 +63,7 @@ HWTEST_F(CommandSetMMIOTest, WhenProgrammingThenLoadRegisterMemIsUsed) {
}
HWTEST_F(CommandSetMMIOTest, WhenProgrammingThenLoadRegisterRegIsUsed) {
EncodeSetMMIO<FamilyType>::encodeREG(*cmdContainer.get(), 0x2000, 0x2000, false);
EncodeSetMMIO<FamilyType>::encodeREG(*cmdContainer.get(), 0x2000, 0x2000);
GenCmdList commands;
CmdParse<FamilyType>::parseCommandBuffer(commands, ptrOffset(cmdContainer->getCommandStream()->getCpuBase(), 0), cmdContainer->getCommandStream()->getUsed());
@@ -99,7 +99,7 @@ HWTEST2_F(CommandSetMMIOTest, givenRegisterWithinRemapRangeWhenEncodingLoadingMM
for (uint32_t offset = remapApplicableOffsets[2 * i]; offset < remapApplicableOffsets[2 * i + 1]; offset += 32) {
MI_LOAD_REGISTER_MEM *miLoadReg = reinterpret_cast<MI_LOAD_REGISTER_MEM *>(cmdContainer->getCommandStream()->getSpace(0));
EncodeSetMMIO<FamilyType>::encodeMEM(*cmdContainer.get(), offset, 0xDEADBEEFCAF0, false);
EncodeSetMMIO<FamilyType>::encodeMEM(*cmdContainer.get(), offset, 0xDEADBEEFCAF0);
EXPECT_EQ(offset, miLoadReg->getRegisterAddress());
EXPECT_EQ(0xDEADBEEFCAF0u, miLoadReg->getMemoryAddress());
@@ -109,7 +109,7 @@ HWTEST2_F(CommandSetMMIOTest, givenRegisterWithinRemapRangeWhenEncodingLoadingMM
{
MI_LOAD_REGISTER_MEM *miLoadReg = reinterpret_cast<MI_LOAD_REGISTER_MEM *>(cmdContainer->getCommandStream()->getSpace(0));
EncodeSetMMIO<FamilyType>::encodeMEM(*cmdContainer.get(), 0x3000, 0xDEADBEEFCAF0, false);
EncodeSetMMIO<FamilyType>::encodeMEM(*cmdContainer.get(), 0x3000, 0xDEADBEEFCAF0);
EXPECT_EQ(0x3000u, miLoadReg->getRegisterAddress());
EXPECT_EQ(0xDEADBEEFCAF0u, miLoadReg->getMemoryAddress());
@@ -117,7 +117,7 @@ HWTEST2_F(CommandSetMMIOTest, givenRegisterWithinRemapRangeWhenEncodingLoadingMM
}
{
MI_LOAD_REGISTER_MEM *miLoadReg = reinterpret_cast<MI_LOAD_REGISTER_MEM *>(cmdContainer->getCommandStream()->getSpace(0));
EncodeSetMMIO<FamilyType>::encodeMEM(*cmdContainer.get(), 0x4300, 0xDEADBEEFCAF0, false);
EncodeSetMMIO<FamilyType>::encodeMEM(*cmdContainer.get(), 0x4300, 0xDEADBEEFCAF0);
EXPECT_EQ(0x4300u, miLoadReg->getRegisterAddress());
EXPECT_EQ(0xDEADBEEFCAF0u, miLoadReg->getMemoryAddress());
@@ -125,7 +125,7 @@ HWTEST2_F(CommandSetMMIOTest, givenRegisterWithinRemapRangeWhenEncodingLoadingMM
}
{
MI_LOAD_REGISTER_MEM *miLoadReg = reinterpret_cast<MI_LOAD_REGISTER_MEM *>(cmdContainer->getCommandStream()->getSpace(0));
EncodeSetMMIO<FamilyType>::encodeMEM(*cmdContainer.get(), 0x5000, 0xDEADBEEFCAF0, false);
EncodeSetMMIO<FamilyType>::encodeMEM(*cmdContainer.get(), 0x5000, 0xDEADBEEFCAF0);
EXPECT_EQ(0x5000u, miLoadReg->getRegisterAddress());
EXPECT_EQ(0xDEADBEEFCAF0u, miLoadReg->getMemoryAddress());
@@ -143,7 +143,7 @@ HWTEST2_F(CommandSetMMIOTest, givenRegisterWithinRemapRangeWhenEncodingLoadingMM
for (int i = 0; i < 3; i++) {
for (uint32_t offset = remapApplicableOffsets[2 * i]; offset < remapApplicableOffsets[2 * i + 1]; offset += 32) {
MI_LOAD_REGISTER_REG *miLoadReg = reinterpret_cast<MI_LOAD_REGISTER_REG *>(cmdContainer->getCommandStream()->getSpace(0));
EncodeSetMMIO<FamilyType>::encodeREG(*cmdContainer.get(), offset, offset, false);
EncodeSetMMIO<FamilyType>::encodeREG(*cmdContainer.get(), offset, offset);
EXPECT_EQ(offset, miLoadReg->getSourceRegisterAddress());
EXPECT_EQ(offset, miLoadReg->getDestinationRegisterAddress());
@@ -154,7 +154,7 @@ HWTEST2_F(CommandSetMMIOTest, givenRegisterWithinRemapRangeWhenEncodingLoadingMM
{
MI_LOAD_REGISTER_REG *miLoadReg = reinterpret_cast<MI_LOAD_REGISTER_REG *>(cmdContainer->getCommandStream()->getSpace(0));
EncodeSetMMIO<FamilyType>::encodeREG(*cmdContainer.get(), 0x1000, 0x2500, false);
EncodeSetMMIO<FamilyType>::encodeREG(*cmdContainer.get(), 0x1000, 0x2500);
EXPECT_EQ(0x2500u, miLoadReg->getSourceRegisterAddress());
EXPECT_EQ(0x1000u, miLoadReg->getDestinationRegisterAddress());
@@ -163,7 +163,7 @@ HWTEST2_F(CommandSetMMIOTest, givenRegisterWithinRemapRangeWhenEncodingLoadingMM
}
{
MI_LOAD_REGISTER_REG *miLoadReg = reinterpret_cast<MI_LOAD_REGISTER_REG *>(cmdContainer->getCommandStream()->getSpace(0));
EncodeSetMMIO<FamilyType>::encodeREG(*cmdContainer.get(), 0x2200, 0x4000, false);
EncodeSetMMIO<FamilyType>::encodeREG(*cmdContainer.get(), 0x2200, 0x4000);
EXPECT_EQ(0x4000u, miLoadReg->getSourceRegisterAddress());
EXPECT_EQ(0x2200u, miLoadReg->getDestinationRegisterAddress());

2
shared/test/unit_test/helpers/gfx_core_helper_tests.cpp
View File

@@ -1898,7 +1898,7 @@ HWTEST_F(GfxCoreHelperTest, whenEncodeAdditionalTimestampOffsetsThenNothingEncod
LinearStream stream(streamBuffer, bufferSize);
uint64_t fstAddress = 0;
uint64_t sndAddress = 0;
MemorySynchronizationCommands<FamilyType>::encodeAdditionalTimestampOffsets(stream, fstAddress, sndAddress, false);
MemorySynchronizationCommands<FamilyType>::encodeAdditionalTimestampOffsets(stream, fstAddress, sndAddress);
HardwareParse hwParser;
hwParser.parseCommands<FamilyType>(stream, 0);

2
shared/test/unit_test/helpers/gfx_core_helper_xe2_and_later.cpp
View File

@@ -89,7 +89,7 @@ HWTEST2_F(GfxCoreHelperXe2AndLaterTests, givenAtLeastXe2HpgWhenEncodeAdditionalT
LinearStream stream(streamBuffer, bufferSize);
uint64_t fstAddress = 12;
uint64_t sndAddress = 100;
MemorySynchronizationCommands<FamilyType>::encodeAdditionalTimestampOffsets(stream, fstAddress, sndAddress, false);
MemorySynchronizationCommands<FamilyType>::encodeAdditionalTimestampOffsets(stream, fstAddress, sndAddress);
HardwareParse hwParser;
hwParser.parseCommands<FamilyType>(stream, 0);