commit d7d7e9035ca28b1b5200b20a73825397d46830fc
author Georgios Pinitas <georgios.pinitas@arm.com> Wed Dec 18 15:40:54 2019 +0000
committer Michele Di Giorgio <michele.digiorgio@arm.com> Wed Dec 18 18:57:07 2019 +0000
tree c8c22e4b069012d57b98265d886c6bf7dc4877ae
parent d0bbf0351e560bfd35f248ac6137ce88fff23c30

COMPMID-2819: Update data type auto_init in Elementwise kernels.

Auto initialization functionality is updated in elementwise kernels to
check both data types in order to reason for the output data type
configuration.

Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: Ic08b5567d08a3aaca00942acbdbc8aee19686617
Reviewed-on: https://review.mlplatform.org/c/2495
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>

src/core/NEON/kernels/NEArithmeticAdditionKernel.cpp

diff --git a/src/core/NEON/kernels/NEArithmeticAdditionKernel.cpp b/src/core/NEON/kernels/NEArithmeticAdditionKernel.cpp
index 947be18..3532526 100644
--- a/src/core/NEON/kernels/NEArithmeticAdditionKernel.cpp
+++ b/src/core/NEON/kernels/NEArithmeticAdditionKernel.cpp
@@ -403,7 +403,7 @@
             int x = window_start_x;
             for(; x <= (window_end_x - window_step_x); x += window_step_x)
             {
-                const int8x16_t    a = vld1q_s8(non_broadcast_input_ptr + x);
+                const int8x16_t     a = vld1q_s8(non_broadcast_input_ptr + x);
                 const float32x4x4_t af =
                 {
                     {
@@ -875,7 +875,7 @@
         {
             set_format_if_unknown(output, Format::S16);
         }
-        else if(input1.data_type() == DataType::F16 && input2.data_type() == DataType::F16)
+        else if(input1.data_type() == DataType::F16 || input2.data_type() == DataType::F16)
         {
             set_format_if_unknown(output, Format::F16);
         }
@@ -883,15 +883,15 @@
         {
             set_format_if_unknown(output, Format::F32);
         }
-        else if(input1.data_type() == DataType::QASYMM8)
+        else if(input1.data_type() == DataType::QASYMM8 || input2.data_type() == DataType::QASYMM8)
         {
             set_data_type_if_unknown(output, DataType::QASYMM8);
         }
-        else if(input1.data_type() == DataType::QASYMM8_SIGNED)
+        else if(input1.data_type() == DataType::QASYMM8_SIGNED || input2.data_type() == DataType::QASYMM8_SIGNED)
         {
             set_data_type_if_unknown(output, DataType::QASYMM8_SIGNED);
         }
-        else if(input1.data_type() == DataType::QSYMM16)
+        else if(input1.data_type() == DataType::QSYMM16 || input2.data_type() == DataType::QSYMM16)
         {
             set_data_type_if_unknown(output, DataType::QSYMM16);
         }