From bea67a8bb307af569bfede3873e56f71d969aa8f Mon Sep 17 00:00:00 2001
From: "Dunajski, Bartosz" <bartosz.dunajski@intel.com>
Date: Thu, 13 Jun 2019 09:56:06 +0200
Subject: [PATCH] Move queue dependency clearing query to helper method

Change-Id: I0859d7f855020979b27ba5ee31c59cc8a7bd3f7a
Related-To: NEO-3020
Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>
---
 runtime/command_queue/command_queue.cpp | 4 ++++
 runtime/command_queue/command_queue.h   | 1 +
 runtime/command_queue/enqueue_common.h  | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/runtime/command_queue/command_queue.cpp b/runtime/command_queue/command_queue.cpp
index 20ebb48360..4b63fea739 100644
--- a/runtime/command_queue/command_queue.cpp
+++ b/runtime/command_queue/command_queue.cpp
@@ -595,4 +595,8 @@ cl_int CommandQueue::enqueueReadWriteBufferWithBlitTransfer(cl_command_type comm
     blitCommandStreamReceiver->blitWithHostPtr(*buffer, ptr, true, offset, size, copyDirection, csrDependencies);
     return CL_SUCCESS;
 }
+
+bool CommandQueue::queueDependenciesClearRequired() const {
+    return isOOQEnabled() || DebugManager.flags.OmitTimestampPacketDependencies.get();
+}
 } // namespace NEO
diff --git a/runtime/command_queue/command_queue.h b/runtime/command_queue/command_queue.h
index 99e4a13343..a24fb56a86 100644
--- a/runtime/command_queue/command_queue.h
+++ b/runtime/command_queue/command_queue.h
@@ -452,6 +452,7 @@ class CommandQueue : public BaseObject<_cl_command_queue> {
     void processProperties(const cl_queue_properties *properties);
     bool bufferCpuCopyAllowed(Buffer *buffer, cl_command_type commandType, cl_bool blocking, size_t size, void *ptr,
                               cl_uint numEventsInWaitList, const cl_event *eventWaitList);
+    bool queueDependenciesClearRequired() const;
 
     Context *context = nullptr;
     Device *device = nullptr;
diff --git a/runtime/command_queue/enqueue_common.h b/runtime/command_queue/enqueue_common.h
index 7a77560082..916cfc2f43 100644
--- a/runtime/command_queue/enqueue_common.h
+++ b/runtime/command_queue/enqueue_common.h
@@ -139,7 +139,7 @@ void CommandQueueHw<GfxFamily>::enqueueHandler(Surface **surfacesForResidency,
     Kernel *parentKernel = multiDispatchInfo.peekParentKernel();
     auto devQueue = this->getContext().getDefaultDeviceQueue();
     DeviceQueueHw<GfxFamily> *devQueueHw = castToObject<DeviceQueueHw<GfxFamily>>(devQueue);
-    auto clearAllDependencies = isOOQEnabled() || DebugManager.flags.OmitTimestampPacketDependencies.get();
+    auto clearAllDependencies = queueDependenciesClearRequired();
 
     TagNode<HwTimeStamps> *hwTimeStamps = nullptr;