Fix missing submit time calculation

Related-To: NEO-5799

Signed-off-by: Konstanty Misiak <[email protected]>

Author: KonstantyMisiak

opencl/source/command_queue/enqueue_common.h

@@ -369,9 +369,6 @@ void CommandQueueHw<GfxFamily>::enqueueHandler(Surface **surfacesForResidency,
             completionStamp.taskLevel = taskLevel;
 
             if (eventBuilder.getEvent() && isProfilingEnabled()) {
-                TimeStampData submitTimeStamp;
-                this->getDevice().getOSTime()->getCpuGpuTime(&submitTimeStamp);
-                eventBuilder.getEvent()->setSubmitTimeStamp(&submitTimeStamp);
                 eventBuilder.getEvent()->setSubmitTimeStamp();
                 eventBuilder.getEvent()->setStartTimeStamp();
             }
@@ -818,10 +815,8 @@ CompletionStamp CommandQueueHw<GfxFamily>::enqueueNonBlocked(
         DEBUG_BREAK_IF(device->getDeviceInfo().preemptionSupported != false);
     }
 
-    TimeStampData submitTimeStamp = {};
     if (isProfilingEnabled() && eventBuilder.getEvent()) {
-        this->getDevice().getOSTime()->getCpuTime(&submitTimeStamp.CPUTimeinNS);
-        eventBuilder.getEvent()->setSubmitTimeStamp(&submitTimeStamp);
+        eventBuilder.getEvent()->setSubmitTimeStamp();
 
         auto hwTimestampNode = eventBuilder.getEvent()->getHwTimeStampNode();
         if (hwTimestampNode) {
@@ -1065,10 +1060,7 @@ CompletionStamp CommandQueueHw<GfxFamily>::enqueueCommandWithoutKernel(
     }
 
     if (eventBuilder.getEvent() && isProfilingEnabled()) {
-        TimeStampData submitTimeStamp;
-
-        getDevice().getOSTime()->getCpuGpuTime(&submitTimeStamp);
-        eventBuilder.getEvent()->setSubmitTimeStamp(&submitTimeStamp);
+        eventBuilder.getEvent()->setSubmitTimeStamp();
         eventBuilder.getEvent()->setStartTimeStamp();
     }
 

opencl/source/event/event.cpp

@@ -171,6 +171,7 @@ cl_int Event::getEventProfilingInfo(cl_profiling_info paramName,
         break;
 
     case CL_PROFILING_COMMAND_SUBMIT:
+        calculateSubmitTimestampData();
         timestamp = getTimeInNSFromTimestampData(submitTimeStamp);
         src = &timestamp;
         srcSize = sizeof(cl_ulong);
@@ -260,6 +261,17 @@ cl_ulong Event::getDelta(cl_ulong startTime,
     return Delta;
 }
 
+void Event::calculateSubmitTimestampData() {
+    if (DebugManager.flags.EnableDeviceBasedTimestamps.get()) {
+        auto &device = cmdQueue->getDevice();
+        auto &hwHelper = HwHelper::get(device.getHardwareInfo().platform.eRenderCoreFamily);
+        double resolution = device.getDeviceInfo().profilingTimerResolution;
+
+        int64_t timerDiff = queueTimeStamp.CPUTimeinNS - hwHelper.getGpuTimeStampInNS(queueTimeStamp.GPUTimeStamp, resolution);
+        submitTimeStamp.GPUTimeStamp = static_cast<uint64_t>((submitTimeStamp.CPUTimeinNS - timerDiff) / resolution);
+    }
+}
+
 uint64_t Event::getTimeInNSFromTimestampData(const TimeStampData &timestamp) const {
     if (isCPUProfilingPath()) {
         return timestamp.CPUTimeinNS;

opencl/source/event/event.h

@@ -284,10 +284,6 @@ class Event : public BaseObject<_cl_event>, public IDNode<Event> {
         this->queueTimeStamp = *queueTimeStamp;
     };
 
-    void setSubmitTimeStamp(TimeStampData *submitTimeStamp) {
-        this->submitTimeStamp = *submitTimeStamp;
-    };
-
     void setQueueTimeStamp();
     void setSubmitTimeStamp();
 
@@ -330,6 +326,7 @@ class Event : public BaseObject<_cl_event>, public IDNode<Event> {
         }
     }
 
+    void calculateSubmitTimestampData();
     uint64_t getTimeInNSFromTimestampData(const TimeStampData &timestamp) const;
     bool calcProfilingData();
     MOCKABLE_VIRTUAL void calculateProfilingDataInternal(uint64_t contextStartTS, uint64_t contextEndTS, uint64_t *contextCompleteTS, uint64_t globalStartTS);

opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp

@@ -87,6 +87,7 @@ HWTEST_F(EnqueueHandlerTimestampEnabledTest, givenProflingAndTimeStampPacketsEna
     EventBuilder eventBuilder;
     eventBuilder.create<MockEvent<Event>>(mockCmdQ.get(), CL_COMMAND_USER, CompletionStamp::notReady, CompletionStamp::notReady);
     auto ev = static_cast<MockEvent<UserEvent> *>(eventBuilder.getEvent());
+    ev->setProfilingEnabled(true);
     Surface *surfaces[] = {surface.get()};
     auto blocking = true;
     TimestampPacketDependencies timestampPacketDependencies;
@@ -95,13 +96,11 @@ HWTEST_F(EnqueueHandlerTimestampEnabledTest, givenProflingAndTimeStampPacketsEna
     EnqueueProperties enqueueProperties(false, false, false, true, false, nullptr);
 
     EXPECT_EQ(ev->submitTimeStamp.CPUTimeinNS, 0u);
-    EXPECT_EQ(ev->submitTimeStamp.GPUTimeStamp, 0u);
 
     mockCmdQ->enqueueCommandWithoutKernel(surfaces, 1, &mockCmdQ->getCS(0), 0, blocking, enqueueProperties, timestampPacketDependencies,
                                           eventsRequest, eventBuilder, 0, csrDeps, nullptr);
 
     EXPECT_NE(ev->submitTimeStamp.CPUTimeinNS, 0u);
-    EXPECT_NE(ev->submitTimeStamp.GPUTimeStamp, 0u);
 
     delete ev;
 }
@@ -119,6 +118,7 @@ HWTEST_F(EnqueueHandlerTimestampDisabledTest, givenProflingEnabledTimeStampPacke
     EventBuilder eventBuilder;
     eventBuilder.create<MockEvent<Event>>(mockCmdQ.get(), CL_COMMAND_USER, CompletionStamp::notReady, CompletionStamp::notReady);
     auto ev = static_cast<MockEvent<UserEvent> *>(eventBuilder.getEvent());
+    ev->setProfilingEnabled(true);
     Surface *surfaces[] = {surface.get()};
     auto blocking = true;
     TimestampPacketDependencies timestampPacketDependencies;
@@ -127,13 +127,11 @@ HWTEST_F(EnqueueHandlerTimestampDisabledTest, givenProflingEnabledTimeStampPacke
     EnqueueProperties enqueueProperties(false, false, false, true, false, nullptr);
 
     EXPECT_EQ(ev->submitTimeStamp.CPUTimeinNS, 0u);
-    EXPECT_EQ(ev->submitTimeStamp.GPUTimeStamp, 0u);
 
     mockCmdQ->enqueueCommandWithoutKernel(surfaces, 1, &mockCmdQ->getCS(0), 0, blocking, enqueueProperties, timestampPacketDependencies,
                                           eventsRequest, eventBuilder, 0, csrDeps, nullptr);
 
     EXPECT_NE(ev->submitTimeStamp.CPUTimeinNS, 0u);
-    EXPECT_NE(ev->submitTimeStamp.GPUTimeStamp, 0u);
 
     delete ev;
 }

opencl/test/unit_test/event/event_tests.cpp

@@ -743,9 +743,9 @@ TEST_F(InternalsEventTest, givenDeviceTimestampBaseEnabledWhenGetEventProfilingI
     const cl_queue_properties props[3] = {CL_QUEUE_PROPERTIES, CL_QUEUE_PROFILING_ENABLE, 0};
     MockCommandQueue cmdQ(mockContext, pClDevice, props, false);
     MockEvent<Event> event(&cmdQ, CL_COMMAND_MARKER, 0, 0);
+    event.queueTimeStamp.GPUTimeStamp = MockDeviceTimeWithConstTimestamp::GPU_TIMESTAMP;
 
     event.setCommand(std::unique_ptr<Command>(new CommandWithoutKernel(cmdQ)));
-
     event.submitCommand(false);
     uint64_t submitTime = 0ULL;
     event.getEventProfilingInfo(CL_PROFILING_COMMAND_SUBMIT, sizeof(uint64_t), &submitTime, 0);
@@ -1145,22 +1145,6 @@ TEST(EventCallback, WhenOverridingStatusThenEventUsesNewStatus) {
     EXPECT_EQ(-1, retStatus);
 }
 
-TEST_F(EventTest, WhenSettingTimeStampThenCorrectValuesAreSet) {
-    MyEvent ev(this->pCmdQ, CL_COMMAND_COPY_BUFFER, 3, 0);
-    TimeStampData inTimeStamp = {1ULL, 2ULL};
-    ev.setSubmitTimeStamp(&inTimeStamp);
-    TimeStampData outtimeStamp = {0, 0};
-    outtimeStamp = ev.getSubmitTimeStamp();
-    EXPECT_EQ(1ULL, outtimeStamp.GPUTimeStamp);
-    EXPECT_EQ(2ULL, outtimeStamp.CPUTimeinNS);
-    inTimeStamp.GPUTimeStamp = 3;
-    inTimeStamp.CPUTimeinNS = 4;
-    ev.setQueueTimeStamp(&inTimeStamp);
-    outtimeStamp = ev.getQueueTimeStamp();
-    EXPECT_EQ(3ULL, outtimeStamp.GPUTimeStamp);
-    EXPECT_EQ(4ULL, outtimeStamp.CPUTimeinNS);
-}
-
 TEST_F(EventTest, WhenSettingCpuTimeStampThenCorrectTimeIsSet) {
     MyEvent ev(this->pCmdQ, CL_COMMAND_COPY_BUFFER, 3, 0);