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

feature: in-order flush is host visible if dc flush not required 

Related-To: NEO-7966

Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>
This commit is contained in:
Dunajski, Bartosz 2023-10-31 14:00:02 +00:00 committed by Compute-Runtime-Automation
parent 330fb40107
commit 130fbced5b
3 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl
View File

@ -943,11 +943,11 @@ ze_result_t CommandListCoreFamilyImmediate<gfxCoreFamily>::flushImmediate(ze_res
} }
} }
this->latestFlushIsHostVisible = !this->dcFlushSupport;
if (signalEvent) { if (signalEvent) {
signalEvent->setCsr(this->csr, isInOrderExecutionEnabled()); signalEvent->setCsr(this->csr, isInOrderExecutionEnabled());
this->latestFlushIsHostVisible = signalEvent->isSignalScope(ZE_EVENT_SCOPE_FLAG_HOST); this->latestFlushIsHostVisible |= signalEvent->isSignalScope(ZE_EVENT_SCOPE_FLAG_HOST);
} else {
this->latestFlushIsHostVisible = false;
} }
return inputRet; return inputRet;

2
level_zero/core/test/unit_tests/mocks/mock_cmdlist.h
View File

@ -61,6 +61,7 @@ struct WhiteBox<::L0::CommandListCoreFamily<gfxCoreFamily>>
using BaseClass::currentDynamicStateBaseAddress; using BaseClass::currentDynamicStateBaseAddress;
using BaseClass::currentIndirectObjectBaseAddress; using BaseClass::currentIndirectObjectBaseAddress;
using BaseClass::currentSurfaceStateBaseAddress; using BaseClass::currentSurfaceStateBaseAddress;
using BaseClass::dcFlushSupport;
using BaseClass::device; using BaseClass::device;
using BaseClass::dispatchCmdListBatchBufferAsPrimary; using BaseClass::dispatchCmdListBatchBufferAsPrimary;
using BaseClass::doubleSbaWa; using BaseClass::doubleSbaWa;
@ -168,6 +169,7 @@ struct WhiteBox<L0::CommandListCoreFamilyImmediate<gfxCoreFamily>>
using BaseClass::compactL3FlushEvent; using BaseClass::compactL3FlushEvent;
using BaseClass::compactL3FlushEventPacket; using BaseClass::compactL3FlushEventPacket;
using BaseClass::csr; using BaseClass::csr;
using BaseClass::dcFlushSupport;
using BaseClass::device; using BaseClass::device;
using BaseClass::doubleSbaWa; using BaseClass::doubleSbaWa;
using BaseClass::engineGroupType; using BaseClass::engineGroupType;

32
level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp
View File

