From d7be72ee37f5f4de1d981a400bf6d79b08ac0b2a Mon Sep 17 00:00:00 2001
From: Sadik Armagan <sadik.armagan@arm.com>
Date: Thu, 23 Apr 2020 12:56:05 +0100
Subject: IVGCVSW-4677 Fix FencedComputeTest Hal 1.3

* Implemented executeFenced() function in HAL 1.3 Driver

Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: I11f8f532e9688d4e194992b46dbed575a19be3c5
---
 ArmnnPreparedModel_1_3.hpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'ArmnnPreparedModel_1_3.hpp')

diff --git a/ArmnnPreparedModel_1_3.hpp b/ArmnnPreparedModel_1_3.hpp
index 47529aa8..fa674058 100644
--- a/ArmnnPreparedModel_1_3.hpp
+++ b/ArmnnPreparedModel_1_3.hpp
@@ -29,6 +29,8 @@ struct ExecutionContext_1_3
     ::android::hardware::neuralnetworks::V1_2::MeasureTiming    measureTimings =
         ::android::hardware::neuralnetworks::V1_2::MeasureTiming::NO;
     TimePoint driverStart;
+    TimePoint deviceStart;
+    TimePoint deviceEnd;
 };
 
 using CallbackContext_1_3 = CallbackContext<CallbackAsync_1_3, ExecutionContext_1_3>;
@@ -74,7 +76,7 @@ public:
                                           V1_3::IPreparedModel::executeSynchronously_1_3_cb cb) override;
 
     Return<void> executeFenced(const V1_3::Request& request,
-                               const android::hardware::hidl_vec<android::hardware::hidl_handle>& wait_for,
+                               const android::hardware::hidl_vec<android::hardware::hidl_handle>& fenceWaitFor,
                                MeasureTiming measure,
                                const V1_3::OptionalTimePoint& deadline,
                                const V1_3::OptionalTimeoutDuration& loopTimeoutDuration,
@@ -92,10 +94,11 @@ public:
 
     /// execute the graph prepared from the request
     template<typename CallbackContext>
-    bool ExecuteGraph(std::shared_ptr<std::vector<::android::nn::RunTimePoolInfo>>& pMemPools,
-                      armnn::InputTensors& inputTensors,
-                      armnn::OutputTensors& outputTensors,
-                      CallbackContext callback);
+    Return <V1_3::ErrorStatus> ExecuteGraph(
+              std::shared_ptr<std::vector<::android::nn::RunTimePoolInfo>>& pMemPools,
+              armnn::InputTensors& inputTensors,
+              armnn::OutputTensors& outputTensors,
+              CallbackContext callback);
 
     /// Executes this model with dummy inputs (e.g. all zeroes).
     /// \return false on failure, otherwise true
-- 
cgit v1.2.1