commit 8fce496a715929372b3c448a233713d87d65f768
author Giorgio Arena <giorgio.arena@arm.com> Wed Sep 01 14:05:00 2021 +0100
committer Giorgio Arena <giorgio.arena@arm.com> Fri Sep 03 14:04:19 2021 +0000
tree 283841880dd0c969addda1c08f50fc6e622ff07d
parent b8025b3bb1b75fa94400a665e65a1d53ba9965f9

Remove padding from ClPool2dKernel NCHW

- Simplify NCHW kernel structure by removing old optimized paths
- Merge quantized with fp kernels

Resolve COMPMID-4722

Signed-off-by: Giorgio Arena <giorgio.arena@arm.com>
Change-Id: I79016b119619aed6a6193295601cd6517f14b88c
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/6183
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>

src/gpu/cl/ClKernelLibrary.cpp

diff --git a/src/gpu/cl/ClKernelLibrary.cpp b/src/gpu/cl/ClKernelLibrary.cpp
index 5cd969e..c05bb96 100644
--- a/src/gpu/cl/ClKernelLibrary.cpp
+++ b/src/gpu/cl/ClKernelLibrary.cpp
@@ -328,10 +328,6 @@
     { "pixelwise_mul_float", "common/pixelwise_mul_float.cl" },
     { "pixelwise_mul_int", "common/pixelwise_mul_int.cl" },
     { "pixelwise_mul_quantized", "common/pixelwise_mul_int.cl" },
-    { "pooling_layer_2", "common/pooling_layer.cl" },
-    { "pooling_layer_3", "common/pooling_layer.cl" },
-    { "pooling_layer_optimized_3", "common/pooling_layer.cl" },
-    { "pooling_layer_7", "common/pooling_layer.cl" },
     { "qlstm_layer_normalization", "common/qlstm_layer_normalization.cl" },
     { "quantization_layer", "common/quantization_layer.cl" },
     { "range", "common/range.cl" },
@@ -385,9 +381,7 @@
     { "normalize_planar_yuv_layer_nchw", "nchw/normalize_planar_yuv_layer.cl" },
     { "normalize_planar_yuv_layer_q8_nchw", "nchw/normalize_planar_yuv_layer_quantized.cl" },
     { "pooling_layer_MxN_nchw", "nchw/pooling_layer.cl" },
-    { "pooling_layer_2_nchw_indices_fp32", "nchw/pooling_layer.cl" },
-    { "pooling_layer_2_nchw_indices_fp16", "nchw/pooling_layer.cl" },
-    { "pooling_layer_MxN_quantized_nchw", "nchw/pooling_layer_quantized.cl" },
+    { "pooling_layer_2_nchw_indices", "nchw/pooling_layer.cl" },
     { "prior_box_layer_nchw", "nchw/prior_box_layer.cl" },
     { "remap_nearest_neighbour_nchw", "nchw/remap.cl" },
     { "remap_bilinear_nchw", "nchw/remap.cl" },
@@ -668,10 +662,6 @@
 #include "./cl_kernels/common/pixelwise_mul_int.clembed"
     },
     {
-        "common/pooling_layer.cl",
-#include "./cl_kernels/common/pooling_layer.clembed"
-    },
-    {
         "common/qlstm_layer_normalization.cl",
 #include "./cl_kernels/common/qlstm_layer_normalization.clembed"
     },
@@ -805,10 +795,6 @@
 #include "./cl_kernels/nchw/pooling_layer.clembed"
     },
     {
-        "nchw/pooling_layer_quantized.cl",
-#include "./cl_kernels/nchw/pooling_layer_quantized.clembed"
-    },
-    {
         "nchw/prior_box_layer.cl",
 #include "./cl_kernels/nchw/prior_box_layer.clembed"
     },