Skip timestamp wait when enqueue non kernel operation

Signed-off-by: Lukasz Jobczyk <[email protected]>

Author: LukaszJobczyk

opencl/source/command_queue/command_queue.h

@@ -401,6 +401,7 @@ class CommandQueue : public BaseObject<_cl_command_queue> {
     QueuePriority priority = QueuePriority::MEDIUM;
     QueueThrottle throttle = QueueThrottle::MEDIUM;
     EnqueueProperties::Operation latestSentEnqueueType = EnqueueProperties::Operation::None;
+    bool wasNonKernelOperationSent = false;
     uint64_t sliceCount = QueueSliceCount::defaultSliceCount;
     std::array<CopyEngineState, bcsInfoMaskSize> bcsStates = {};
 

opencl/source/command_queue/command_queue_hw_base.inl

@@ -159,14 +159,16 @@ bool CommandQueueHw<Family>::waitForTimestamps(uint32_t taskCount) {
     using TSPacketType = typename Family::TimestampPacketType;
     bool waited = false;
 
-    if (isWaitForTimestampsEnabled()) {
+    if (isWaitForTimestampsEnabled() && !this->wasNonKernelOperationSent) {
         waited = waitForTimestampsWithinContainer<TSPacketType>(timestampPacketContainer.get(), getGpgpuCommandStreamReceiver());
 
         if (isOOQEnabled()) {
             waited |= waitForTimestampsWithinContainer<TSPacketType>(deferredTimestampPackets.get(), getGpgpuCommandStreamReceiver());
         }
     }
 
+    this->wasNonKernelOperationSent = false;
+
     return waited;
 }
 

opencl/source/command_queue/enqueue_common.h

@@ -301,6 +301,8 @@ void CommandQueueHw<GfxFamily>::enqueueHandler(Surface **surfacesForResidency,
 
     bool migratedMemory = false;
 
+    this->wasNonKernelOperationSent |= enqueueProperties.operation != EnqueueProperties::Operation::GpuKernel;
+
     if (!blockQueue && multiDispatchInfo.peekMainKernel() && multiDispatchInfo.peekMainKernel()->requiresMemoryMigration()) {
         for (auto &arg : multiDispatchInfo.peekMainKernel()->getMemObjectsToMigrate()) {
             MigrationController::handleMigration(*this->context, computeCommandStreamReceiver, arg.second);

opencl/test/unit_test/helpers/timestamp_packet_1_tests.cpp

@@ -911,6 +911,48 @@ HWTEST_F(TimestampPacketTests, givenEnableTimestampWaitWhenFinishThenCallWaitUti
     cmdQ.reset();
 }
 
+HWTEST_F(TimestampPacketTests, givenEnableTimestampWaitAndNonGpuKernelEnqueueWhenFinishThenDoNotCallWaitUtils) {
+    DebugManagerStateRestore restorer;
+    DebugManager.flags.UpdateTaskCountFromWait.set(3);
+    DebugManager.flags.EnableTimestampWait.set(1);
+
+    device->getUltCommandStreamReceiver<FamilyType>().timestampPacketWriteEnabled = true;
+    cl_queue_properties props[3] = {CL_QUEUE_PROPERTIES, CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE, 0};
+    auto cmdQ = std::make_unique<MockCommandQueueHw<FamilyType>>(context, device.get(), props);
+
+    TimestampPacketContainer *deferredTimestampPackets = cmdQ->deferredTimestampPackets.get();
+    TimestampPacketContainer *timestampPacketContainer = cmdQ->timestampPacketContainer.get();
+
+    cmdQ->enqueueKernel(kernel->mockKernel, 1, nullptr, gws, nullptr, 0, nullptr, nullptr);
+    cmdQ->enqueueKernel(kernel->mockKernel, 1, nullptr, gws, nullptr, 0, nullptr, nullptr);
+    cmdQ->enqueueMarkerWithWaitList(0, nullptr, nullptr);
+    cmdQ->flush();
+
+    EXPECT_EQ(1u, deferredTimestampPackets->peekNodes().size());
+    EXPECT_EQ(1u, timestampPacketContainer->peekNodes().size());
+
+    VariableBackup<volatile uint32_t *> backupPauseAddress(&CpuIntrinsicsTests::pauseAddress);
+    VariableBackup<uint32_t> backupPauseValue(&CpuIntrinsicsTests::pauseValue);
+    VariableBackup<uint32_t> backupPauseOffset(&CpuIntrinsicsTests::pauseOffset);
+    VariableBackup<std::function<void()>> backupSetupPauseAddress(&CpuIntrinsicsTests::setupPauseAddress);
+
+    deferredTimestampPackets->peekNodes()[0]->setPacketsUsed(1u);
+    timestampPacketContainer->peekNodes()[0]->setPacketsUsed(1u);
+
+    CpuIntrinsicsTests::pauseAddress = reinterpret_cast<volatile uint32_t *>(const_cast<void *>(timestampPacketContainer->peekNodes()[0]->getContextEndAddress(0u)));
+    CpuIntrinsicsTests::pauseValue = 2u;
+    CpuIntrinsicsTests::setupPauseAddress = [&]() {
+        CpuIntrinsicsTests::pauseAddress = reinterpret_cast<volatile uint32_t *>(const_cast<void *>(deferredTimestampPackets->peekNodes()[0]->getContextEndAddress(0u)));
+    };
+    CpuIntrinsicsTests::pauseCounter = 0u;
+
+    cmdQ->finish();
+
+    EXPECT_EQ(0u, CpuIntrinsicsTests::pauseCounter);
+
+    cmdQ.reset();
+}
+
 HWTEST_F(TimestampPacketTests, givenTimestampPacketWriteEnabledWhenEnqueueingToOoqThenMoveToDeferredList) {
     device->getUltCommandStreamReceiver<FamilyType>().timestampPacketWriteEnabled = true;