From 8d0cec04ca11a0d5878811b843197192399187ff Mon Sep 17 00:00:00 2001
From: Damian Tomczak <damian.tomczak@intel.com>
Date: Sun, 9 Feb 2025 19:06:50 +0000
Subject: [PATCH] refactor: better conditions handling in
 isInOrderNonWalkerSignalingRequired

Related-to: NEO-12737

Signed-off-by: Damian Tomczak <damian.tomczak@intel.com>
---
 .../core/source/cmdlist/cmdlist_hw_xehp_and_later.inl  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 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 677e7979ab..9b6feccd41 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
@@ -48,11 +48,15 @@ size_t CommandListCoreFamily<gfxCoreFamily>::getReserveSshSize() {
 
 template <GFXCORE_FAMILY gfxCoreFamily>
 bool CommandListCoreFamily<gfxCoreFamily>::isInOrderNonWalkerSignalingRequired(const Event *event) const {
-    if (event && compactL3FlushEvent(getDcFlushRequired(event->isSignalScope()))) {
-        return true;
+    if (!event) {
+        return false;
     }
 
-    return (!this->duplicatedInOrderCounterStorageEnabled && event && (event->isUsingContextEndOffset() || !event->isCounterBased()));
+    const bool flushRequired = compactL3FlushEvent(getDcFlushRequired(event->isSignalScope()));
+    const bool inOrderRequired = !this->duplicatedInOrderCounterStorageEnabled &&
+                                 (event->isUsingContextEndOffset() || !event->isCounterBased());
+
+    return flushRequired || inOrderRequired;
 }
 
 template <GFXCORE_FAMILY gfxCoreFamily>