Skip to content

Commit 0377564

Browse files
smorek-intelCompute-Runtime-Automation
smorek-intel
authored and
Compute-Runtime-Automation
committed
refactor: remove unused code
Related-To: NEO-14360 Signed-off-by: Szymon Morek <[email protected]>
1 parent 88d379f commit 0377564

16 files changed

+42
-187
lines changed

‎level_zero/core/source/cmdlist/cmdlist_hw.inl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendLaunchKernel(ze_kernel_h
478478
auto res = appendLaunchKernelWithParams(kernel, threadGroupDimensions, event, launchParams);
479479

480480
if (!launchParams.skipInOrderNonWalkerSignaling) {
481-
handleInOrderDependencyCounter(event, isInOrderNonWalkerSignalingRequired(event) && !(event && event->isCounterBased() && event->isUsingContextEndOffset()), false);
481+
handleInOrderDependencyCounter(event, isInOrderNonWalkerSignalingRequired(event) && !(event && event->isCounterBased() && event->isEventTimestampFlagSet()), false);
482482
}
483483

484484
if (this->synchronizedDispatchMode != NEO::SynchronizedDispatchMode::disabled) {
@@ -4814,7 +4814,7 @@ bool CommandListCoreFamily<gfxCoreFamily>::handleCounterBasedEventOperations(Eve
48144814
}
48154815
}
48164816

4817-
if (signalEvent->isUsingContextEndOffset()) {
4817+
if (signalEvent->isEventTimestampFlagSet()) {
48184818
auto tag = device->getInOrderTimestampAllocator()->getTag();
48194819

48204820
if (skipAddingEventToResidency == false) {
@@ -5046,7 +5046,7 @@ void CommandListCoreFamily<gfxCoreFamily>::programEventL3Flush(Event *event) {
50465046
auto eventPartitionOffset = (partitionCount > 1) ? (partitionCount * event->getSinglePacketSize())
50475047
: event->getSinglePacketSize();
50485048
uint64_t eventAddress = event->getPacketAddress(device) + eventPartitionOffset;
5049-
if (event->isUsingContextEndOffset()) {
5049+
if (event->isEventTimestampFlagSet()) {
50505050
eventAddress += event->getContextEndOffset();
50515051
}
50525052

‎level_zero/core/source/cmdlist/cmdlist_hw_xehp_and_later.inl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ bool CommandListCoreFamily<gfxCoreFamily>::isInOrderNonWalkerSignalingRequired(c
5050

5151
const bool flushRequired = compactL3FlushEvent(getDcFlushRequired(event->isSignalScope()));
5252
const bool inOrderRequired = !this->duplicatedInOrderCounterStorageEnabled &&
53-
(event->isUsingContextEndOffset() || !event->isCounterBased());
53+
(event->isEventTimestampFlagSet() || !event->isCounterBased());
5454

5555
return flushRequired || inOrderRequired;
5656
}
@@ -200,7 +200,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendLaunchKernelWithParams(K
200200
commandContainer.addToResidencyContainer(eventPoolAlloc);
201201
}
202202
eventAddress = event->getPacketAddress(this->device);
203-
isTimestampEvent = event->isUsingContextEndOffset();
203+
isTimestampEvent = event->isEventTimestampFlagSet();
204204
}
205205

206206
bool flushRequired = event->isSignalScope() &&
@@ -328,7 +328,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendLaunchKernelWithParams(K
328328
inOrderNonWalkerSignalling = isInOrderNonWalkerSignalingRequired(eventForInOrderExec);
329329

330330
if (inOrderExecSignalRequired) {
331-
if (!compactEvent || !compactEvent->isCounterBased() || compactEvent->isUsingContextEndOffset()) {
331+
if (!compactEvent || !compactEvent->isCounterBased() || compactEvent->isEventTimestampFlagSet()) {
332332
if (inOrderNonWalkerSignalling) {
333333
if (!eventForInOrderExec->getAllocation(this->device)) {
334334
eventForInOrderExec->resetInOrderTimestampNode(device->getInOrderTimestampAllocator()->getTag(), this->partitionCount);
@@ -498,7 +498,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendLaunchKernelWithParams(K
498498
if (inOrderExecSignalRequired) {
499499
if (inOrderNonWalkerSignalling) {
500500
if (!launchParams.skipInOrderNonWalkerSignaling) {
501-
if (!(eventForInOrderExec->isCounterBased() && eventForInOrderExec->isUsingContextEndOffset())) {
501+
if (!(eventForInOrderExec->isCounterBased() && eventForInOrderExec->isEventTimestampFlagSet())) {
502502
if (compactEvent && compactEvent->isCounterBased()) {
503503
auto pcCmdPtr = this->commandContainer.getCommandStream()->getSpace(0u);
504504
inOrderCounterValue = this->inOrderExecInfo->getCounterValue() + getInOrderIncrementValue();

‎level_zero/core/source/event/event.h‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ struct Event : _ze_event_handle_t {
170170
MOCKABLE_VIRTUAL void setGpuStartTimestamp();
171171
MOCKABLE_VIRTUAL void setGpuEndTimestamp();
172172
size_t getCompletionFieldOffset() const {
173-
return this->isUsingContextEndOffset() ? this->getContextEndOffset() : 0;
173+
return this->isEventTimestampFlagSet() ? this->getContextEndOffset() : 0;
174174
}
175175
uint64_t getCompletionFieldGpuAddress(Device *device) const {
176176
return this->getGpuAddress(device) + getCompletionFieldOffset();
@@ -203,12 +203,7 @@ struct Event : _ze_event_handle_t {
203203
bool isEventTimestampFlagSet() const {
204204
return isTimestampEvent;
205205
}
206-
void setUsingContextEndOffset(bool usingContextEndOffset) {
207-
this->usingContextEndOffset = usingContextEndOffset;
208-
}
209-
bool isUsingContextEndOffset() const {
210-
return isTimestampEvent || usingContextEndOffset;
211-
}
206+
212207
void setCsr(NEO::CommandStreamReceiver *csr, bool clearPreviousCsrs) {
213208
if (clearPreviousCsrs) {
214209
this->csrs.clear();
@@ -442,7 +437,6 @@ struct Event : _ze_event_handle_t {
442437
std::atomic<State> isCompleted{STATE_INITIAL};
443438

444439
bool isTimestampEvent = false;
445-
bool usingContextEndOffset = false;
446440
bool signalAllEventPackets = false;
447441
bool isFromIpcPool = false;
448442
bool kmdWaitMode = false;

‎level_zero/core/source/event/event_impl.inl‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,6 @@ Event *Event::create(const EventDescriptor &eventDescriptor, Device *device, ze_
7777

7878
event->kernelEventCompletionData = std::make_unique<KernelEventCompletionData<TagSizeT>[]>(event->maxKernelCount);
7979

80-
bool useContextEndOffset = false;
81-
int32_t overrideUseContextEndOffset = NEO::debugManager.flags.UseContextEndOffsetForEventCompletion.get();
82-
if (overrideUseContextEndOffset != -1) {
83-
useContextEndOffset = !!overrideUseContextEndOffset;
84-
}
85-
event->setUsingContextEndOffset(useContextEndOffset);
86-
8780
const auto frequency = device->getNEODevice()->getDeviceInfo().profilingTimerResolution;
8881
const auto maxKernelTsValue = maxNBitValue(hwInfo.capabilityTable.kernelTimestampValidBits);
8982
if (hwInfo.capabilityTable.kernelTimestampValidBits < 64u) {
@@ -405,7 +398,7 @@ ze_result_t EventImp<TagSizeT>::queryStatusEventPackets() {
405398
for (uint32_t i = 0; i < this->kernelCount; i++) {
406399
uint32_t packetsToCheck = kernelEventCompletionData[i].getPacketsUsed();
407400
for (uint32_t packetId = 0; packetId < packetsToCheck; packetId++, packets++) {
408-
void const *queryAddress = isUsingContextEndOffset()
401+
void const *queryAddress = isEventTimestampFlagSet()
409402
? kernelEventCompletionData[i].getContextEndAddress(packetId)
410403
: kernelEventCompletionData[i].getContextStartAddress(packetId);
411404
bool ready = NEO::WaitUtils::waitFunctionWithPredicate<const TagSizeT>(

‎level_zero/core/test/unit_tests/sources/assert/test_assert.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,6 @@ TEST_F(EventAssertTest, GivenEventSignalledWhenHostSynchronizeIsCalledThenAssert
718718
uint32_t *hostAddr = static_cast<uint32_t *>(event->getHostAddress());
719719
*hostAddr = Event::STATE_SIGNALED;
720720

721-
event->setUsingContextEndOffset(false);
722721
event->csrs[0] = csr.get();
723722

724723
auto assertHandler = new MockAssertHandler(device->getNEODevice());

‎level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_event_reset.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -377,15 +377,14 @@ HWTEST2_F(CommandListAppendUsedPacketSignalEvent,
377377
constexpr uint32_t packets = 2u;
378378
event->setPacketsInUse(packets);
379379
event->setEventTimestampFlag(false);
380-
event->setUsingContextEndOffset(true);
381380
event->signalScope = ZE_EVENT_SCOPE_FLAG_HOST;
382381

383382
commandList->partitionCount = packets;
384383
returnValue = commandList->appendEventReset(event->toHandle());
385384
EXPECT_EQ(ZE_RESULT_SUCCESS, returnValue);
386385
EXPECT_EQ(2u, event->getPacketsInUse());
387386

388-
auto gpuAddress = event->getGpuAddress(device) + event->getContextEndOffset();
387+
auto gpuAddress = event->getGpuAddress(device);
389388

390389
size_t expectedSize = NEO::MemorySynchronizationCommands<GfxFamily>::getSizeForBarrierWithPostSyncOperation(device->getNEODevice()->getRootDeviceEnvironment(), NEO::PostSyncMode::immediateData) +
391390
commandList->estimateBufferSizeMultiTileBarrier(device->getNEODevice()->getRootDeviceEnvironment());
@@ -447,7 +446,6 @@ HWTEST2_F(CommandListAppendUsedPacketSignalEvent,
447446

448447
constexpr uint32_t packets = 2u;
449448
event->setPacketsInUse(packets);
450-
event->setUsingContextEndOffset(true);
451449

452450
size_t usedBeforeSize = cmdStream->getUsed();
453451
returnValue = commandList->appendEventReset(event->toHandle());
@@ -459,7 +457,7 @@ HWTEST2_F(CommandListAppendUsedPacketSignalEvent,
459457
size_t expectedSize = NEO::EncodeMiFlushDW<FamilyType>::getCommandSizeWithWa(waArgs) * packets;
460458
EXPECT_EQ(expectedSize, (usedAfterSize - usedBeforeSize));
461459

462-
auto gpuAddress = event->getGpuAddress(device) + event->getContextEndOffset();
460+
auto gpuAddress = event->getGpuAddress(device);
463461

464462
GenCmdList cmdList;
465463
ASSERT_TRUE(FamilyType::Parse::parseCommandBuffer(

‎level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1442,7 +1442,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, MultiTileCommandListAppendLaunchKernelXeHpCoreTest,
14421442
EXPECT_EQ(ZE_RESULT_SUCCESS, result);
14431443
std::unique_ptr<L0::Event> event(Event::create<typename FamilyType::TimestampPacketType>(eventPool.get(), &eventDesc, device, result));
14441444

1445-
EXPECT_FALSE(event->isUsingContextEndOffset());
1445+
EXPECT_FALSE(event->isEventTimestampFlagSet());
14461446

14471447
ze_event_handle_t hEventHandle = event->toHandle();
14481448

‎level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_signal_event.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -510,15 +510,14 @@ HWTEST2_F(CommandListAppendUsedPacketSignalEvent,
510510
constexpr uint32_t packets = 2u;
511511

512512
event->setEventTimestampFlag(false);
513-
event->setUsingContextEndOffset(true);
514513
event->signalScope = ZE_EVENT_SCOPE_FLAG_HOST;
515514

516515
commandList->partitionCount = packets;
517516
ze_result_t returnValue = commandList->appendSignalEvent(event->toHandle(), false);
518517
EXPECT_EQ(ZE_RESULT_SUCCESS, returnValue);
519518
EXPECT_EQ(packets, event->getPacketsInUse());
520519

521-
auto gpuAddress = event->getGpuAddress(device) + event->getContextEndOffset();
520+
auto gpuAddress = event->getGpuAddress(device);
522521

523522
size_t expectedSize = NEO::MemorySynchronizationCommands<GfxFamily>::getSizeForBarrierWithPostSyncOperation(device->getNEODevice()->getRootDeviceEnvironment(), NEO::PostSyncMode::immediateData);
524523
size_t usedSize = cmdStream->getUsed();
@@ -647,15 +646,14 @@ HWTEST2_F(CommandListAppendUsedPacketSignalEvent,
647646
constexpr uint32_t packets = 2u;
648647

649648
event->setEventTimestampFlag(false);
650-
event->setUsingContextEndOffset(true);
651649
event->signalScope = 0;
652650

653651
commandList->partitionCount = packets;
654652
ze_result_t returnValue = commandList->appendSignalEvent(event->toHandle(), false);
655653
EXPECT_EQ(ZE_RESULT_SUCCESS, returnValue);
656654
EXPECT_EQ(packets, event->getPacketsInUse());
657655

658-
auto gpuAddress = event->getGpuAddress(device) + event->getContextEndOffset();
656+
auto gpuAddress = event->getGpuAddress(device);
659657

660658
size_t expectedSize = NEO::EncodeStoreMemory<GfxFamily>::getStoreDataImmSize();
661659
size_t usedSize = cmdStream->getUsed();

‎level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_wait_on_events.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,6 @@ HWTEST2_F(MultTileCommandListAppendWaitOnEvent,
834834
size_t expectedSize = commandList->partitionCount * NEO::EncodeSemaphore<FamilyType>::getSizeMiSemaphoreWait();
835835

836836
event->setPacketsInUse(commandList->partitionCount);
837-
event->setUsingContextEndOffset(true);
838837

839838
ze_event_handle_t eventHandle = event->toHandle();
840839

@@ -845,7 +844,7 @@ HWTEST2_F(MultTileCommandListAppendWaitOnEvent,
845844
auto usedSpaceAfter = commandList->getCmdContainer().getCommandStream()->getUsed();
846845
EXPECT_EQ(expectedSize, (usedSpaceAfter - usedSpaceBefore));
847846

848-
auto gpuAddress = event->getGpuAddress(device) + event->getContextEndOffset();
847+
auto gpuAddress = event->getGpuAddress(device);
849848

850849
GenCmdList cmdList;
851850
ASSERT_TRUE(FamilyType::Parse::parseCommandBuffer(cmdList,

‎level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_copy_event_xehp_and_later.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ void testSingleTileAppendMemoryCopyThreeKernels(CopyTestInput &input, TestExpect
151151
EXPECT_EQ(kernelEventAddresses[i], postSync.getDestinationAddress());
152152
}
153153

154-
if (event->isUsingContextEndOffset()) {
154+
if (event->isEventTimestampFlagSet()) {
155155
gpuBaseAddress += event->getContextEndOffset();
156156
}
157157

@@ -240,7 +240,7 @@ void testSingleTileAppendMemoryCopyThreeKernelsAndL3Flush(CopyTestInput &input,
240240
EXPECT_EQ(kernelEventAddresses[i], postSync.getDestinationAddress());
241241
}
242242

243-
if (event->isUsingContextEndOffset()) {
243+
if (event->isEventTimestampFlagSet()) {
244244
gpuBaseAddress += event->getContextEndOffset();
245245
}
246246

@@ -337,7 +337,7 @@ void testSingleTileAppendMemoryCopySingleKernel(CopyTestInput &input, TestExpect
337337
EXPECT_EQ(static_cast<OPERATION>(arg.expectedWalkerPostSyncOp), postSync.getOperation());
338338
EXPECT_EQ(firstKernelEventAddress, postSync.getDestinationAddress());
339339

340-
if (event->isUsingContextEndOffset()) {
340+
if (event->isEventTimestampFlagSet()) {
341341
gpuBaseAddress += event->getContextEndOffset();
342342
}
343343

@@ -413,7 +413,7 @@ void testSingleTileAppendMemoryCopySingleKernelAndL3Flush(CopyTestInput &input,
413413
EXPECT_EQ(static_cast<OPERATION>(arg.expectedWalkerPostSyncOp), postSync.getOperation());
414414
EXPECT_EQ(firstKernelEventAddress, postSync.getDestinationAddress());
415415

416-
if (event->isUsingContextEndOffset()) {
416+
if (event->isEventTimestampFlagSet()) {
417417
gpuBaseAddress += event->getContextEndOffset();
418418
}
419419

@@ -576,7 +576,7 @@ void testMultiTileAppendMemoryCopyThreeKernels(CopyTestInput &input, TestExpecte
576576
EXPECT_EQ(expectedKernelEventAddress[i], postSync.getDestinationAddress());
577577
}
578578

579-
if (event->isUsingContextEndOffset()) {
579+
if (event->isEventTimestampFlagSet()) {
580580
gpuBaseAddress += event->getContextEndOffset();
581581
}
582582

@@ -674,7 +674,7 @@ void testMultiTileAppendMemoryCopyThreeKernelsAndL3Flush(CopyTestInput &input, T
674674
EXPECT_EQ(expectedKernelEventAddress[i], postSync.getDestinationAddress());
675675
}
676676

677-
if (event->isUsingContextEndOffset()) {
677+
if (event->isEventTimestampFlagSet()) {
678678
gpuBaseAddress += event->getContextEndOffset();
679679
}
680680

@@ -784,7 +784,7 @@ void testMultiTileAppendMemoryCopySingleKernel(CopyTestInput &input, TestExpecte
784784
EXPECT_EQ(static_cast<OPERATION>(arg.expectedWalkerPostSyncOp), postSync.getOperation());
785785
EXPECT_EQ(firstKernelEventAddress, postSync.getDestinationAddress());
786786

787-
if (event->isUsingContextEndOffset()) {
787+
if (event->isEventTimestampFlagSet()) {
788788
gpuBaseAddress += event->getContextEndOffset();
789789
}
790790
// single kernel, cleanup of 3 SDI
@@ -869,7 +869,7 @@ void testMultiTileAppendMemoryCopySingleKernelAndL3Flush(CopyTestInput &input, T
869869
EXPECT_EQ(static_cast<OPERATION>(arg.expectedWalkerPostSyncOp), postSync.getOperation());
870870
EXPECT_EQ(firstKernelEventAddress, postSync.getDestinationAddress());
871871

872-
if (event->isUsingContextEndOffset()) {
872+
if (event->isEventTimestampFlagSet()) {
873873
gpuBaseAddress += event->getContextEndOffset();
874874
}
875875

0 commit comments

Comments
 (0)