From b2397fd9d68f12792b04dd90ae72dfb8cb9f4a60 Mon Sep 17 00:00:00 2001
From: Ferran Balaguer <ferran.balaguer@arm.com>
Date: Thu, 25 Jul 2019 12:12:39 +0100
Subject: IVGCVSW-3398 Add LSTM normalization parameters to HAL 1.2

* Adding LSTM processing function in HAL 1.2 with normalization parameters
* Refactoring LSTM tests

!armnn:1608

Signed-off-by: Ferran Balaguer <ferran.balaguer@arm.com>
Change-Id: I0e00f14ef078a333e9f2f23d6278a5d92a3001d6
---
 test/DriverTestHelpers.cpp | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

(limited to 'test/DriverTestHelpers.cpp')

diff --git a/test/DriverTestHelpers.cpp b/test/DriverTestHelpers.cpp
index 675757f0..4c26174b 100644
--- a/test/DriverTestHelpers.cpp
+++ b/test/DriverTestHelpers.cpp
@@ -61,6 +61,26 @@ Return<void> PreparedModelCallback::notify(ErrorStatus status,
     return Void();
 }
 
+#ifdef ARMNN_ANDROID_NN_V1_2
+
+Return<void> PreparedModelCallback_1_2::notify(ErrorStatus status,
+                                               const android::sp<V1_0::IPreparedModel>& preparedModel)
+{
+    m_ErrorStatus = status;
+    m_PreparedModel = preparedModel;
+    return Void();
+}
+
+Return<void> PreparedModelCallback_1_2::notify_1_2(ErrorStatus status,
+                                                   const android::sp<V1_2::IPreparedModel>& preparedModel)
+{
+    m_ErrorStatus = status;
+    m_PreparedModel_1_2 = preparedModel;
+    return Void();
+}
+
+#endif
+
 // lifted from common/Utils.cpp
 hidl_memory allocateSharedMemory(int64_t size)
 {
@@ -147,6 +167,32 @@ android::sp<V1_0::IPreparedModel> PrepareModelWithStatus(const V1_1::Model& mode
 
 #endif
 
+#ifdef ARMNN_ANDROID_NN_V1_2
+
+android::sp<V1_2::IPreparedModel> PrepareModelWithStatus_1_2(const armnn_driver::hal_1_2::HalPolicy::Model& model,
+                                                             armnn_driver::ArmnnDriver& driver,
+                                                             ErrorStatus& prepareStatus,
+                                                             ErrorStatus expectedStatus)
+{
+    android::sp<PreparedModelCallback_1_2> cb(new PreparedModelCallback_1_2());
+
+    android::hardware::hidl_vec<android::hardware::hidl_handle> emptyHandle1;
+    android::hardware::hidl_vec<android::hardware::hidl_handle> emptyHandle2;
+    armnn_driver::ArmnnDriver::HidlToken emptyToken;
+
+    driver.prepareModel_1_2(model, V1_1::ExecutionPreference::LOW_POWER, emptyHandle1, emptyHandle2, emptyToken, cb);
+
+    prepareStatus = cb->GetErrorStatus();
+    BOOST_TEST(prepareStatus == expectedStatus);
+    if (expectedStatus == ErrorStatus::NONE)
+    {
+        BOOST_TEST((cb->GetPreparedModel_1_2() != nullptr));
+    }
+    return cb->GetPreparedModel_1_2();
+}
+
+#endif
+
 ErrorStatus Execute(android::sp<V1_0::IPreparedModel> preparedModel,
                     const Request& request,
                     ErrorStatus expectedStatus)
-- 
cgit v1.2.1