commit 33ff9ef467153eef05b700820d859515a52481f4
author Xinghang Zhou <xinghang.zhou@arm.com> Wed Jan 17 11:23:39 2018 +0800
committer Anthony Barbier <anthony.barbier@arm.com> Fri Nov 02 16:45:00 2018 +0000
tree 87f0ac284aeeac696f0652bdb4489177ef89a48e
parent 1c0d0ffb99814749d5c48df282dc212cb939094a

APPBROWSER-400: Implement the tensorshift kernel for fixing DC's alignment issue on OpenGL ES

Change-Id: I7a8489bb0fddc72899ea165e414ee87bdbfb45b3
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/118106
Reviewed-by: Joel Liang <joel.liang@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>

src/core/GLES_COMPUTE/kernels/GCDirectConvolutionLayerKernel.cpp

diff --git a/src/core/GLES_COMPUTE/kernels/GCDirectConvolutionLayerKernel.cpp b/src/core/GLES_COMPUTE/kernels/GCDirectConvolutionLayerKernel.cpp
index 23f1c2e..fd461c5 100644
--- a/src/core/GLES_COMPUTE/kernels/GCDirectConvolutionLayerKernel.cpp
+++ b/src/core/GLES_COMPUTE/kernels/GCDirectConvolutionLayerKernel.cpp
@@ -317,12 +317,20 @@
     const int output_padding_bottom = ceil_to_multiple(output_height, num_elems_written_per_iteration_y * _lws[1]) - output_height;
 
     // Calculate input right and bottom border
-    const int input_width    = input->info()->dimension(0);
-    const int input_height   = input->info()->dimension(1);
-    const int upper_bound_w  = ceil_to_multiple(((output_width + output_padding_right) * _conv_stride_x + (kernel_size - 1)), num_elems_read_per_iteration_x * _lws[0]) - _conv_pad_x - input_width;
-    const int upper_bound_h  = ceil_to_multiple(((output_height + output_padding_bottom) * _conv_stride_y + (kernel_size - 1)), num_elems_read_per_iteration_y * _lws[1]) - _conv_pad_y - input_height;
-    const int padding_right  = std::max(upper_bound_w, _conv_pad_x);
-    const int padding_bottom = std::max(upper_bound_h, _conv_pad_y);
+    const int input_width        = input->info()->dimension(0);
+    const int input_height       = input->info()->dimension(1);
+    const int input_total_width  = std::max(int(input->info()->padding().left), int(_conv_pad_x)) + input_width + std::max(int(input->info()->padding().right), int(_conv_pad_x));
+    const int input_total_height = std::max(int(input->info()->padding().top), int(_conv_pad_y)) + input_height + std::max(int(input->info()->padding().bottom), int(_conv_pad_y));
+    const int padding_right1     = ceil_to_multiple(input_total_width, num_elems_read_per_iteration_x * _lws[0]) - input_width - _conv_pad_x;
+    const int padding_bottom1    = ceil_to_multiple(input_total_height, num_elems_read_per_iteration_y * _lws[1]) - input_height - _conv_pad_y;
+
+    const int upper_bound_w   = ceil_to_multiple(((output_width + output_padding_right) * _conv_stride_x + (kernel_size - 1)), num_elems_read_per_iteration_x * _lws[0]) - _conv_pad_x - input_width;
+    const int upper_bound_h   = ceil_to_multiple(((output_height + output_padding_bottom) * _conv_stride_y + (kernel_size - 1)), num_elems_read_per_iteration_y * _lws[1]) - _conv_pad_y - input_height;
+    const int padding_right2  = std::max(upper_bound_w, _conv_pad_x);
+    const int padding_bottom2 = std::max(upper_bound_h, _conv_pad_y);
+
+    const int padding_right  = std::max(padding_right1, padding_right2);
+    const int padding_bottom = std::max(padding_bottom1, padding_bottom2);
 
     BorderSize border = BorderSize(0, output_padding_right, output_padding_bottom, 0);
 
@@ -406,6 +414,8 @@
         add_1D_tensor_argument(idx1, _bias, 4, slice_bias);
     }
 
+    slice.shift(Window::DimX, -(_output->info()->padding()).left);
+
     do
     {
         unsigned int idx = 0;