@ -878,9 +878,11 @@ HWTEST2_F(InOrderCmdListTests, givenCmdListsWhenDispatchingThenUseInternalTaskCo
{ {
immCmdList0->hostSynchronize(0); immCmdList0->hostSynchronize(0);
EXPECT_EQ(1u, ultCsr->latestWaitForCompletionWithTimeoutTaskCount.load()); EXPECT_EQ(1u, ultCsr->latestWaitForCompletionWithTimeoutTaskCount.load());
EXPECT_EQ(1u, ultCsr->waitForCompletionWithTimeoutTaskCountCalled.load());
immCmdList1->hostSynchronize(0); immCmdList1->hostSynchronize(0);
EXPECT_EQ(2u, ultCsr->latestWaitForCompletionWithTimeoutTaskCount.load()); EXPECT_EQ(2u, ultCsr->latestWaitForCompletionWithTimeoutTaskCount.load());
EXPECT_EQ(2u, ultCsr->waitForCompletionWithTimeoutTaskCountCalled.load());
} }
// implicit wait // implicit wait
@ -894,12 +896,20 @@ HWTEST2_F(InOrderCmdListTests, givenCmdListsWhenDispatchingThenUseInternalTaskCo
ASSERT_EQ(result, ZE_RESULT_SUCCESS); ASSERT_EQ(result, ZE_RESULT_SUCCESS);
uint32_t hostCopyData = 0; uint32_t hostCopyData = 0;
auto hostAddress0 = static_cast<uint64_t *>(immCmdList0->inOrderExecInfo->inOrderDependencyCounterAllocation.getUnderlyingBuffer());
auto hostAddress1 = static_cast<uint64_t *>(immCmdList1->inOrderExecInfo->inOrderDependencyCounterAllocation.getUnderlyingBuffer());
*hostAddress0 = 1;
*hostAddress1 = 1;
immCmdList0->appendMemoryCopy(deviceAlloc, &hostCopyData, 1, nullptr, 0, nullptr, false, false); immCmdList0->appendMemoryCopy(deviceAlloc, &hostCopyData, 1, nullptr, 0, nullptr, false, false);
EXPECT_EQ(1u, ultCsr->latestWaitForCompletionWithTimeoutTaskCount.load());
EXPECT_EQ(immCmdList0->dcFlushSupport ? 1u : 2u, ultCsr->latestWaitForCompletionWithTimeoutTaskCount.load());
EXPECT_EQ(immCmdList0->dcFlushSupport ? 3u : 2u, ultCsr->waitForCompletionWithTimeoutTaskCountCalled.load());
immCmdList1->appendMemoryCopy(deviceAlloc, &hostCopyData, 1, nullptr, 0, nullptr, false, false); immCmdList1->appendMemoryCopy(deviceAlloc, &hostCopyData, 1, nullptr, 0, nullptr, false, false);
EXPECT_EQ(2u, ultCsr->latestWaitForCompletionWithTimeoutTaskCount.load()); EXPECT_EQ(2u, ultCsr->latestWaitForCompletionWithTimeoutTaskCount.load());
EXPECT_EQ(immCmdList0->dcFlushSupport ? 4u : 2u, ultCsr->waitForCompletionWithTimeoutTaskCountCalled.load());
context->freeMem(deviceAlloc); context->freeMem(deviceAlloc);
} }
@ -2080,27 +2090,45 @@ HWTEST2_F(InOrderCmdListTests, givenHostVisibleEventOnLatestFlushWhenCallingSync
EXPECT_FALSE(immCmdList->latestFlushIsHostVisible); EXPECT_FALSE(immCmdList->latestFlushIsHostVisible);
immCmdList->appendLaunchKernel(kernel->toHandle(), groupCount, events[0]->toHandle(), 0, nullptr, launchParams, false); immCmdList->appendLaunchKernel(kernel->toHandle(), groupCount, events[0]->toHandle(), 0, nullptr, launchParams, false);
EXPECT_FALSE(immCmdList->latestFlushIsHostVisible); EXPECT_EQ(immCmdList->dcFlushSupport ? false : true, immCmdList->latestFlushIsHostVisible);
EXPECT_EQ(0u, immCmdList->synchronizeInOrderExecutionCalled); EXPECT_EQ(0u, immCmdList->synchronizeInOrderExecutionCalled);
EXPECT_EQ(0u, ultCsr->waitForCompletionWithTimeoutTaskCountCalled); EXPECT_EQ(0u, ultCsr->waitForCompletionWithTimeoutTaskCountCalled);
immCmdList->hostSynchronize(0, 1, false); immCmdList->hostSynchronize(0, 1, false);
if (immCmdList->dcFlushSupport) {
EXPECT_EQ(0u, immCmdList->synchronizeInOrderExecutionCalled); EXPECT_EQ(0u, immCmdList->synchronizeInOrderExecutionCalled);
EXPECT_EQ(1u, ultCsr->waitForCompletionWithTimeoutTaskCountCalled); EXPECT_EQ(1u, ultCsr->waitForCompletionWithTimeoutTaskCountCalled);
} else {
EXPECT_EQ(1u, immCmdList->synchronizeInOrderExecutionCalled);
EXPECT_EQ(0u, ultCsr->waitForCompletionWithTimeoutTaskCountCalled);
}
events[0]->signalScope = ZE_EVENT_SCOPE_FLAG_HOST; events[0]->signalScope = ZE_EVENT_SCOPE_FLAG_HOST;
immCmdList->appendLaunchKernel(kernel->toHandle(), groupCount, events[0]->toHandle(), 0, nullptr, launchParams, false); immCmdList->appendLaunchKernel(kernel->toHandle(), groupCount, events[0]->toHandle(), 0, nullptr, launchParams, false);
EXPECT_TRUE(immCmdList->latestFlushIsHostVisible); EXPECT_TRUE(immCmdList->latestFlushIsHostVisible);
immCmdList->hostSynchronize(0, 1, false); immCmdList->hostSynchronize(0, 1, false);
if (immCmdList->dcFlushSupport) {
EXPECT_EQ(1u, immCmdList->synchronizeInOrderExecutionCalled); EXPECT_EQ(1u, immCmdList->synchronizeInOrderExecutionCalled);
EXPECT_EQ(1u, ultCsr->waitForCompletionWithTimeoutTaskCountCalled); EXPECT_EQ(1u, ultCsr->waitForCompletionWithTimeoutTaskCountCalled);
} else {
EXPECT_EQ(2u, immCmdList->synchronizeInOrderExecutionCalled);
EXPECT_EQ(0u, ultCsr->waitForCompletionWithTimeoutTaskCountCalled);
}
// handle post sync operations // handle post sync operations
immCmdList->hostSynchronize(0, 1, true); immCmdList->hostSynchronize(0, 1, true);
if (immCmdList->dcFlushSupport) {
EXPECT_EQ(1u, immCmdList->synchronizeInOrderExecutionCalled); EXPECT_EQ(1u, immCmdList->synchronizeInOrderExecutionCalled);
EXPECT_EQ(2u, ultCsr->waitForCompletionWithTimeoutTaskCountCalled); EXPECT_EQ(2u, ultCsr->waitForCompletionWithTimeoutTaskCountCalled);
} else {
EXPECT_EQ(2u, immCmdList->synchronizeInOrderExecutionCalled);
EXPECT_EQ(1u, ultCsr->waitForCompletionWithTimeoutTaskCountCalled);
}
} }
using NonPostSyncWalkerMatcher = IsWithinGfxCore<IGFX_GEN9_CORE, IGFX_GEN12LP_CORE>; using NonPostSyncWalkerMatcher = IsWithinGfxCore<IGFX_GEN9_CORE, IGFX_GEN12LP_CORE>;