Fix oclgrind int overflow warning

Fix warning found by oclgrind. Also remove duplicated code.

Resolves COMPMID-4675

Signed-off-by: Freddie Liardet <frederick.liardet@arm.com>
Change-Id: I6ad56cc0130b5df936f1e070db116695269317df
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5974
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>

1 files changed, 1 insertions, 113 deletions

diff --git a/src/core/CL/cl_kernels/tile_helpers.h b/src/core/CL/cl_kernels/tile_helpers.h
index a5688ce625..ecabecb8fb 100644
--- a/src/core/CL/cl_kernels/tile_helpers.h
+++ b/src/core/CL/cl_kernels/tile_helpers.h
@@ -686,7 +686,7 @@
                 _tmp = select(ab_x2_high32, (SRC_DATA_TYPE)INT_MAX, overflow); \
                 if(DST_SHIFT >= 0) \
                 { \
-                    long mask = ((((int)1) << DST_SHIFT) - (int)1); \
+                    long mask = ((((int)1) << DST_SHIFT) - (long)1); \
                     long threshold = _tmp < (int)0 ? (mask >> 1) + (long)1 : (mask >> 1) + 0; \
                     _tmp = (_tmp & mask) > threshold ? (_tmp >> DST_SHIFT) + (int)1 : (_tmp >> DST_SHIFT); \
                 } \
@@ -954,115 +954,3 @@
             })                                                                                             \
         })                                                                                             \
     })
