Skip to content

Commit 3341de7

Browse files
Revert "fix: disable in-order barrier skipping if dcFlush is required".
This reverts commit 8e75e06. Signed-off-by: Dunajski, Bartosz <[email protected]>
1 parent 7729eb8 commit 3341de7

File tree

2 files changed

+6
-18
lines changed

2 files changed

+6
-18
lines changed

level_zero/core/source/cmdlist/cmdlist_hw.inl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3195,10 +3195,6 @@ void CommandListCoreFamily<gfxCoreFamily>::programStateBaseAddress(NEO::CommandC
31953195

31963196
template <GFXCORE_FAMILY gfxCoreFamily>
31973197
bool CommandListCoreFamily<gfxCoreFamily>::isSkippingInOrderBarrierAllowed(ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) const {
3198-
if (dcFlushSupport) {
3199-
return false;
3200-
}
3201-
32023198
uint32_t eventsToWait = numWaitEvents;
32033199

32043200
for (uint32_t i = 0; i < numWaitEvents; i++) {

level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist.cpp

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3138,13 +3138,9 @@ HWTEST2_F(InOrderCmdListTests, givenInOrderModeWhenProgrammingAppendBarrierWitho
31383138
immCmdList->appendBarrier(nullptr, 0, nullptr, false);
31393139
immCmdList->appendBarrier(eventHandle, 0, nullptr, false);
31403140

3141-
if (immCmdList->getDcFlushRequired(true)) {
3142-
EXPECT_NE(offset, cmdStream->getUsed());
3143-
EXPECT_EQ(3u, events[0]->inOrderExecSignalValue);
3144-
} else {
3145-
EXPECT_EQ(offset, cmdStream->getUsed());
3146-
EXPECT_EQ(1u, events[0]->inOrderExecSignalValue);
3147-
}
3141+
EXPECT_EQ(offset, cmdStream->getUsed());
3142+
3143+
EXPECT_EQ(1u, events[0]->inOrderExecSignalValue);
31483144
}
31493145

31503146
HWTEST2_F(InOrderCmdListTests, givenRegularCmdListWhenProgrammingAppendBarrierWithoutWaitlistThenInheritSignalSyncAllocation, IsAtLeastSkl) {
@@ -3165,13 +3161,9 @@ HWTEST2_F(InOrderCmdListTests, givenRegularCmdListWhenProgrammingAppendBarrierWi
31653161
cmdList->appendBarrier(nullptr, 0, nullptr, false);
31663162
cmdList->appendBarrier(eventHandle, 0, nullptr, false);
31673163

3168-
if (cmdList->getDcFlushRequired(true)) {
3169-
EXPECT_NE(offset, cmdStream->getUsed());
3170-
EXPECT_EQ(3u, events[0]->inOrderExecSignalValue);
3171-
} else {
3172-
EXPECT_EQ(offset, cmdStream->getUsed());
3173-
EXPECT_EQ(1u, events[0]->inOrderExecSignalValue);
3174-
}
3164+
EXPECT_EQ(offset, cmdStream->getUsed());
3165+
3166+
EXPECT_EQ(1u, events[0]->inOrderExecSignalValue);
31753167
}
31763168

31773169
HWTEST2_F(InOrderCmdListTests, givenInOrderModeWhenProgrammingAppendBarrierWithDifferentEventsThenDontInherit, IsAtLeastXeHpCore) {

0 commit comments

Comments
 (0)