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

test/1.2/Capabilities.cpp

diff --git a/test/1.2/Capabilities.cpp b/test/1.2/Capabilities.cpp
index 4424f9b..8a769db 100644
--- a/test/1.2/Capabilities.cpp
+++ b/test/1.2/Capabilities.cpp
@@ -50,6 +50,10 @@
         __system_property_set("Armnn.operandTypeTensorInt32Performance.powerUsage", nullStr);
         __system_property_set("Armnn.operandTypeInt32Performance.execTime", nullStr);
         __system_property_set("Armnn.operandTypeInt32Performance.powerUsage", nullStr);
+        __system_property_set("Armnn.operandTypeTensorQuant8SymmPerformance.execTime", nullStr);
+        __system_property_set("Armnn.operandTypeTensorQuant8SymmPerformance.powerUsage", nullStr);
+        __system_property_set("Armnn.operandTypeTensorQuant8SymmPerChannelPerformance.execTime", nullStr);
+        __system_property_set("Armnn.operandTypeTensorQuant8SymmPerChannelPerformance.powerUsage", nullStr);
     }
 };
 
@@ -77,14 +81,14 @@
             CheckOperandType(capabilities, OperandType::TENSOR_QUANT16_SYMM, 3.0f, 3.1f);
             CheckOperandType(capabilities, OperandType::TENSOR_INT32, 3.2f, 3.3f);
             CheckOperandType(capabilities, OperandType::INT32, 3.4f, 3.5f);
+            CheckOperandType(capabilities, OperandType::TENSOR_QUANT8_SYMM, 2.8f, 2.9f);
+            CheckOperandType(capabilities, OperandType::TENSOR_QUANT8_SYMM_PER_CHANNEL, 2.8f, 2.9f);
 
             // Unsupported operands take FLT_MAX value
             CheckOperandType(capabilities, OperandType::UINT32, FLT_MAX, FLT_MAX);
             CheckOperandType(capabilities, OperandType::BOOL, FLT_MAX, FLT_MAX);
-            CheckOperandType(capabilities, OperandType::TENSOR_QUANT8_SYMM, FLT_MAX, FLT_MAX);
             CheckOperandType(capabilities, OperandType::TENSOR_QUANT16_ASYMM, FLT_MAX, FLT_MAX);
             CheckOperandType(capabilities, OperandType::TENSOR_BOOL8, FLT_MAX, FLT_MAX);
-            CheckOperandType(capabilities, OperandType::TENSOR_QUANT8_SYMM_PER_CHANNEL, FLT_MAX, FLT_MAX);
             CheckOperandType(capabilities, OperandType::OEM, FLT_MAX, FLT_MAX);
             CheckOperandType(capabilities, OperandType::TENSOR_OEM_BYTE, FLT_MAX, FLT_MAX);
 
@@ -107,6 +111,10 @@
     __system_property_set("Armnn.operandTypeTensorInt32Performance.powerUsage", "3.3f");
     __system_property_set("Armnn.operandTypeInt32Performance.execTime", "3.4f");
     __system_property_set("Armnn.operandTypeInt32Performance.powerUsage", "3.5f");
+    __system_property_set("Armnn.operandTypeTensorQuant8SymmPerformance.execTime", "2.8f");
+    __system_property_set("Armnn.operandTypeTensorQuant8SymmPerformance.powerUsage", "2.9f");
+    __system_property_set("Armnn.operandTypeTensorQuant8SymmPerChannelPerformance.execTime", "2.8f");
+    __system_property_set("Armnn.operandTypeTensorQuant8SymmPerChannelPerformance.powerUsage", "2.9f");
 
     armnn::IRuntime::CreationOptions options;
     armnn::IRuntimePtr runtime(armnn::IRuntime::Create(options));
@@ -131,14 +139,14 @@
             CheckOperandType(capabilities, OperandType::TENSOR_QUANT16_SYMM, defaultValue, defaultValue);
             CheckOperandType(capabilities, OperandType::TENSOR_INT32, defaultValue, defaultValue);
             CheckOperandType(capabilities, OperandType::INT32, defaultValue, defaultValue);
+            CheckOperandType(capabilities, OperandType::TENSOR_QUANT8_SYMM_PER_CHANNEL, defaultValue, defaultValue);
+            CheckOperandType(capabilities, OperandType::TENSOR_QUANT8_SYMM, defaultValue, defaultValue);
 
             // Unsupported operands take FLT_MAX value
             CheckOperandType(capabilities, OperandType::UINT32, FLT_MAX, FLT_MAX);
             CheckOperandType(capabilities, OperandType::BOOL, FLT_MAX, FLT_MAX);
-            CheckOperandType(capabilities, OperandType::TENSOR_QUANT8_SYMM, FLT_MAX, FLT_MAX);
             CheckOperandType(capabilities, OperandType::TENSOR_QUANT16_ASYMM, FLT_MAX, FLT_MAX);
             CheckOperandType(capabilities, OperandType::TENSOR_BOOL8, FLT_MAX, FLT_MAX);
-            CheckOperandType(capabilities, OperandType::TENSOR_QUANT8_SYMM_PER_CHANNEL, FLT_MAX, FLT_MAX);
             CheckOperandType(capabilities, OperandType::OEM, FLT_MAX, FLT_MAX);
             CheckOperandType(capabilities, OperandType::TENSOR_OEM_BYTE, FLT_MAX, FLT_MAX);