-
-/** 8-bit quantization with fixed-point scale
- *
- * @param[in]  SRC_DATA_TYPE     SRC data type
- * @param[in]  DST_DATA_TYPE     DST data type
- * @param[in]  QUANTIZATION_TYPE Quantization type (PER_TENSOR or PER_CHANNEL)
- * @param[in]  M0                Number of src/dst rows
- * @param[in]  N0                Number of src/dst columns
- * @param[in]  DST_OFFSET        Quantization offset used for both the per-tensor and per-channel quantization
- * @param[in]  DST_SHIFT         Quantization shift for the per-tensor quantization
- * @param[in]  DST_MULTIPLIER    Quantization multiplier for the per-tensor quantization
- * @param[in]  src               Input tile
- * @param[in]  dst_multipliers   Output multipliers tile for the per-channel quantization
- * @param[in]  dst_shifts        Output shift tile for the per-channel quantization
- * @param[out] dst               Output tile
- */
-#define T_QUANTIZE8(SRC_DATA_TYPE, DST_DATA_TYPE, QUANTIZATION_TYPE, M0, N0, DST_OFFSET, DST_SHIFT, DST_MULTIPLIER, src, dst_multipliers, dst_shifts, dst) T_QUANTIZE8_STR(SRC_DATA_TYPE, DST_DATA_TYPE, QUANTIZATION_TYPE, M0, N0, DST_OFFSET, DST_SHIFT, DST_MULTIPLIER, src, dst_multipliers, dst_shifts, dst)
-#define T_QUANTIZE8_STR(SRC_DATA_TYPE, DST_DATA_TYPE, QUANTIZATION_TYPE, M0, N0, DST_OFFSET, DST_SHIFT, DST_MULTIPLIER, src, dst_multipliers, dst_shifts, dst) T_QUANTIZE8_##QUANTIZATION_TYPE(SRC_DATA_TYPE, DST_DATA_TYPE, M0, N0, DST_OFFSET, DST_SHIFT, DST_MULTIPLIER, src, dst_multipliers, dst_shifts, dst)
-
-/** 8-bit per-tensor quantization with fixed-point scale
- *
- * @param[in]  SRC_DATA_TYPE   SRC data type
- * @param[in]  DST_DATA_TYPE   DST data type
- * @param[in]  M0              Number of src/dst rows
- * @param[in]  N0              Number of src/dst columns
- * @param[in]  DST_OFFSET      Quantization offset
- * @param[in]  DST_SHIFT       Quantization shift for the per-tensor quantization
- * @param[in]  DST_MULTIPLIER  Quantization multiplier for the per-tensor quantization
- * @param[in]  src             Input tile
- * @param[in]  dst_multipliers (unused)
- * @param[in]  dst_shifts      (unused)
- * @param[out] dst             Output tile
- */
-#define T_QUANTIZE8_PER_TENSOR(SRC_DATA_TYPE, DST_DATA_TYPE, M0, N0, DST_OFFSET, DST_SHIFT, DST_MULTIPLIER, src, dst_multipliers, dst_shifts, dst)                          \
-    ({ \
-        LOOP_UNROLLING(int, _m0, 0, 1, M0, \
-        { \
-            LOOP_UNROLLING(int, _n0, 0, 1, N0, \
-            { \
-                SRC_DATA_TYPE _tmp = 0; \
-                SRC_DATA_TYPE _src = src[_m0].s[_n0]; \
-                _src *= select((SRC_DATA_TYPE)1, ((SRC_DATA_TYPE)1 << (SRC_DATA_TYPE)(-DST_SHIFT)), ((SRC_DATA_TYPE)DST_SHIFT < (SRC_DATA_TYPE)0)); \
-                SRC_DATA_TYPE overflow = _src == DST_MULTIPLIER && _src == INT_MIN; \
-                long a_64 = (long)(_src); \
-                long b_64 = (long)(DST_MULTIPLIER); \
-                long ab_64 = a_64 * b_64; \
-                long mask1 = 1 << 30; \
-                long mask2 = 1 - (1 << 30); \
-                long is_positive_or_zero = ab_64 >= 0; \
-                long nudge = select(mask2, mask1, is_positive_or_zero); \
-                SRC_DATA_TYPE ab_x2_high32 = CONVERT((ab_64 + nudge) / (long)(1ll << 31), SRC_DATA_TYPE); \
-                _tmp = select(ab_x2_high32, (SRC_DATA_TYPE)INT_MAX, overflow); \
-                if(DST_SHIFT >= 0) \
-                { \
-                    long mask = ((((int)1) << DST_SHIFT) - (int)1); \
-                    long threshold = _tmp < (int)0 ? (mask >> 1) + (long)1 : (mask >> 1) + 0; \
-                    _tmp = (_tmp & mask) > threshold ? (_tmp >> DST_SHIFT) + (int)1 : (_tmp >> DST_SHIFT); \
-                } \
-                _tmp += DST_OFFSET; \
-                dst[_m0].s[_n0] = CONVERT_SAT(_tmp, DST_DATA_TYPE);                                                                            \
-            })                                                                                                                                          \
-        })                                                                                                                                          \
-    })
-
-/** 8-bit per-channel quantization with fixed-point scale
- *
- * @param[in]  SRC_DATA_TYPE   SRC data type
- * @param[in]  DST_DATA_TYPE   DST data type
- * @param[in]  M0              Number of src/dst rows
- * @param[in]  N0              Number of src/dst columns
- * @param[in]  DST_OFFSET      Quantization offset
- * @param[in]  DST_SHIFT       (unused)
- * @param[in]  DST_MULTIPLIER  (unused)
- * @param[in]  src             Input tile
- * @param[in]  dst_multipliers Output multipliers tile for the per-channel quantization
- * @param[in]  dst_shifts      Output shift tile for the per-channel quantization
- * @param[out] dst             Output tile
- */
-#define T_QUANTIZE8_PER_CHANNEL(SRC_DATA_TYPE, DST_DATA_TYPE, M0, N0, DST_OFFSET, DST_SHIFT, DST_MULTIPLIER, src, dst_multipliers, dst_shifts, dst)                          \
-    ({ \
-        LOOP_UNROLLING(int, _m0, 0, 1, M0, \
-        { \
-            LOOP_UNROLLING(int, _n0, 0, 1, N0, \
-            { \
-                SRC_DATA_TYPE _tmp = 0; \
-                SRC_DATA_TYPE _src = src[_m0].s[_n0]; \
-                SRC_DATA_TYPE _dst_multiplier = dst_multipliers[0].s[_n0]; \
-                SRC_DATA_TYPE _dst_shift = dst_shifts[0].s[_n0]; \
-                _src *= select((SRC_DATA_TYPE)1, ((SRC_DATA_TYPE)1 << (SRC_DATA_TYPE)(-_dst_shift)), ((SRC_DATA_TYPE)_dst_shift < (SRC_DATA_TYPE)0)); \
-                SRC_DATA_TYPE overflow = _src == _dst_multiplier && _src == INT_MIN; \
-                long a_64 = (long)(_src); \
-                long b_64 = (long)(_dst_multiplier); \
-                long ab_64 = a_64 * b_64; \
-                long mask1 = 1 << 30; \
-                long mask2 = 1 - (1 << 30); \
-                long is_positive_or_zero = ab_64 >= 0; \
-                long nudge = select(mask2, mask1, is_positive_or_zero); \
-                SRC_DATA_TYPE ab_x2_high32 = CONVERT((ab_64 + nudge) / (long)(1ll << 31), SRC_DATA_TYPE); \
-                _tmp = select(ab_x2_high32, (SRC_DATA_TYPE)INT_MAX, overflow); \
-                if(_dst_shift >= 0) \
-                { \
-                    long mask = ((((int)1) << _dst_shift) - (int)1); \
-                    long threshold = _tmp < (int)0 ? (mask >> 1) + (long)1 : (mask >> 1) + 0; \
-                    _tmp = (_tmp & mask) > threshold ? (_tmp >> _dst_shift) + (int)1 : (_tmp >> _dst_shift); \
-                } \
-                _tmp += DST_OFFSET; \
-                dst[_m0].s[_n0] = CONVERT_SAT(_tmp, DST_DATA_TYPE);                                                                            \
-            })                                                                                                                                          \
-        })                                                                                                                                         \
-    })
-// clang-format on
-// *INDENT-ON*