1 files changed, 6 insertions, 30 deletions

diff --git a/src/runtime/NEON/functions/NEGEMM.cpp b/src/runtime/NEON/functions/NEGEMM.cpp
index 73c5f548c9..dfcb3954ea 100644
--- a/src/runtime/NEON/functions/NEGEMM.cpp
+++ b/src/runtime/NEON/functions/NEGEMM.cpp
@@ -43,11 +43,13 @@ NEGEMM::NEGEMM()
 
 void NEGEMM::configure(const ITensor *a, const ITensor *b, const ITensor *c, ITensor *d, float alpha, float beta)
 {
-    ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(a, 1, DataType::F32, DataType::F16, DataType::QS8);
+    ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(a, 1, DataType::F32, DataType::F16, DataType::QS8, DataType::QS16);
     ARM_COMPUTE_ERROR_ON_MISMATCHING_DATA_TYPES(a, b, d);
+    ARM_COMPUTE_ERROR_ON_MSG(a->info()->dimension(0) != b->info()->dimension(1), "The product AB is defined only if the number of columns in A is equal to the number of rows in B");
 
     if(c != nullptr)
     {
+        ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(c, 1, DataType::F32, DataType::F16, DataType::QS8, DataType::QS16);
         ARM_COMPUTE_ERROR_ON_MISMATCHING_DATA_TYPES(a, c);
         ARM_COMPUTE_ERROR_ON_MSG(a->info()->dimension(1) != c->info()->dimension(1), "The C matrix must have the same number of rows as the matrix A");
         ARM_COMPUTE_ERROR_ON_MSG(b->info()->dimension(0) != c->info()->dimension(0), "The C matrix must have the same number of columns as the matrix B");
@@ -55,8 +57,6 @@ void NEGEMM::configure(const ITensor *a, const ITensor *b, const ITensor *c, ITe
         ARM_COMPUTE_ERROR_ON_MSG(c->info()->dimension(1) != d->info()->dimension(1), "The C matrix must have the same number of columns as the output matrix");
     }
 
-    ARM_COMPUTE_ERROR_ON_MSG(a->info()->dimension(0) != b->info()->dimension(1), "The product AB is defined only if the number of columns in A is equal to the number of rows in B");
-
     // Check if the first input tensor is a vector. If so, all the kernels for reshaping the tensors can be skipped
     if((a->info()->dimension(1) == 1))
     {
@@ -75,33 +75,9 @@ void NEGEMM::configure(const ITensor *a, const ITensor *b, const ITensor *c, ITe
         shape_tmp_a.set(0, a->info()->dimension(0) * 4);
         shape_tmp_a.set(1, std::ceil(a->info()->dimension(1) / 4.0f));
 
-        switch(a->info()->data_type())
-        {
-            case DataType::F32:
-            {
-                shape_tmp_b.set(0, b->info()->dimension(1) * 4);
-                shape_tmp_b.set(1, std::ceil(b->info()->dimension(0) / 4.0f));
-                break;
-            }
-            case DataType::F16:
-#ifdef ARM_COMPUTE_ENABLE_FP16
-                {
-                    shape_tmp_b.set(0, b->info()->dimension(1) * 8);
-                    shape_tmp_b.set(1, std::ceil(b->info()->dimension(0) / 8.0f));
-                    break;
-                }
-#endif /* ARM_COMPUTE_ENABLE_FP16 */
-            case DataType::QS8:
-            {
-                shape_tmp_b.set(0, b->info()->dimension(1) * 16);
-                shape_tmp_b.set(1, std::ceil(b->info()->dimension(0) / 16.0f));
-                break;
-            }
-            default:
-            {
-                ARM_COMPUTE_ERROR_ON("Data type not supported");
-            }
-        }
+        const unsigned int transpose_w = 16 / data_size_from_type(b->info()->data_type());
+        shape_tmp_b.set(0, b->info()->dimension(1) * transpose_w);
+        shape_tmp_b.set(1, std::ceil(b->info()->dimension(0) / static_cast<float>(transpose_w)));
 
         TensorInfo info_a(shape_tmp_a, 1, a->info()->data_type(), a->info()->fixed_point_position());
         TensorInfo info_b(shape_tmp_b, 1, b->info()->data_type(), a->info()->fixed_point_position());