commit 87cb761135387e19ae17c7af4e4020a12c63975a
author Kevin May <kevin.may@arm.com> Mon Nov 11 17:30:35 2019 +0000
committer Kevin May <kevin.may@arm.com> Fri Nov 15 09:20:18 2019 +0000
tree 21dab12f7d19956525181689d5a108b98418e307
parent 62c4d71199b6f5b7ef9fe5280f47fa3f912cbed1

IVGCVSW-4115 Fix for armnn-driver-tests Capabilities failure

* Add TensorQuant8SymmPerChannel to ArmnnDriverImpl::getCapabilities_1_2
* Add TensorQuant8Symm and TensorQuant8SymmPerChannel to Capabilities
  supported operands tests

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

1.2/ArmnnDriverImpl.cpp

diff --git a/1.2/ArmnnDriverImpl.cpp b/1.2/ArmnnDriverImpl.cpp
index 7309c2a..6ea9bc4 100644
--- a/1.2/ArmnnDriverImpl.cpp
+++ b/1.2/ArmnnDriverImpl.cpp
@@ -43,6 +43,11 @@
 const char *g_OperandTypeTensorQuant8SymmPerformancePowerUsage =
         "Armnn.operandTypeTensorQuant8SymmPerformance.powerUsage";
 
+const char *g_OperandTypeTensorQuant8SymmPerChannelPerformanceExecTime =
+    "Armnn.operandTypeTensorQuant8SymmPerChannelPerformance.execTime";
+const char *g_OperandTypeTensorQuant8SymmPerChannelPerformancePowerUsage =
+    "Armnn.operandTypeTensorQuant8SymmPerChannelPerformance.powerUsage";
+
 
 const char *g_OperandTypeTensorInt32PerformanceExecTime     = "Armnn.operandTypeTensorInt32Performance.execTime";
 const char *g_OperandTypeTensorInt32PerformancePowerUsage   = "Armnn.operandTypeTensorInt32Performance.powerUsage";
@@ -274,6 +279,14 @@
                     .powerUsage = ParseSystemProperty(g_OperandTypeTensorQuant16SymmPerformancePowerUsage, defaultValue)
                 });
 
+        update(&capabilities.operandPerformance, OperandType::TENSOR_QUANT8_SYMM_PER_CHANNEL,
+               {
+                   .execTime =
+                   ParseSystemProperty(g_OperandTypeTensorQuant8SymmPerChannelPerformanceExecTime, defaultValue),
+                   .powerUsage =
+                   ParseSystemProperty(g_OperandTypeTensorQuant8SymmPerChannelPerformancePowerUsage, defaultValue)
+               });
+
         update(&capabilities.operandPerformance, OperandType::TENSOR_INT32,
                 {
                     .execTime = ParseSystemProperty(g_OperandTypeTensorInt32PerformanceExecTime, defaultValue),