commit 2eaa11995b2ed1c9ec48748e73d95d2d66ddbd33
author Kevin May <kevin.may@arm.com> Wed Apr 15 16:50:57 2020 +0100
committer Kevin May <kevin.may@arm.com> Thu Apr 16 08:38:33 2020 +0100
tree 4c3888fdde6859a1094d5ba12b0a6b12a8db730c
parent ef8a393e1945535721fea09a11cce50d7c607c47

IVGCVSW-4672 Fix VTS 1.2/1.3 GetCapabilities test

Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: I13be6896dd313bfeaf2f6b08ce0e47116116c3c0

1.2/ArmnnDriverImpl.cpp

diff --git a/1.2/ArmnnDriverImpl.cpp b/1.2/ArmnnDriverImpl.cpp
index bfa730b..4571fe0 100644
--- a/1.2/ArmnnDriverImpl.cpp
+++ b/1.2/ArmnnDriverImpl.cpp
@@ -237,6 +237,12 @@
         capabilities.relaxedFloat32toFloat16PerformanceScalar.execTime =
                 ParseSystemProperty(g_RelaxedFloat32toFloat16PerformanceExecTime, defaultValue);
 
+        capabilities.relaxedFloat32toFloat16PerformanceScalar.powerUsage =
+                ParseSystemProperty(g_RelaxedFloat32toFloat16PerformancePowerUsage, defaultValue);
+
+        capabilities.relaxedFloat32toFloat16PerformanceTensor.execTime =
+                ParseSystemProperty(g_RelaxedFloat32toFloat16PerformanceExecTime, defaultValue);
+
         capabilities.relaxedFloat32toFloat16PerformanceTensor.powerUsage =
                 ParseSystemProperty(g_RelaxedFloat32toFloat16PerformancePowerUsage, defaultValue);
 
@@ -314,8 +320,10 @@
     }
     else
     {
-        capabilities.relaxedFloat32toFloat16PerformanceScalar.execTime = 0;
-        capabilities.relaxedFloat32toFloat16PerformanceTensor.execTime = 0;
+        capabilities.relaxedFloat32toFloat16PerformanceScalar.execTime   = 0;
+        capabilities.relaxedFloat32toFloat16PerformanceScalar.powerUsage = 0;
+        capabilities.relaxedFloat32toFloat16PerformanceTensor.execTime   = 0;
+        capabilities.relaxedFloat32toFloat16PerformanceTensor.powerUsage = 0;
 
         // Set the base value for all operand types
         #ifdef ARMNN_ANDROID_R