commit 2ec6c1eb6ee77b79e8ab6b97b8cd70bcc4c5589d
author Gian Marco Iodice <gianmarco.iodice@arm.com> Tue Apr 09 12:03:05 2019 +0100
committer Gian Marco Iodice <gianmarco.iodice@arm.com> Tue Apr 16 12:32:21 2019 +0000
tree 5406927e4b3f073084bb4b82a6836f9753c32d8e
parent a851bbaaa8f48d6716eff3375668f5d2b910104b

COMPMID-2110: Enable CLGEMMLowpMatrixMultiplyReshapeOnlyRHSKernel in CLGEMMLowp

Change-Id: Ic32c803c3e2a067de10a7e46c85c962a970957b6
Signed-off-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Reviewed-on: https://review.mlplatform.org/c/969
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>

src/core/CL/cl_kernels/gemmlowp.cl

diff --git a/src/core/CL/cl_kernels/gemmlowp.cl b/src/core/CL/cl_kernels/gemmlowp.cl
index cf377e1..033b4b4 100644
--- a/src/core/CL/cl_kernels/gemmlowp.cl
+++ b/src/core/CL/cl_kernels/gemmlowp.cl
@@ -4006,4 +4006,4 @@
     // Store the result
     vstore4(res, 0, dst_addr);
 }
-#endif // defined(REAL_MULTIPLIER) && defined(OUTPUT_OFFSET)
+#endif // defined(REAL_MULTIPLIER) && defined(OUTPUT_OFFSET)
\ No newline at end of file

src/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfigurationBifrost.cpp

diff --git a/src/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfigurationBifrost.cpp b/src/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfigurationBifrost.cpp
index f696f0b..483bab8 100644
--- a/src/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfigurationBifrost.cpp
+++ b/src/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfigurationBifrost.cpp
@@ -133,21 +133,13 @@
     {
         if(m == 1)
         {
-            if(n > 2048)
-            {
-                const unsigned int h0 = std::max(n / 4, static_cast<unsigned int>(1));
-                return configure_lhs_rhs_info(m, n, 1, 4, 16, 1, h0, false, true, false, true);
-            }
-            else
-            {
-                const unsigned int h0 = std::max(n / 2, static_cast<unsigned int>(1));
-                return configure_lhs_rhs_info(m, n, 1, 2, 16, 1, h0, false, true, false, true);
-            }
+            const unsigned int h0 = std::max(n / 2, static_cast<unsigned int>(1));
+            return configure_lhs_rhs_info(m, n, 1, 2, 4, 1, h0, false, true, false, true);
         }
         else
         {
             const unsigned int h0 = std::max(n / 4, static_cast<unsigned int>(1));
-            return configure_lhs_rhs_info(m, n, 4, 1, 16, 1, h0, false, true, false, true);
+            return configure_lhs_rhs_info(m, n, 2, 2, 16, 1, h0, false, true, false, true);
         }
     }
 }

src/core/CL/kernels/CLGEMMLowpMatrixMultiplyReshapedOnlyRHSKernel.cpp

diff --git a/src/core/CL/kernels/CLGEMMLowpMatrixMultiplyReshapedOnlyRHSKernel.cpp b/src/core/CL/kernels/CLGEMMLowpMatrixMultiplyReshapedOnlyRHSKernel.cpp
index b1b0a16..eca2416 100644
--- a/src/core/CL/kernels/CLGEMMLowpMatrixMultiplyReshapedOnlyRHSKernel.cpp
+++ b/src/core/CL/kernels/CLGEMMLowpMatrixMultiplyReshapedOnlyRHSKernel.cpp
@@ -152,7 +152,7 @@
     window_changed = update_window_and_padding(win, input0_access, input1_access) || // window used by the execute_window_loop
                      update_window_and_padding(win_out, output_access);              // window used to update the padding requirements of output tensor
 
-    output_access.set_valid_region(win_out, ValidRegion(Coordinates(0, 0), output->tensor_shape()));
+    output_access.set_valid_region(win_out, ValidRegion(Coordinates(), output->tensor_shape()));
 
     // Collapse along the Z direction
     // This collapse needs to be here in order to tune the Z dimension of LWS