Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Program SIP end WA for non-copyOnly cmd queues

Browse Source 
Resolves: NEO-6949

Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
This commit is contained in:
Mateusz Hoppe
2022-05-23 12:50:09 +00:00
committed by Compute-Runtime-Automation
parent a552252fee
commit 66c1727398
2 changed files with 82 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -432,7 +432,7 @@ ze_result_t CommandQueueHw<gfxCoreFamily>::executeCommandLists(
commandList->migrateSharedAllocations();
}
if (stateSipRequired) {
if (!isCopyOnlyCommandQueue && stateSipRequired) {
NEO::PreemptionHelper::programStateSipEndWa<GfxFamily>(child, *neoDevice);
}

81
level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_2.cpp
View File

@ -425,5 +425,86 @@ HWTEST2_F(L0DebuggerWithBlitterTest, givenDebuggingEnabledWhenInternalCmdQIsUsed
commandList->destroy();
}
HWTEST_F(L0DebuggerWithBlitterTest, givenDebuggingEnabledWhenCommandListIsExecutedOnCopyOnlyCmdQThenKernelDebugCommandsAreNotAdded) {
using MI_LOAD_REGISTER_IMM = typename FamilyType::MI_LOAD_REGISTER_IMM;
using STATE_SIP = typename FamilyType::STATE_SIP;
auto &selectorCopyEngine = neoDevice->getSelectorCopyEngine();
auto deviceBitfield = neoDevice->getDeviceBitfield();
auto bcsEngine = neoDevice->tryGetEngine(EngineHelpers::getBcsEngineType(hwInfo, deviceBitfield, selectorCopyEngine, false), EngineUsage::Regular);
if (!bcsEngine) {
GTEST_SKIP();
}
ze_command_queue_desc_t queueDesc = {};
ze_result_t returnValue;
auto commandQueue = whiteboxCast(CommandQueue::create(productFamily, device, bcsEngine->commandStreamReceiver, &queueDesc, true, false, returnValue));
ASSERT_NE(nullptr, commandQueue->commandStream);
auto usedSpaceBefore = commandQueue->commandStream->getUsed();
auto commandList = CommandList::create(productFamily, device, EngineGroupType::Copy, 0u, returnValue);
ze_command_list_handle_t commandLists[] = {commandList->toHandle()};
uint32_t numCommandLists = sizeof(commandLists) / sizeof(commandLists[0]);
char src[8];
char dest[8];
auto result = commandList->appendMemoryCopy(dest, src, 8, nullptr, 0, nullptr);
ASSERT_EQ(ZE_RESULT_SUCCESS, result);
result = commandQueue->executeCommandLists(numCommandLists, commandLists, nullptr, true);
ASSERT_EQ(ZE_RESULT_SUCCESS, result);
auto usedSpaceAfter = commandQueue->commandStream->getUsed();
ASSERT_GT(usedSpaceAfter, usedSpaceBefore);
GenCmdList cmdList;
ASSERT_TRUE(FamilyType::PARSE::parseCommandBuffer(
cmdList, ptrOffset(commandQueue->commandStream->getCpuBase(), 0), usedSpaceAfter));
auto miLoadImm = findAll<MI_LOAD_REGISTER_IMM *>(cmdList.begin(), cmdList.end());
size_t debugModeRegisterCount = 0;
size_t tdDebugControlRegisterCount = 0;
uint32_t globalSipFound = 0;
for (size_t i = 0; i < miLoadImm.size(); i++) {
MI_LOAD_REGISTER_IMM *miLoad = genCmdCast<MI_LOAD_REGISTER_IMM *>(*miLoadImm[i]);
ASSERT_NE(nullptr, miLoad);
if (miLoad->getRegisterOffset() == DebugModeRegisterOffset<FamilyType>::registerOffset) {
debugModeRegisterCount++;
}
if (miLoad->getRegisterOffset() == TdDebugControlRegisterOffset<FamilyType>::registerOffset) {
tdDebugControlRegisterCount++;
}
if (miLoad->getRegisterOffset() == GlobalSipRegister<FamilyType>::registerOffset) {
globalSipFound++;
}
}
// those register should not be used
EXPECT_EQ(0u, debugModeRegisterCount);
EXPECT_EQ(0u, tdDebugControlRegisterCount);
EXPECT_EQ(0u, globalSipFound);
if (!HwHelper::get(hwInfo.platform.eRenderCoreFamily).isSipWANeeded(hwInfo)) {
auto stateSipCmds = findAll<STATE_SIP *>(cmdList.begin(), cmdList.end());
if (device->getDevicePreemptionMode() != PreemptionMode::MidThread) {
ASSERT_EQ(0u, stateSipCmds.size());
}
}
for (auto i = 0u; i < numCommandLists; i++) {
auto commandList = CommandList::fromHandle(commandLists[i]);
commandList->destroy();
}
commandQueue->destroy();
}
} // namespace ult
} // namespace L0