commit df655ee1dbe570de7a348888a92e73bae3dc37b4
author FinnWilliamsArm <Finn.Williams@arm.com> Wed Jul 24 16:04:18 2019 +0100
committer FinnWilliamsArm <Finn.Williams@arm.com> Wed Jul 24 16:21:43 2019 +0100
tree fda747e45a530cc38dd71b5c9c0b6c9b83a9cbdc
parent 2050c23fb3c2f7b867033fd842ec6f4767449008

IVGCVSW-3496 Fix VTS NeuralnetworksHidlTest.GetCapabilitiesTest

Signed-off-by: FinnWilliamsArm <Finn.Williams@arm.com>
Change-Id: Ib7a661b731ce581821c6d3ecaf06d1c3c850117a

1.2/ArmnnDriverImpl.cpp

diff --git a/1.2/ArmnnDriverImpl.cpp b/1.2/ArmnnDriverImpl.cpp
index 3b2cb74..82eacde 100644
--- a/1.2/ArmnnDriverImpl.cpp
+++ b/1.2/ArmnnDriverImpl.cpp
@@ -14,6 +14,7 @@
 {
 
 const char *g_RelaxedFloat32toFloat16PerformanceExecTime    = "ArmNN.relaxedFloat32toFloat16Performance.execTime";
+const char *g_RelaxedFloat32toFloat16PerformancePowerUsage  = "ArmNN.relaxedFloat32toFloat16Performance.powerUsage";
 
 const char *g_OperandTypeTensorFloat32PerformanceExecTime   = "Armnn.operandTypeTensorFloat32Performance.execTime";
 const char *g_OperandTypeTensorFloat32PerformancePowerUsage = "Armnn.operandTypeTensorFloat32Performance.powerUsage";
@@ -218,8 +219,8 @@
         capabilities.relaxedFloat32toFloat16PerformanceScalar.execTime =
                 ParseSystemProperty(g_RelaxedFloat32toFloat16PerformanceExecTime, defaultValue);
 
-        capabilities.relaxedFloat32toFloat16PerformanceTensor.execTime =
-                ParseSystemProperty(g_RelaxedFloat32toFloat16PerformanceExecTime, defaultValue);
+        capabilities.relaxedFloat32toFloat16PerformanceTensor.powerUsage =
+                ParseSystemProperty(g_RelaxedFloat32toFloat16PerformancePowerUsage, defaultValue);
 
         // Set the base value for all operand types
         capabilities.operandPerformance = nonExtensionOperandPerformance({FLT_MAX, FLT_MAX});