From 61aa75d6a9f183b1a6bbcb164688178833757592 Mon Sep 17 00:00:00 2001
From: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
Date: Fri, 20 Dec 2024 04:11:47 +0100
Subject: [PATCH] Revert "performance: Signal inOrder counter with pipe
 control, part 2"

This reverts commit 136e5b4f6c04a19ea372c03ac225967305ed8a7b.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
---
 .../cmdlist/cmdlist_hw_xehp_and_later.inl      | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/level_zero/core/source/cmdlist/cmdlist_hw_xehp_and_later.inl b/level_zero/core/source/cmdlist/cmdlist_hw_xehp_and_later.inl
index dd786cd73d..484ad7f974 100644
--- a/level_zero/core/source/cmdlist/cmdlist_hw_xehp_and_later.inl
+++ b/level_zero/core/source/cmdlist/cmdlist_hw_xehp_and_later.inl
@@ -284,7 +284,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendLaunchKernelWithParams(K
 
     std::list<void *> additionalCommands;
 
-    if (compactEvent && !this->isImmediateType()) {
+    if (compactEvent) {
         appendEventForProfilingAllWalkers(compactEvent, nullptr, launchParams.outListCommands, true, true, launchParams.omitAddingEventResidency, false);
     }
 
@@ -299,20 +299,12 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendLaunchKernelWithParams(K
         inOrderNonWalkerSignalling = isInOrderNonWalkerSignalingRequired(eventForInOrderExec);
 
         if (inOrderExecSignalRequired) {
-            if (!compactEvent || !this->isImmediateType() || !compactEvent->isCounterBased() || compactEvent->isUsingContextEndOffset()) {
+            if (!compactEvent || !this->isImmediateType() || (!compactEvent->isCounterBased() || compactEvent->isUsingContextEndOffset())) {
                 if (inOrderNonWalkerSignalling) {
                     if (!eventForInOrderExec->getAllocation(this->device) && Event::standaloneInOrderTimestampAllocationEnabled()) {
                         eventForInOrderExec->resetInOrderTimestampNode(device->getInOrderTimestampAllocator()->getTag());
                     }
-                    if (!compactEvent || !this->isImmediateType() || !compactEvent->isCounterBased()) {
-                        dispatchEventPostSyncOperation(eventForInOrderExec, nullptr, launchParams.outListCommands, Event::STATE_CLEARED, false, false, false, false, false);
-                    } else {
-                        eventAddress = eventForInOrderExec->getPacketAddress(this->device);
-                        isTimestampEvent = true;
-                        if (!launchParams.omitAddingEventResidency) {
-                            commandContainer.addToResidencyContainer(eventForInOrderExec->getAllocation(this->device));
-                        }
-                    }
+                    dispatchEventPostSyncOperation(eventForInOrderExec, nullptr, launchParams.outListCommands, Event::STATE_CLEARED, false, false, false, false, false);
                 } else {
                     inOrderCounterValue = this->inOrderExecInfo->getCounterValue() + getInOrderIncrementValue();
                     inOrderExecInfo = this->inOrderExecInfo.get();
@@ -392,7 +384,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendLaunchKernelWithParams(K
     }
 
     if (!launchParams.makeKernelCommandView) {
-        if ((compactEvent && (!compactEvent->isCounterBased() || !this->isImmediateType()))) {
+        if ((compactEvent && (!compactEvent->isCounterBased() || compactEvent->isUsingContextEndOffset() || !this->isImmediateType()))) {
             void **syncCmdBuffer = nullptr;
             if (launchParams.outSyncCommand != nullptr) {
                 launchParams.outSyncCommand->type = CommandToPatch::SignalEventPostSyncPipeControl;
@@ -416,7 +408,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendLaunchKernelWithParams(K
     if (inOrderExecSignalRequired) {
         if (inOrderNonWalkerSignalling) {
             if (!launchParams.skipInOrderNonWalkerSignaling) {
-                if ((compactEvent && (compactEvent->isCounterBased() && this->isImmediateType()))) {
+                if ((compactEvent && (compactEvent->isCounterBased() && !compactEvent->isUsingContextEndOffset() && this->isImmediateType()))) {
                     appendSignalInOrderDependencyCounter(eventForInOrderExec, false, true);
                 } else {
                     appendWaitOnSingleEvent(eventForInOrderExec, launchParams.outListCommands, false, false, CommandToPatch::CbEventTimestampPostSyncSemaphoreWait);