From 51847d5dd9cad6bc81673642a01fd531def44311 Mon Sep 17 00:00:00 2001 From: Giorgio Arena Date: Tue, 19 Oct 2021 15:45:57 +0100 Subject: Implement CLDirectConv3DKernel - uint8/int8 Resolve COMPMID-4663 Signed-off-by: Giorgio Arena Change-Id: I5c3c1cffed5385c06b789543318f7f4d6096987e Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/6468 Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins Reviewed-by: Sheri Zhang --- tests/validation/reference/Conv3D.cpp | 110 ++++++++++++++++++++++++++++++---- tests/validation/reference/Conv3D.h | 4 +- 2 files changed, 99 insertions(+), 15 deletions(-) (limited to 'tests/validation/reference') diff --git a/tests/validation/reference/Conv3D.cpp b/tests/validation/reference/Conv3D.cpp index ad61105b36..706059d1cb 100644 --- a/tests/validation/reference/Conv3D.cpp +++ b/tests/validation/reference/Conv3D.cpp @@ -22,7 +22,11 @@ * SOFTWARE. */ #include "Conv3D.h" + #include "arm_compute/core/utils/misc/ShapeCalculator.h" +#include "arm_compute/core/utils/quantization/AsymmHelpers.h" +#include "support/Requires.h" +#include "tests/validation/reference/UtilsQuantizedAsymm.h" // Source/Destination Tensor shape indices (N D H W C) constexpr unsigned int batch_dim = 4u; @@ -52,11 +56,14 @@ inline bool is_valid_pixel(int i, int min, int max) { return (i >= min && i < max); } + // Evaluate the weights against an element in a given tensor. -template -T calculate_conv3d(const SimpleTensor &src, const SimpleTensor &weights, const Size3D &dilation, int batch, - int z_start, int y_start, int x_start, int ch_out) +template < typename T, typename TB, typename std::enable_if < validation::is_floating_point::value &&validation::is_floating_point::value, int >::type = 0 > +T calculate_conv3d(const SimpleTensor &src, const SimpleTensor &weights, const SimpleTensor &bias, const Size3D &dilation, int batch, + int z_start, int y_start, int x_start, int ch_out, UniformQuantizationInfo oq_info) { + ARM_COMPUTE_UNUSED(oq_info); + const unsigned int weights_width = weights.shape()[weights_width_dim]; const unsigned int weights_height = weights.shape()[weights_height_dim]; const unsigned int weights_depth = weights.shape()[weights_depth_dim]; @@ -101,12 +108,89 @@ T calculate_conv3d(const SimpleTensor &src, const SimpleTensor &weights, c } } } - return total; + + const TB *b_ptr = bias.data(); + TB bias_value = b_ptr[ch_out]; + + return total + bias_value; } + +template < typename T, typename TB, ARM_COMPUTE_REQUIRES_TA(std::is_same::value || std::is_same::value) > +T calculate_conv3d(const SimpleTensor &src, const SimpleTensor &weights, const SimpleTensor &bias, const Size3D &dilation, int batch, + int z_start, int y_start, int x_start, int ch_out, UniformQuantizationInfo oq_info) +{ + const unsigned int weights_width = weights.shape()[weights_width_dim]; + const unsigned int weights_height = weights.shape()[weights_height_dim]; + const unsigned int weights_depth = weights.shape()[weights_depth_dim]; + + const unsigned int src_channels = src.shape()[channel_dim]; + const unsigned int src_width = src.shape()[width_dim]; + const unsigned int src_height = src.shape()[height_dim]; + const unsigned int src_depth = src.shape()[depth_dim]; + + const UniformQuantizationInfo iq_info = src.quantization_info().uniform(); + const UniformQuantizationInfo wq_info = weights.quantization_info().uniform(); + + const int input_offset = -iq_info.offset; + const float input_scale = iq_info.scale; + int weights_offset = -wq_info.offset; + float weights_scale = wq_info.scale; + const int output_offset = oq_info.offset; + const float output_scale = oq_info.scale; + + int output_multiplier = 0; + int output_shift = 0; + const float multiplier = input_scale * weights_scale / output_scale; + arm_compute::quantization::calculate_quantized_multiplier(multiplier, &output_multiplier, &output_shift); + + int32_t total(0); + for(unsigned int weight_d = 0; weight_d < weights_depth; ++weight_d) + { + const int idx_z = z_start + dilation.depth * weight_d; + for(unsigned int weight_y = 0; weight_y < weights_height; ++weight_y) + { + const int idx_y = y_start + dilation.height * weight_y; + for(unsigned int weight_x = 0; weight_x < weights_width; ++weight_x) + { + const int idx_x = x_start + dilation.width * weight_x; + + //Check if the point is within padding + const bool is_x_valid = is_valid_pixel(idx_x, 0, src_width); + const bool is_y_valid = is_valid_pixel(idx_y, 0, src_height); + const bool is_z_valid = is_valid_pixel(idx_z, 0, src_depth); + const bool is_invalid_pixel = !(is_x_valid && is_y_valid && is_z_valid); + if(is_invalid_pixel) + { + continue; + } + + for(unsigned int ch_in = 0; ch_in < src_channels; ++ch_in) + { + const T *in_ptr = src.data(); + const T *w_ptr = weights.data(); + + const int in_offset = coord2index(src.shape(), Coordinates{ ch_in, idx_x, idx_y, idx_z, batch }); + const int weight_offset = coord2index(weights.shape(), Coordinates{ ch_out, ch_in, weight_x, weight_y, weight_d }); + T input_value = in_ptr[in_offset]; + T weight_value = w_ptr[weight_offset]; + total += ((input_value + input_offset) * (weight_value + weights_offset)); + } + } + } + } + + const TB *b_ptr = bias.data(); + TB bias_value = b_ptr[ch_out]; + + total += bias_value; + + return validation::quantize_down_scale_by_fixedpoint(total, output_multiplier, output_shift, output_offset, + std::numeric_limits::lowest(), std::numeric_limits::max()); } +} // namespace -template -SimpleTensor conv3d(const SimpleTensor &src, const SimpleTensor &weights, const SimpleTensor &bias, SimpleTensor &dst, const Conv3dInfo &conv3d_info) +template +SimpleTensor conv3d(const SimpleTensor &src, const SimpleTensor &weights, const SimpleTensor &bias, SimpleTensor &dst, const Conv3dInfo &conv3d_info) { // Compute reference const unsigned int batch_size = src.shape()[batch_dim]; @@ -150,14 +234,10 @@ SimpleTensor conv3d(const SimpleTensor &src, const SimpleTensor &weight const int x_start = (x_out * stride_x) - pad_left; for(unsigned int ch_out = 0; ch_out < dst_channels; ++ch_out) { - T weighted_value = calculate_conv3d(src, weights, conv3d_info.dilation, batch, z_start, - y_start, x_start, ch_out); - T *out_ptr = dst.data(); - const T *b_ptr = bias.data(); - T bias_value(0); + T *out_ptr = dst.data(); + const int out_offset = coord2index(dst.shape(), Coordinates{ ch_out, x_out, y_out, z_out, batch }); - bias_value = b_ptr[ch_out]; - out_ptr[out_offset] = weighted_value + bias_value; + out_ptr[out_offset] = calculate_conv3d(src, weights, bias, conv3d_info.dilation, batch, z_start, y_start, x_start, ch_out, dst.quantization_info().uniform()); } } } @@ -170,6 +250,10 @@ template SimpleTensor conv3d(const SimpleTensor &src, const Simple const Conv3dInfo &conv3d_info); template SimpleTensor conv3d(const SimpleTensor &src, const SimpleTensor &weights, const SimpleTensor &bias, SimpleTensor &dst, const Conv3dInfo &conv3d_info); +template SimpleTensor conv3d(const SimpleTensor &src, const SimpleTensor &weights, const SimpleTensor &bias, SimpleTensor &dst, + const Conv3dInfo &conv3d_info); +template SimpleTensor conv3d(const SimpleTensor &src, const SimpleTensor &weights, const SimpleTensor &bias, SimpleTensor &dst, + const Conv3dInfo &conv3d_info); } // namespace reference } // namespace validation } // namespace test diff --git a/tests/validation/reference/Conv3D.h b/tests/validation/reference/Conv3D.h index ade8a2c242..e3674f4bfb 100644 --- a/tests/validation/reference/Conv3D.h +++ b/tests/validation/reference/Conv3D.h @@ -37,8 +37,8 @@ namespace validation { namespace reference { -template -SimpleTensor conv3d(const SimpleTensor &src, const SimpleTensor &weights, const SimpleTensor &bias, SimpleTensor &dst, +template +SimpleTensor conv3d(const SimpleTensor &src, const SimpleTensor &weights, const SimpleTensor &bias, SimpleTensor &dst, const Conv3dInfo &conv3d_info); } // namespace reference } // namespace validation -- cgit v1.2.1