commit 4df057551194ba079731f097ce840cc320353199
author steli01 <stephen.li@arm.com> Tue Jan 30 09:49:07 2018 +0800
committer Anthony Barbier <anthony.barbier@arm.com> Fri Nov 02 16:45:00 2018 +0000
tree e9a7c2894fea64fef637fd301cce2b99dbe395ca
parent 35ceeb2199c569810a1524a0a21c2df2a3f5f29e

APPBROWSER-395: Random error in FullyConnectedLayer

Change-Id: Ic460695b8a203c1080ea177b5463b48b07b70c4b
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/118075
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Joel Liang <joel.liang@arm.com>
Reviewed-by: Pablo Tello <pablo.tello@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>

src/core/GLES_COMPUTE/cs_shaders/convolution_layer.cs

diff --git a/src/core/GLES_COMPUTE/cs_shaders/convolution_layer.cs b/src/core/GLES_COMPUTE/cs_shaders/convolution_layer.cs
index 2648db0..2701f5b 100644
--- a/src/core/GLES_COMPUTE/cs_shaders/convolution_layer.cs
+++ b/src/core/GLES_COMPUTE/cs_shaders/convolution_layer.cs
@@ -586,8 +586,12 @@
         // even row
         if((pos.y + pos.z * height) % uint(2) == uint(0))
         {
-            tmp = LOAD_CURRENT_ITEM(src_ptr, src_iter);
-            STORE(dst_ptr, tmp_out_offset, tmp);
+            // skip last element of each line to avoid write conflict except for last line
+            if((pos.x < (width / element_count)) || ((pos.y == gl_NumWorkGroups.y - 1u) && (pos.z == gl_NumWorkGroups.z - 1u)))
+            {
+                tmp = LOAD_CURRENT_ITEM(src_ptr, src_iter);
+                STORE(dst_ptr, tmp_out_offset, tmp);
+            }
         }
         else
         {
@@ -612,19 +616,19 @@
     {
         tmp = LOAD_CURRENT_ITEM(src_ptr, src_iter);
         STORE(dst_ptr, tmp_out_offset, tmp);
+    }
 
 #ifdef HAS_BIAS
-        // If it is the last thread in the 3 dimensional workgroup
-        if(pos.x == (size.x - 1) && pos.y == (size.y - 1) && pos.z == (size.z - 1))
-        {
-            tmp_out_offset += (dst_attrs.stride_x >> dst_shift);
+    // If it is the last thread in the 3 dimensional workgroup
+    if(pos.x == (size.x - 1u) && pos.y == (size.y - 1u) && pos.z == (size.z - 1u))
+    {
+        tmp_out_offset += (dst_attrs.stride_x >> dst_shift);
 
-            // FIXME: need odd/even detection for tmp_out_offset?
-            mediump vec2 bias_vec = vec2(1.0f, 1.0f);
-            STORE_PACK2_HALF(dst_ptr, tmp_out_offset, bias_vec);
-        }
-#endif // HAS_BIAS
+        // FIXME: need odd/even detection for tmp_out_offset?
+        mediump vec2 bias_vec = vec2(1.0f, 1.0f);
+        STORE_PACK2_HALF(dst_ptr, tmp_out_offset, bias_vec);
     }
+#endif // HAS_BIAS
 }
 
 #else /* IM2COL_REDUCED_GENERIC */