Fix submitting gpgpu context on blit enqueue

Change-Id: Iea598d72a153eda3455e10afcdde6c8f69d11f48
Signed-off-by: Bartosz Dunajski <bartosz.dunajski@intel.com>

Author: BartoszDunajski

opencl/source/command_queue/command_queue_hw_base.inl

@@ -157,7 +157,7 @@ bool CommandQueueHw<Family>::isGpgpuSubmissionForBcsRequired(bool queueBlocked)
         return true;
     }
 
-    bool required = isCacheFlushForBcsRequired() && (latestSentEnqueueType != EnqueueProperties::Operation::Blit) && (latestSentEnqueueType != EnqueueProperties::Operation::None);
+    bool required = (latestSentEnqueueType != EnqueueProperties::Operation::Blit) && (latestSentEnqueueType != EnqueueProperties::Operation::None);
 
     if (DebugManager.flags.ForceGpgpuSubmissionForBcsEnqueue.get() == 1) {
         required = true;

opencl/source/command_queue/enqueue_common.h

@@ -491,7 +491,7 @@ BlitProperties CommandQueueHw<GfxFamily>::processDispatchForBlitEnqueue(const Mu
     blitProperties.outputTimestampPacket = currentTimestampPacketNode;
 
     if (isGpgpuSubmissionForBcsRequired(queueBlocked)) {
-        if (isCacheFlushForBcsRequired()) {
+        if (timestampPacketDependencies.cacheFlushNodes.peekNodes().size() > 0) {
             auto cacheFlushTimestampPacketGpuAddress = TimestampPacketHelper::getContextEndGpuAddress(*timestampPacketDependencies.cacheFlushNodes.peekNodes()[0]);
             PipeControlArgs args(true);
             MemorySynchronizationCommands<GfxFamily>::addPipeControlAndProgramPostSyncOperation(
@@ -956,9 +956,7 @@ CompletionStamp CommandQueueHw<GfxFamily>::enqueueCommandWithoutKernel(
     CompletionStamp completionStamp = {this->taskCount, this->taskLevel, this->flushStamp->peekStamp()};
     bool flushGpgpuCsr = true;
 
-    if ((enqueueProperties.operation == EnqueueProperties::Operation::Blit) &&
-        !isGpgpuSubmissionForBcsRequired(false) &&
-        timestampPacketDependencies.barrierNodes.peekNodes().size() == 0) {
+    if ((enqueueProperties.operation == EnqueueProperties::Operation::Blit) && !isGpgpuSubmissionForBcsRequired(false)) {
         flushGpgpuCsr = false;
     }
 

opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp

@@ -1270,11 +1270,11 @@ HWTEST_TEMPLATED_F(BlitEnqueueWithDisabledGpgpuSubmissionTests, givenCacheFlushN
 
     commandQueue->enqueueWriteBuffer(buffer.get(), false, 0, 1, &hostPtr, nullptr, 0, nullptr, nullptr);
     EXPECT_EQ(EnqueueProperties::Operation::Blit, mockCommandQueue->latestSentEnqueueType);
-    EXPECT_EQ(1u, gpgpuCsr->peekTaskCount());
+    EXPECT_EQ(2u, gpgpuCsr->peekTaskCount());
 
     commandQueue->enqueueWriteBuffer(buffer.get(), false, 0, 1, &hostPtr, nullptr, 0, nullptr, nullptr);
     EXPECT_EQ(EnqueueProperties::Operation::Blit, mockCommandQueue->latestSentEnqueueType);
-    EXPECT_EQ(1u, gpgpuCsr->peekTaskCount());
+    EXPECT_EQ(2u, gpgpuCsr->peekTaskCount());
 }
 
 HWTEST_TEMPLATED_F(BlitEnqueueWithDisabledGpgpuSubmissionTests, givenCacheFlushNotRequiredWhenDoingBcsCopyAfterBarrierThenSubmitToGpgpu) {