commit ef8a393e1945535721fea09a11cce50d7c607c47
author Sadik Armagan <sadik.armagan@arm.com> Thu Apr 09 17:21:50 2020 +0100
committer Sadik Armagan <sadik.armagan@arm.com> Thu Apr 09 17:21:50 2020 +0100
tree a1ed3723a0bd0caf43587f0a9d8579751d725447
parent 185f58828ee44130da4d87fcc6754062020f9711

IVGCVSW-4641 Investigate Hal 1.3 VTS Failures

* Return correct ErrorStatus for MemoryDomain test
* Return if ErrorStatus is different than NONE

Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: I4224256b7c382e5a46349ac730e5f6d5828539ed

ArmnnPreparedModel_1_3.cpp

diff --git a/ArmnnPreparedModel_1_3.cpp b/ArmnnPreparedModel_1_3.cpp
index a3ad6ae..68156ca 100644
--- a/ArmnnPreparedModel_1_3.cpp
+++ b/ArmnnPreparedModel_1_3.cpp
@@ -337,7 +337,7 @@
 {
     if (!setRunTimePoolInfosFromMemoryPools(&memPools, request.pools))
     {
-        return {ErrorStatus::GENERAL_FAILURE, {}, g_NoTiming, "ArmnnPreparedModel_1_3::execute"};
+        return {ErrorStatus::INVALID_ARGUMENT, {}, g_NoTiming, "ArmnnPreparedModel_1_3::execute"};
     }
 
     // add the inputs and outputs with their data
@@ -397,6 +397,7 @@
                        {},
                        g_NoTiming,
                        "ArmnnPreparedModel_1_3::ExecuteSynchronously invalid request model");
+        return Void();
     }
 
 
@@ -412,6 +413,7 @@
     if (status != V1_3::ErrorStatus::NONE)
     {
         cbCtx.callback(status, outputShapes, timing, message);
+        return Void();
     }
 
     ALOGV("ArmnnPreparedModel_1_3::ExecuteSynchronously() before Execution");