From 949a69ef997b1d78dca10b4cca833c3e6b3f5436 Mon Sep 17 00:00:00 2001
From: Kevin May <kevin.may@arm.com>
Date: Fri, 24 Apr 2020 10:21:40 +0100
Subject: IVGCVSW-4677 Refactor Timepoint duplication

Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: I6d37e7b8022ada1d875be01014babc5d31d07290
---
 ArmnnPreparedModel_1_3.cpp | 18 +++++-------------
 ArmnnPreparedModel_1_3.hpp |  1 +
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/ArmnnPreparedModel_1_3.cpp b/ArmnnPreparedModel_1_3.cpp
index 6c4aec9a..1fb03f44 100644
--- a/ArmnnPreparedModel_1_3.cpp
+++ b/ArmnnPreparedModel_1_3.cpp
@@ -390,15 +390,9 @@ Return<void> ArmnnPreparedModel_1_3<HalVersion>::executeFenced(const V1_3::Reque
     Timing fenceTiming = g_NoTiming;
     if (measureTiming == MeasureTiming::YES)
     {
-        TimePoint driverEnd = Now();
-        timing.timeOnDevice = MicrosecondsDuration(ctx.deviceEnd, ctx.deviceStart);
-        timing.timeInDriver = MicrosecondsDuration(driverEnd, ctx.driverStart);
-        ALOGV("ArmnnPreparedModel_1_2::fenceExecutionTiming - Device = %lu Driver = %lu",
-              timing.timeOnDevice, timing.timeInDriver);
-
         fenceTiming.timeOnDevice = MicrosecondsDuration(ctx.deviceEnd, ctx.deviceStart);
-        fenceTiming.timeInDriver = MicrosecondsDuration(driverEnd, fenceExecutionStart);
-        ALOGV("ArmnnPreparedModel_1_2::fenceFinishExecutionTiming - Device = %lu Driver = %lu",
+        fenceTiming.timeInDriver = MicrosecondsDuration(ctx.driverEnd, fenceExecutionStart);
+        ALOGV("ArmnnPreparedModel_1_3::fenceFinishExecutionTiming - Device = %lu Driver = %lu",
               fenceTiming.timeOnDevice, fenceTiming.timeInDriver);
     }
 
@@ -671,8 +665,6 @@ Return <V1_3::ErrorStatus> ArmnnPreparedModel_1_3<HalVersion>::ExecuteGraph(
 {
     ALOGV("ArmnnPreparedModel_1_3::ExecuteGraph(...)");
 
-    TimePoint driverEnd, deviceStart, deviceEnd;
-
     DumpTensorsIfRequired("Input", inputTensors);
 
     std::vector<OutputShape> outputShapes(outputTensors.size());
@@ -725,11 +717,11 @@ Return <V1_3::ErrorStatus> ArmnnPreparedModel_1_3<HalVersion>::ExecuteGraph(
 
     if (cb.ctx.measureTimings == MeasureTiming::YES)
     {
-        driverEnd = Now();
+        cb.ctx.driverEnd = Now();
         Timing timing;
         timing.timeOnDevice = MicrosecondsDuration(cb.ctx.deviceEnd, cb.ctx.deviceStart);
-        timing.timeInDriver = MicrosecondsDuration(driverEnd, cb.ctx.driverStart);
-        ALOGV("ArmnnPreparedModel_1_2::execute timing - Device = %lu Driver = %lu", timing.timeOnDevice,
+        timing.timeInDriver = MicrosecondsDuration(cb.ctx.driverEnd, cb.ctx.driverStart);
+        ALOGV("ArmnnPreparedModel_1_3::execute timing - Device = %lu Driver = %lu", timing.timeOnDevice,
               timing.timeInDriver);
         cb.callback(V1_3::ErrorStatus::NONE, outputShapes, timing, "ArmnnPreparedModel_1_3::ExecuteGraph");
     } else
diff --git a/ArmnnPreparedModel_1_3.hpp b/ArmnnPreparedModel_1_3.hpp
index fa674058..4dd15c17 100644
--- a/ArmnnPreparedModel_1_3.hpp
+++ b/ArmnnPreparedModel_1_3.hpp
@@ -29,6 +29,7 @@ struct ExecutionContext_1_3
     ::android::hardware::neuralnetworks::V1_2::MeasureTiming    measureTimings =
         ::android::hardware::neuralnetworks::V1_2::MeasureTiming::NO;
     TimePoint driverStart;
+    TimePoint driverEnd;
     TimePoint deviceStart;
     TimePoint deviceEnd;
 };
-- 
cgit v1.2.1