From 36dff9f81e3a95aea19fcc7246a4896930a14bc6 Mon Sep 17 00:00:00 2001 From: Frederick Liardet Date: Thu, 22 Apr 2021 21:13:21 +0100 Subject: Add NHWC support to CLRemap Add NHWC support to CLRemap, also add relevant tests. Partially resolves COMPMID-4335. Change-Id: I119bea99be497fb85d5cd83a10f8d4e8e1f97f17 Signed-off-by: Freddie Liardet Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5773 Reviewed-by: Michele Di Giorgio Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins --- src/core/CL/cl_kernels/remap.cl | 162 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 158 insertions(+), 4 deletions(-) (limited to 'src/core/CL/cl_kernels/remap.cl') diff --git a/src/core/CL/cl_kernels/remap.cl b/src/core/CL/cl_kernels/remap.cl index 0f013c5127..8ea4e84e96 100644 --- a/src/core/CL/cl_kernels/remap.cl +++ b/src/core/CL/cl_kernels/remap.cl @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Arm Limited. + * Copyright (c) 2017, 2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -56,7 +56,7 @@ * @param[in] width Width of the input image * @param[in] height Height of the input image */ -__kernel void remap_nearest_neighbour( +__kernel void remap_nearest_neighbour_nchw( IMAGE_DECLARATION(in), IMAGE_DECLARATION(out), IMAGE_DECLARATION(mapx), @@ -73,7 +73,6 @@ __kernel void remap_nearest_neighbour( float4 mapy_coords = vload4(0, (__global float *)mapy.ptr); float8 map_coords = (float8)(mapx_coords.s0, mapy_coords.s0, mapx_coords.s1, mapy_coords.s1, mapx_coords.s2, mapy_coords.s2, mapx_coords.s3, mapy_coords.s3); - map_coords += (float8)(0.5f); vstore4(read_texels4(&in, convert_int8(clamp_to_border(map_coords, width, height))), 0, out.ptr); } @@ -110,7 +109,7 @@ __kernel void remap_nearest_neighbour( * @param[in] width Width of the input image * @param[in] height Height of the input image */ -__kernel void remap_bilinear( +__kernel void remap_bilinear_nchw( IMAGE_DECLARATION(in), IMAGE_DECLARATION(out), IMAGE_DECLARATION(mapx), @@ -130,3 +129,158 @@ __kernel void remap_bilinear( vstore4(bilinear_interpolate(&in, clamp_to_border(map_coords, width, height), width, height), 0, out.ptr); } + +/** Performs a remapping of an input image to an output given two remapping image using nearest neighbor as interpolation. + * Also applies constant border value, "border_val", if "CONSTANT_BORDER" is set. + * + * This kernel performs remapping with this method of pixel coordinate translation: + * out(x,y) = in(mapx(x,y), mapy(x,y)); + * + * @param[in] in_ptr Pointer to the source image. Supported data types: U8. + * @param[in] in_stride_x Stride of the source image in X dimension (in bytes) + * @param[in] in_step_x in_stride_x * number of elements along X processed per work item (in bytes) + * @param[in] in_stride_y Stride of the source image in Y dimension (in bytes) + * @param[in] in_step_y in_stride_y * number of elements along Y processed per work item (in bytes) + * @param[in] in_offset_first_element_in_bytes Offset of the first element in the source image + * @param[out] out_ptr Pointer to the destination image. Supported data types: U8. + * @param[in] out_stride_x Stride of the destination image in X dimension (in bytes) + * @param[in] out_step_x out_stride_x * number of elements along X processed per work item (in bytes) + * @param[in] out_stride_y Stride of the destination image in Y dimension (in bytes) + * @param[in] out_step_y out_stride_y * number of elements along Y processed per work item (in bytes) + * @param[in] out_offset_first_element_in_bytes Offset of the first element in the destination image + * @param[in] mapx_ptr Pointer to the x remapping image. Supported data types: F32. + * @param[in] mapx_stride_x Stride of the remapping image in X dimension (in bytes) + * @param[in] mapx_step_x mapx_stride_x * number of elements along X processed per work item (in bytes) + * @param[in] mapx_stride_y Stride of the remapping image in Y dimension (in bytes) + * @param[in] mapx_step_y mapy_stride_y * number of elements along Y processed per work item (in bytes) + * @param[in] mapx_offset_first_element_in_bytes Offset of the first element in the remapping image + * @param[in] mapy_ptr Pointer to the x remapping image. Supported data types: F32. + * @param[in] mapy_stride_x Stride of the remapping image in X dimension (in bytes) + * @param[in] mapy_step_x mapy_stride_x * number of elements along X processed per work item (in bytes) + * @param[in] mapy_stride_y Stride of the remapping image in Y dimension (in bytes) + * @param[in] mapy_step_y mapy_stride_y * number of elements along Y processed per work item (in bytes) + * @param[in] mapy_offset_first_element_in_bytes Offset of the first element in the remapping image + * @param[in] width Width of the input image + * @param[in] height Height of the input image + */ + +#if defined(DEPTH_OUT) + +__kernel void remap_nearest_neighbour_nhwc( + TENSOR4D_DECLARATION(in), + TENSOR4D_DECLARATION(out), + TENSOR4D_DECLARATION(mapx), + TENSOR4D_DECLARATION(mapy), + const float width, + const float height +#ifdef CONSTANT_BORDER + , + const DATA_TYPE border_val +#endif // CONSTANT_BORDER +) +{ + Tensor4D in = CONVERT_TO_TENSOR4D_STRUCT_NO_STEP(in, 0); + Tensor4D out = CONVERT_TO_TENSOR4D_STRUCT(out, DEPTH_OUT); + Tensor4D mapx = CONVERT_TO_TENSOR4D_STRUCT(mapx, DEPTH_OUT); + Tensor4D mapy = CONVERT_TO_TENSOR4D_STRUCT(mapy, DEPTH_OUT); + + float mapx_coord = (float) * (__global float *)mapx.ptr; + float mapy_coord = (float) * (__global float *)mapy.ptr; + +#ifdef CONSTANT_BORDER + if(mapx_coord < 0 || mapx_coord > width - 1 || mapy_coord < 0 || mapy_coord > height - 1) + { + *((__global DATA_TYPE *)out.ptr) = border_val; + return; + } +#else // CONSTANT_BORDER + mapx_coord = clamp(mapx_coord, 0.0f, width - 1); + mapy_coord = clamp(mapy_coord, 0.0f, height - 1); +#endif // CONSTANT_BORDER + *((__global DATA_TYPE *)out.ptr) = *((__global DATA_TYPE *)tensor4D_offset(&in, get_global_id(0), convert_int(mapx_coord), convert_int(mapy_coord), (get_global_id(2) / DEPTH_OUT))); +} + +/** Performs a remapping of an input image to an output given two remapping image using bilinear as interpolation. + * Also applies constant border value, "border_val", if "CONSTANT_BORDER" is set. + * + * This kernel performs remapping with this method of pixel coordinate translation: + * out(x,y) = in(mapx(x,y), mapy(x,y)); + * + * @param[in] in_ptr Pointer to the source image. Supported data types: U8. + * @param[in] in_stride_x Stride of the source image in X dimension (in bytes) + * @param[in] in_step_x in_stride_x * number of elements along X processed per work item (in bytes) + * @param[in] in_stride_y Stride of the source image in Y dimension (in bytes) + * @param[in] in_step_y in_stride_y * number of elements along Y processed per work item (in bytes) + * @param[in] in_offset_first_element_in_bytes Offset of the first element in the source image + * @param[out] out_ptr Pointer to the destination image. Supported data types: U8. + * @param[in] out_stride_x Stride of the destination image in X dimension (in bytes) + * @param[in] out_step_x out_stride_x * number of elements along X processed per work item (in bytes) + * @param[in] out_stride_y Stride of the destination image in Y dimension (in bytes) + * @param[in] out_step_y out_stride_y * number of elements along Y processed per work item (in bytes) + * @param[in] out_offset_first_element_in_bytes Offset of the first element in the destination image + * @param[in] mapx_ptr Pointer to the x remapping image. Supported data types: F32. + * @param[in] mapx_stride_x Stride of the remapping image in X dimension (in bytes) + * @param[in] mapx_step_x mapx_stride_x * number of elements along X processed per work item (in bytes) + * @param[in] mapx_stride_y Stride of the remapping image in Y dimension (in bytes) + * @param[in] mapx_step_y mapy_stride_y * number of elements along Y processed per work item (in bytes) + * @param[in] mapx_offset_first_element_in_bytes Offset of the first element in the remapping image + * @param[in] mapy_ptr Pointer to the x remapping image. Supported data types: F32. + * @param[in] mapy_stride_x Stride of the remapping image in X dimension (in bytes) + * @param[in] mapy_step_x mapy_stride_x * number of elements along X processed per work item (in bytes) + * @param[in] mapy_stride_y Stride of the remapping image in Y dimension (in bytes) + * @param[in] mapy_step_y mapy_stride_y * number of elements along Y processed per work item (in bytes) + * @param[in] mapy_offset_first_element_in_bytes Offset of the first element in the remapping image + * @param[in] width Width of the input image + * @param[in] height Height of the input image + */ +__kernel void remap_bilinear_nhwc( + TENSOR4D_DECLARATION(in), + TENSOR4D_DECLARATION(out), + TENSOR4D_DECLARATION(mapx), + TENSOR4D_DECLARATION(mapy), + const float width, + const float height +#ifdef CONSTANT_BORDER + , + const DATA_TYPE border_val +#endif // CONSTANT_BORDER +) +{ + Tensor4D in = CONVERT_TO_TENSOR4D_STRUCT_NO_STEP(in, 0); + Tensor4D out = CONVERT_TO_TENSOR4D_STRUCT(out, DEPTH_OUT); + Tensor4D mapx = CONVERT_TO_TENSOR4D_STRUCT(mapx, DEPTH_OUT); + Tensor4D mapy = CONVERT_TO_TENSOR4D_STRUCT(mapy, DEPTH_OUT); + + float mapx_coord = (float) * (__global float *)mapx.ptr; + float mapy_coord = (float) * (__global float *)mapy.ptr; + +#ifdef CONSTANT_BORDER + if(mapx_coord < 0 || mapx_coord > width - 1 || mapy_coord < 0 || mapy_coord > height - 1) + { + *((__global DATA_TYPE *)out.ptr) = border_val; + return; + } +#endif // CONSTANT_BORDER + + const float new_xf = floor(mapx_coord); + const float new_yf = floor(mapy_coord); + const float clamped_x = clamp(new_xf, 0.0f, width - 1); + const float clamped_x1 = clamp(new_xf + 1, 0.0f, width - 1); + const float clamped_y = clamp(new_yf, 0.0f, height - 1); + const float clamped_y1 = clamp(new_yf + 1, 0.0f, height - 1); + + float4 ins = (float4)(*((__global DATA_TYPE *)tensor4D_offset(&in, get_global_id(0), convert_int(clamped_x), convert_int(clamped_y), (get_global_id(2) / DEPTH_OUT))), + *((__global DATA_TYPE *)tensor4D_offset(&in, get_global_id(0), convert_int(clamped_x1), convert_int(clamped_y), (get_global_id(2) / DEPTH_OUT))), + *((__global DATA_TYPE *)tensor4D_offset(&in, get_global_id(0), convert_int(clamped_x), convert_int(clamped_y1), (get_global_id(2) / DEPTH_OUT))), + *((__global DATA_TYPE *)tensor4D_offset(&in, get_global_id(0), convert_int(clamped_x1), convert_int(clamped_y1), (get_global_id(2) / DEPTH_OUT)))); + + const float a = mapx_coord - new_xf; + const float b = 1.f - a; + const float a1 = mapy_coord - new_yf; + const float b1 = 1.f - a1; + const float fr = ((ins.s0 * b * b1) + (ins.s1 * a * b1) + (ins.s2 * b * a1) + (ins.s3 * a * a1)); + + *((__global DATA_TYPE *)out.ptr) = CONVERT(fr, DATA_TYPE); +} + +#endif // DEPTH_OUT -- cgit v1.2.1