diff options
| author | Anthony Barbier <anthony.barbier@arm.com> | 2017-07-03 17:39:37 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-09-17 14:15:39 +0100 |
| commit | ac69aa137e360340fe9f148f019d93af6c3d8336 (patch) | |
| tree | 88c2fb6ea8693c69b19d3b7b38fe26cd916303c8 /src/core/CL/cl_kernels/minmaxloc.cl | |
| parent | 05da6dd102c988081c7d5eccb227f559f740ceef (diff) | |
| download | ComputeLibrary-ac69aa137e360340fe9f148f019d93af6c3d8336.tar.gz | |
COMPMID-418 Add check and fix comments after preprocessor conditions
Change-Id: I1353fd652ee180e3931e58b4ce13d651a48c7e2c
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/79567
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Moritz Pflanzer <moritz.pflanzer@arm.com>
Diffstat (limited to 'src/core/CL/cl_kernels/minmaxloc.cl')
| -rw-r--r-- | src/core/CL/cl_kernels/minmaxloc.cl | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/core/CL/cl_kernels/minmaxloc.cl b/src/core/CL/cl_kernels/minmaxloc.cl index 799b1e8c3b..e628e9bd5b 100644 --- a/src/core/CL/cl_kernels/minmaxloc.cl +++ b/src/core/CL/cl_kernels/minmaxloc.cl @@ -26,11 +26,11 @@ #ifndef DATA_TYPE_MIN #define DATA_TYPE_MIN 0x0 -#endif +#endif /* DATA_TYPE_MIN */ #ifndef DATA_TYPE_MAX #define DATA_TYPE_MAX 0xFF -#endif +#endif /* DATA_TYPE_MAX */ __constant VEC_DATA_TYPE(DATA_TYPE, 16) type_min = (VEC_DATA_TYPE(DATA_TYPE, 16))(DATA_TYPE_MIN); __constant VEC_DATA_TYPE(DATA_TYPE, 16) type_max = (VEC_DATA_TYPE(DATA_TYPE, 16))(DATA_TYPE_MAX); @@ -82,7 +82,7 @@ __kernel void minmax( widx = CONVERT(((uint16)(width4 << 4) + idx16) < width, VEC_DATA_TYPE(DATA_TYPE, 16)); local_max = max(local_max, select(type_min, data, widx)); local_min = min(local_min, select(type_max, data, widx)); -#endif +#endif /* NON_MULTIPLE_OF_16 */ // Perform min/max reduction local_min.s01234567 = min(local_min.s01234567, local_min.s89ABCDEF); @@ -124,41 +124,41 @@ __kernel void minmaxloc( IMAGE_DECLARATION(src), __global int *min_max, __global uint *min_max_count -#if defined LOCATE_MIN +#ifdef LOCATE_MIN , __global Coordinates2D *min_loc, uint max_min_loc_count -#endif -#if defined LOCATE_MAX +#endif /* LOCATE_MIN */ +#ifdef LOCATE_MAX , __global Coordinates2D *max_loc, uint max_max_loc_count -#endif +#endif /* LOCATE_MAX */ ) { Image src = CONVERT_TO_IMAGE_STRUCT(src); DATA_TYPE value = *((__global DATA_TYPE *)src.ptr); -#if defined COUNT_MIN_MAX +#ifdef COUNT_MIN_MAX if(value == min_max[0]) { uint idx = atomic_inc(&min_max_count[0]); -#if defined LOCATE_MIN +#ifdef LOCATE_MIN if(idx < max_min_loc_count) { min_loc[idx].x = get_global_id(0); min_loc[idx].y = get_global_id(1); } -#endif +#endif /* LOCATE_MIN */ } if(value == min_max[1]) { uint idx = atomic_inc(&min_max_count[1]); -#if defined LOCATE_MAX +#ifdef LOCATE_MAX if(idx < max_max_loc_count) { max_loc[idx].x = get_global_id(0); max_loc[idx].y = get_global_id(1); } -#endif +#endif /* LOCATE_MAX */ } -#endif +#endif /* COUNT_MIN_MAX */ } |