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

feature: enable implicit conversion to counter based events 

Related-To: NEO-8145

Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>
This commit is contained in:
Dunajski, Bartosz 2023-12-12 16:19:01 +00:00 committed by Compute-Runtime-Automation
parent 8c90350f3c
commit 7fa7d4204d
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
level_zero/core/source/cmdlist/cmdlist_hw.inl
View File

@ -3670,7 +3670,7 @@ bool CommandListCoreFamily<gfxCoreFamily>::handleCounterBasedEventOperations(Eve
return false;
}
if ((NEO::debugManager.flags.EnableImplicitConvertionToCounterBasedEvents.get() == 1)) {
if ((NEO::debugManager.flags.EnableImplicitConvertionToCounterBasedEvents.get() != 0)) {
if (signalEvent->isCounterBasedExplicitlyEnabled()) {
return true;
}

1
level_zero/core/source/device/bcs_split.cpp
View File

@ -165,6 +165,7 @@ size_t BcsSplit::Events::allocateNew(Context *context, size_t maxEventCountInPoo
ze_event_handle_t hEvent{};
pool->createEvent(&desc, &hEvent);
Event::fromHandle(hEvent)->disableImplicitCounterBasedMode();
// Last event, created with host scope flag, is marker event.
if (i == neededEvents - 1) {

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

@ -695,6 +695,10 @@ struct InOrderCmdListTests : public CommandListAppendLaunchKernel {
void makeCounterBasedInitiallyDisabled() {
counterBasedMode = CounterBasedMode::InitiallyDisabled;
}
void makeCounterBasedImplicitlyDisabled() {
counterBasedMode = CounterBasedMode::ImplicitlyDisabled;
}
};
void SetUp() override {
@ -1185,8 +1189,8 @@ HWTEST2_F(InOrderCmdListTests, givenRegularEventWithTemporaryInOrderDataAssignme
auto hostAddress = static_cast<uint64_t *>(immCmdList->inOrderExecInfo->getDeviceCounterAllocation().getUnderlyingBuffer());
auto eventPool = createEvents<FamilyType>(1, false);
events[0]->makeCounterBasedInitiallyDisabled();
auto eventPool = createEvents<FamilyType>(1, true);
events[0]->makeCounterBasedImplicitlyDisabled();
auto nonWalkerSignallingSupported = immCmdList->isInOrderNonWalkerSignalingRequired(events[0].get());
@ -1220,7 +1224,7 @@ HWTEST2_F(InOrderCmdListTests, givenInOrderModeWheUsingRegularEventThenSetInOrde
immCmdList->inOrderExecInfo->addAllocationOffset(counterOffset);
auto eventPool = createEvents<FamilyType>(1, false);
events[0]->makeCounterBasedInitiallyDisabled();
events[0]->makeCounterBasedImplicitlyDisabled();
immCmdList->appendLaunchKernel(kernel->toHandle(), groupCount, events[0]->toHandle(), 0, nullptr, launchParams, false);
EXPECT_FALSE(events[0]->isCounterBased());
@ -1257,7 +1261,7 @@ HWTEST2_F(InOrderCmdListTests, givenRegularEventWithInOrderExecInfoWhenReusedOnR
auto immCmdList = createImmCmdList<gfxCoreFamily>();
auto eventPool = createEvents<FamilyType>(1, false);
events[0]->makeCounterBasedInitiallyDisabled();
events[0]->makeCounterBasedImplicitlyDisabled();
auto nonWalkerSignallingSupported = immCmdList->isInOrderNonWalkerSignalingRequired(events[0].get());
@ -1584,6 +1588,8 @@ HWTEST2_F(InOrderCmdListTests, givenInOrderEventModeWhenSubmittingThenProgramSem
}
HWTEST2_F(InOrderCmdListTests, givenImplicitEventConvertionEnabledWhenUsingImmediateCmdListThenConvertEventToCounterBased, IsAtLeastSkl) {
debugManager.flags.EnableImplicitConvertionToCounterBasedEvents.set(0);
auto immCmdList = createImmCmdList<gfxCoreFamily>();
auto outOfOrderImmCmdList = createImmCmdList<gfxCoreFamily>();
auto regularCmdList = createRegularCmdList<gfxCoreFamily>(false);
@ -1603,7 +1609,7 @@ HWTEST2_F(InOrderCmdListTests, givenImplicitEventConvertionEnabledWhenUsingImmed
EXPECT_EQ(Event::CounterBasedMode::InitiallyDisabled, events[1]->counterBasedMode);
EXPECT_FALSE(events[1]->isCounterBased());
debugManager.flags.EnableImplicitConvertionToCounterBasedEvents.set(1);
debugManager.flags.EnableImplicitConvertionToCounterBasedEvents.set(-1);
immCmdList->appendLaunchKernel(kernel->toHandle(), groupCount, events[0]->toHandle(), 0, nullptr, launchParams, false);
EXPECT_EQ(Event::CounterBasedMode::ImplicitlyEnabled, events[0]->counterBasedMode);
@ -1682,7 +1688,7 @@ HWTEST2_F(InOrderCmdListTests, givenCmdsChainingWhenDispatchingKernelThenProgram
auto immCmdList = createImmCmdList<gfxCoreFamily>();
auto eventPool = createEvents<FamilyType>(1, false);
events[0]->makeCounterBasedInitiallyDisabled();
events[0]->makeCounterBasedImplicitlyDisabled();
auto cmdStream = immCmdList->getCmdContainer().getCommandStream();
@ -1757,8 +1763,6 @@ HWTEST2_F(InOrderCmdListTests, givenCmdsChainingWhenDispatchingKernelThenProgram
}
HWTEST2_F(InOrderCmdListTests, givenImmediateCmdListWhenDispatchingWithRegularEventThenSwitchToCounterBased, IsAtLeastXeHpCore) {
debugManager.flags.EnableImplicitConvertionToCounterBasedEvents.set(1);
auto immCmdList = createImmCmdList<gfxCoreFamily>();
auto copyOnlyCmdList = createCopyOnlyImmCmdList<gfxCoreFamily>();
@ -1844,8 +1848,6 @@ HWTEST2_F(InOrderCmdListTests, givenImmediateCmdListWhenDispatchingWithRegularEv
}
HWTEST2_F(InOrderCmdListTests, givenNonInOrderCmdListWhenPassingCounterBasedEventThenReturnError, IsAtLeastXeHpCore) {
debugManager.flags.EnableImplicitConvertionToCounterBasedEvents.set(1);
auto immCmdList = createImmCmdList<gfxCoreFamily>();
immCmdList->inOrderExecInfo.reset();
EXPECT_FALSE(immCmdList->isInOrderExecutionEnabled());
@ -1912,7 +1914,7 @@ HWTEST2_F(InOrderCmdListTests, givenCmdsChainingFromAppendCopyWhenDispatchingKer
auto immCmdList = createImmCmdList<gfxCoreFamily>();
auto eventPool = createEvents<FamilyType>(1, false);
events[0]->makeCounterBasedInitiallyDisabled();
events[0]->makeCounterBasedImplicitlyDisabled();
auto cmdStream = immCmdList->getCmdContainer().getCommandStream();
@ -2556,7 +2558,7 @@ HWTEST2_F(InOrderCmdListTests, givenInOrderModeWhenProgrammingRegularEventThenCl
auto eventPool = createEvents<FamilyType>(1, false);
events[0]->signalScope = 0;
events[0]->makeCounterBasedInitiallyDisabled();
events[0]->makeCounterBasedImplicitlyDisabled();
immCmdList->appendLaunchKernel(kernel->toHandle(), groupCount, events[0]->toHandle(), 0, nullptr, launchParams, false);
@ -5025,6 +5027,18 @@ HWTEST2_F(BcsSplitInOrderCmdListTests, givenBcsSplitEnabledWhenDispatchingCopyTh
EXPECT_EQ(immCmdList->isQwordInOrderCounter(), sdiCmd->getStoreQword());
EXPECT_EQ(1u, sdiCmd->getDataDword0());
EXPECT_EQ(0u, sdiCmd->getDataDword1());
auto &bcsSplit = static_cast<DeviceImp *>(device)->bcsSplit;
for (auto &event : bcsSplit.events.barrier) {
EXPECT_FALSE(event->isCounterBased());
}
for (auto &event : bcsSplit.events.subcopy) {
EXPECT_FALSE(event->isCounterBased());
}
for (auto &event : bcsSplit.events.marker) {
EXPECT_FALSE(event->isCounterBased());
}
}
HWTEST2_F(BcsSplitInOrderCmdListTests, givenBcsSplitEnabledWhenAppendingMemoryCopyAfterBarrierWithoutImplicitDependenciesThenHandleCorrectInOrderSignaling, IsAtLeastXeHpcCore) {
@ -5131,8 +5145,6 @@ HWTEST2_F(BcsSplitInOrderCmdListTests, givenBcsSplitEnabledWhenDispatchingCopyRe
}
HWTEST2_F(BcsSplitInOrderCmdListTests, givenImmediateCmdListWhenDispatchingWithRegularEventThenSwitchToCounterBased, IsAtLeastXeHpcCore) {
debugManager.flags.EnableImplicitConvertionToCounterBasedEvents.set(1);
auto immCmdList = createBcsSplitImmCmdList<gfxCoreFamily>();
auto eventPool = createEvents<FamilyType>(1, true);