Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable prepatcher WA for L0 

Signed-off-by: Bartosz Dunajski <bartosz.dunajski@intel.com>
This commit is contained in:
Bartosz Dunajski 2022-03-11 13:47:59 +00:00 committed by Compute-Runtime-Automation
parent 2e6d8fefa3
commit c843d152ce
2 changed files with 91 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
level_zero/core/source/cmdqueue/cmdqueue_hw.inl
View File

@ -449,8 +449,14 @@ ze_result_t CommandQueueHw<gfxCoreFamily>::executeCommandLists(
csr->makeResident(*csr->getTagAllocation()); csr->makeResident(*csr->getTagAllocation());
void *endingCmd = nullptr; void *endingCmd = nullptr;
if (directSubmissionEnabled) { if (directSubmissionEnabled) {
auto offset = ptrDiff(child.getCpuBase(), commandStream->getCpuBase()) + child.getUsed();
uint64_t startAddress = commandStream->getGraphicsAllocation()->getGpuAddress() + offset;
if (NEO::DebugManager.flags.BatchBufferStartPrepatchingWaEnabled.get() == 0) {
startAddress = 0;
}
endingCmd = child.getSpace(0); endingCmd = child.getSpace(0);
NEO::EncodeBatchBufferStartOrEnd<GfxFamily>::programBatchBufferStart(&child, 0ull, false); NEO::EncodeBatchBufferStartOrEnd<GfxFamily>::programBatchBufferStart(&child, startAddress, false);
} else { } else {
MI_BATCH_BUFFER_END cmd = GfxFamily::cmdInitBatchBufferEnd; MI_BATCH_BUFFER_END cmd = GfxFamily::cmdInitBatchBufferEnd;
auto buffer = child.getSpaceForCmd<MI_BATCH_BUFFER_END>(); auto buffer = child.getSpaceForCmd<MI_BATCH_BUFFER_END>();

84
level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_1.cpp
View File

@ -1971,6 +1971,90 @@ HWTEST2_F(ExecuteCommandListTests, givenTwoCommandQueuesHavingTwoB2BCommandLists
commandQueue1->destroy(); commandQueue1->destroy();
} }
HWTEST_F(ExecuteCommandListTests, givenDirectSubmissionEnabledWhenExecutingCmdListThenSetNonZeroBatchBufferStartAddress) {
using MI_BATCH_BUFFER_START = typename FamilyType::MI_BATCH_BUFFER_START;
ze_command_queue_desc_t desc = {};
NEO::CommandStreamReceiver *csr;
device->getCsrForOrdinalAndIndex(&csr, 0u, 0u);
static_cast<NEO::UltCommandStreamReceiver<FamilyType> *>(csr)->directSubmissionAvailable = true;
ze_result_t returnValue;
auto commandQueue = whitebox_cast(CommandQueue::create(productFamily,
device,
csr,
&desc,
false,
false,
returnValue));
auto commandList = std::unique_ptr<CommandList>(whitebox_cast(CommandList::create(productFamily, device, NEO::EngineGroupType::RenderCompute, 0u, returnValue)));
commandList->setCommandListPerThreadPrivateScratchSize(0u);
auto commandListHandle = commandList->toHandle();
commandQueue->executeCommandLists(1, &commandListHandle, nullptr, false);
auto usedSpaceAfter = commandQueue->commandStream->getUsed();
GenCmdList cmdList;
ASSERT_TRUE(FamilyType::PARSE::parseCommandBuffer(
cmdList, ptrOffset(commandQueue->commandStream->getCpuBase(), 0), usedSpaceAfter));
auto bbStartCmds = findAll<MI_BATCH_BUFFER_START *>(cmdList.begin(), cmdList.end());
ASSERT_EQ(2u, bbStartCmds.size());
for (auto &cmd : bbStartCmds) {
auto bbStart = genCmdCast<MI_BATCH_BUFFER_START *>(*cmd);
EXPECT_NE(0u, bbStart->getBatchBufferStartAddress());
}
commandQueue->destroy();
}
HWTEST_F(ExecuteCommandListTests, givenDirectSubmissionEnabledAndDebugFlagSetWhenExecutingCmdListThenSetZeroBatchBufferStartAddress) {
DebugManagerStateRestore restore;
NEO::DebugManager.flags.BatchBufferStartPrepatchingWaEnabled.set(0);
using MI_BATCH_BUFFER_START = typename FamilyType::MI_BATCH_BUFFER_START;
ze_command_queue_desc_t desc = {};
NEO::CommandStreamReceiver *csr;
device->getCsrForOrdinalAndIndex(&csr, 0u, 0u);
static_cast<NEO::UltCommandStreamReceiver<FamilyType> *>(csr)->directSubmissionAvailable = true;
ze_result_t returnValue;
auto commandQueue = whitebox_cast(CommandQueue::create(productFamily,
device,
csr,
&desc,
false,
false,
returnValue));
auto commandList = std::unique_ptr<CommandList>(whitebox_cast(CommandList::create(productFamily, device, NEO::EngineGroupType::RenderCompute, 0u, returnValue)));
commandList->setCommandListPerThreadPrivateScratchSize(0u);
auto commandListHandle = commandList->toHandle();
commandQueue->executeCommandLists(1, &commandListHandle, nullptr, false);
auto usedSpaceAfter = commandQueue->commandStream->getUsed();
GenCmdList cmdList;
ASSERT_TRUE(FamilyType::PARSE::parseCommandBuffer(
cmdList, ptrOffset(commandQueue->commandStream->getCpuBase(), 0), usedSpaceAfter));
auto bbStartCmds = findAll<MI_BATCH_BUFFER_START *>(cmdList.begin(), cmdList.end());
EXPECT_EQ(2u, bbStartCmds.size());
for (auto &cmd : bbStartCmds) {
auto bbStart = genCmdCast<MI_BATCH_BUFFER_START *>(*cmd);
if (cmd == bbStartCmds.back()) {
EXPECT_EQ(0u, bbStart->getBatchBufferStartAddress());
} else {
EXPECT_NE(0u, bbStart->getBatchBufferStartAddress());
}
}
commandQueue->destroy();
}
TEST_F(CommandQueueCreate, givenOverrideCmdQueueSyncModeToDefaultWhenCommandQueueIsCreatedWithSynchronousModeThenDefaultModeIsSelected) { TEST_F(CommandQueueCreate, givenOverrideCmdQueueSyncModeToDefaultWhenCommandQueueIsCreatedWithSynchronousModeThenDefaultModeIsSelected) {
DebugManagerStateRestore restore; DebugManagerStateRestore restore;
NEO::DebugManager.flags.OverrideCmdQueueSynchronousMode.set(0); NEO::DebugManager.flags.OverrideCmdQueueSynchronousMode.set(0);