Skip to content

Commit c2266fc

Browse files
refactor: remove not used CB event TS logic
Signed-off-by: Bartosz Dunajski <[email protected]>
1 parent 6f4a56d commit c2266fc

File tree

8 files changed

+3
-20
lines changed

8 files changed

+3
-20
lines changed

level_zero/core/source/cmdlist/cmdlist_hw.inl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4316,7 +4316,7 @@ bool CommandListCoreFamily<gfxCoreFamily>::handleCounterBasedEventOperations(Eve
43164316
}
43174317
}
43184318

4319-
if (signalEvent->isUsingContextEndOffset() && Event::standaloneInOrderTimestampAllocationEnabled()) {
4319+
if (signalEvent->isUsingContextEndOffset()) {
43204320
auto tag = device->getInOrderTimestampAllocator()->getTag();
43214321

43224322
this->commandContainer.addToResidencyContainer(tag->getBaseGraphicsAllocation()->getGraphicsAllocation(device->getRootDeviceIndex()));

level_zero/core/source/cmdlist/cmdlist_hw_xehp_and_later.inl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendLaunchKernelWithParams(K
332332
if (inOrderExecSignalRequired) {
333333
if (!compactEvent || this->asMutable() || !compactEvent->isCounterBased() || compactEvent->isUsingContextEndOffset()) {
334334
if (inOrderNonWalkerSignalling) {
335-
if (!eventForInOrderExec->getAllocation(this->device) && Event::standaloneInOrderTimestampAllocationEnabled()) {
335+
if (!eventForInOrderExec->getAllocation(this->device)) {
336336
eventForInOrderExec->resetInOrderTimestampNode(device->getInOrderTimestampAllocator()->getTag(), this->partitionCount);
337337
}
338338
if (this->asMutable() || !eventForInOrderExec->isCounterBased()) {

level_zero/core/source/event/event.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ template Event *Event::create<uint32_t>(EventPool *, const ze_event_desc_t *, De
4242
template Event *Event::create<uint64_t>(const EventDescriptor &, Device *, ze_result_t &);
4343
template Event *Event::create<uint32_t>(const EventDescriptor &, Device *, ze_result_t &);
4444

45-
bool Event::standaloneInOrderTimestampAllocationEnabled() {
46-
return (NEO::debugManager.flags.StandaloneInOrderTimestampAllocationEnabled.get() != 0);
47-
}
48-
4945
ze_result_t EventPool::initialize(DriverHandle *driver, Context *context, uint32_t numDevices, ze_device_handle_t *deviceHandles) {
5046
this->context = static_cast<ContextImp *>(context);
5147

level_zero/core/source/event/event.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,6 @@ struct Event : _ze_event_handle_t {
133133
implicitlyDisabled
134134
};
135135

136-
static bool standaloneInOrderTimestampAllocationEnabled();
137-
138136
template <typename TagSizeT>
139137
static Event *create(EventPool *eventPool, const ze_event_desc_t *desc, Device *device);
140138

level_zero/core/source/event/event_impl.inl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Event *Event::create(EventPool *eventPool, const ze_event_desc_t *desc, Device *
135135
.ipcPool = eventPool->isIpcPoolFlagSet(),
136136
};
137137

138-
if (eventPool->getCounterBasedFlags() != 0 && standaloneInOrderTimestampAllocationEnabled()) {
138+
if (eventPool->getCounterBasedFlags() != 0) {
139139
eventDescriptor.eventPoolAllocation = nullptr;
140140
}
141141

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1759,15 +1759,6 @@ struct StandaloneInOrderTimestampAllocationTests : public InOrderCmdListFixture
17591759
}
17601760
};
17611761

1762-
HWTEST2_F(StandaloneInOrderTimestampAllocationTests, givenDebugFlagSetWhenCreatingEventThenDontCreateTimestampNode, MatchAny) {
1763-
NEO::debugManager.flags.StandaloneInOrderTimestampAllocationEnabled.set(0);
1764-
auto eventPool = createEvents<FamilyType>(1, true);
1765-
auto cmdList = createImmCmdList<FamilyType::gfxCoreFamily>();
1766-
cmdList->appendLaunchKernel(kernel->toHandle(), groupCount, events[0]->toHandle(), 0, nullptr, launchParams, false);
1767-
EXPECT_TRUE(events[0]->inOrderTimestampNode.empty());
1768-
EXPECT_NE(nullptr, events[0]->eventPoolAllocation);
1769-
}
1770-
17711762
HWTEST2_F(StandaloneInOrderTimestampAllocationTests, givenSignalScopeEventWhenSignalEventIsCalledThenProgramPipeControl, MatchAny) {
17721763
using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL;
17731764
auto eventPool = createEvents<FamilyType>(2, false);

shared/source/debug_settings/debug_variables_base.inl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,6 @@ DECLARE_DEBUG_VARIABLE(int32_t, ForceSynchronizedDispatchMode, -1, "-1: default,
300300
DECLARE_DEBUG_VARIABLE(int32_t, ForceSipClass, -1, "-1: default, otherwise based on values from enum class SipClassType (init, builtins, rawBinaryFromFile, hexadecimalHeaderFile, externalLib)")
301301
DECLARE_DEBUG_VARIABLE(int32_t, ForceScratchAndMTPBufferSizeMode, -1, "-1: default, 0: Full, 1: Min. BMG+: Reduce required memory for scratch and MTP buffers on CCS context")
302302
DECLARE_DEBUG_VARIABLE(int32_t, CFEStackIDControl, -1, "Set Stack ID Control in CFE_STATE on Xe2+, -1 - do not set")
303-
DECLARE_DEBUG_VARIABLE(int32_t, StandaloneInOrderTimestampAllocationEnabled, -1, "-1: default, 0: disabled, 1: enabled. If enabled, use internal allocations, instead of Event pool for timestamps")
304303
DECLARE_DEBUG_VARIABLE(int32_t, ClearStandaloneInOrderTimestampAllocation, -1, "-1: default, 0: disabled, 1: enabled. If clear allocation before sending to GPU")
305304
DECLARE_DEBUG_VARIABLE(int32_t, EnableTimestampPoolAllocator, -1, "-1: default, 0: disabled, 1: enabled. If enabled, timestamp allocations are pooled and reused across multiple event pools")
306305
DECLARE_DEBUG_VARIABLE(int32_t, ForceComputeWalkerPostSyncFlushWithWrite, -1, "-1: ignore. >=0: Force PostSync cache flush and override postSync immediate write address to given value")

shared/test/common/test_files/igdrcl.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,6 @@ ForceScratchAndMTPBufferSizeMode = -1
625625
ForcePostSyncL1Flush = -1
626626
AllowNotZeroForCompressedOnWddm = -1
627627
ForceGmmSystemMemoryBufferForAllocations = 0
628-
StandaloneInOrderTimestampAllocationEnabled = -1
629628
ForceComputeWalkerPostSyncFlushWithWrite = -1
630629
DeferStateInitSubmissionToFirstRegularUsage = -1
631630
WaitForPagingFenceInController = -1

0 commit comments

Comments
 (0)