From patchwork Fri Aug 21 08:52:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mingyu Yin X-Patchwork-Id: 21789 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3DF1744A432 for ; Fri, 21 Aug 2020 11:50:03 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1EA0A68B784; Fri, 21 Aug 2020 11:50:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C720568B781 for ; Fri, 21 Aug 2020 11:49:56 +0300 (EEST) IronPort-SDR: 07eIx8NLA1qU92EhIIKw+qWYXXIug9NeYUnBWsCJXJy3KdinkSaJOf3+A+fcJUrsl+xx6lMoqE BbUvKZGXMOXg== X-IronPort-AV: E=McAfee;i="6000,8403,9719"; a="135026322" X-IronPort-AV: E=Sophos;i="5.76,335,1592895600"; d="scan'208";a="135026322" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Aug 2020 01:49:50 -0700 IronPort-SDR: ItikAJUyyrAc+Fg7T1Eql1tXTWagbC5L+GhI3cqDnNVXyR7+rMwp5r57xEBx8C8+Mr2b/ZpIxn eVncq2gfCQ+w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,335,1592895600"; d="scan'208";a="329974517" Received: from cyj-pro.sh.intel.com ([10.239.98.50]) by fmsmga002.fm.intel.com with ESMTP; 21 Aug 2020 01:49:49 -0700 From: Mingyu Yin To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Aug 2020 16:52:11 +0800 Message-Id: <20200821085211.31210-2-mingyu.yin@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200821085211.31210-1-mingyu.yin@intel.com> References: <20200821085211.31210-1-mingyu.yin@intel.com> Subject: [FFmpeg-devel] [PATCH V3 2/2] dnn_backend_native_layer_mathbinary: change to function pointer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Mingyu Yin --- .../dnn/dnn_backend_native_layer_mathbinary.c | 166 +++++++++--------- 1 file changed, 80 insertions(+), 86 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c index 6876aaf2c6..6738acc6ce 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c +++ b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c @@ -27,6 +27,79 @@ #include "libavutil/avassert.h" #include "dnn_backend_native_layer_mathbinary.h" +typedef float (*FunType)(const float src, float dst); +FunType pfun; + +static float sub(float src, float dst) +{ + return src - dst; +} +static float add(float src, float dst) +{ + return src + dst; +} +static float mul(float src, float dst) +{ + return src * dst; +} +static float realdiv(float src, float dst) +{ + return src / dst; +} +static float minimum(float src, float dst) +{ + return FFMIN(src, dst); +} +static float floormod(float src, float dst) +{ + return (float)((int)(src) % (int)(dst)); +} + +static void math_binary_commutative(FunType pfun, const DnnLayerMathBinaryParams *params, const DnnOperand *input, DnnOperand *output, DnnOperand *operands, const int32_t *input_operand_indexes) +{ + int dims_count; + const float *src; + float *dst; + dims_count = calculate_operand_dims_count(output); + src = input->data; + dst = output->data; + if (params->input0_broadcast || params->input1_broadcast) { + for (int i = 0; i < dims_count; ++i) { + dst[i] = pfun(params->v, src[i]); + } + } else { + const DnnOperand *input1 = &operands[input_operand_indexes[1]]; + const float *src1 = input1->data; + for (int i = 0; i < dims_count; ++i) { + dst[i] = pfun(src[i], src1[i]); + } + } +} +static void math_binary_not_commutative(FunType pfun, const DnnLayerMathBinaryParams *params, const DnnOperand *input, DnnOperand *output, DnnOperand *operands, const int32_t *input_operand_indexes) +{ + int dims_count; + const float *src; + float *dst; + dims_count = calculate_operand_dims_count(output); + src = input->data; + dst = output->data; + if (params->input0_broadcast) { + for (int i = 0; i < dims_count; ++i) { + dst[i] = pfun(params->v, src[i]); + } + } else if (params->input1_broadcast) { + for (int i = 0; i < dims_count; ++i) { + dst[i] = pfun(src[i], params->v); + } + } else { + const DnnOperand *input1 = &operands[input_operand_indexes[1]]; + const float *src1 = input1->data; + for (int i = 0; i < dims_count; ++i) { + dst[i] = pfun(src[i], src1[i]); + } + } +} + int dnn_load_layer_math_binary(Layer *layer, AVIOContext *model_file_context, int file_size, int operands_num) { DnnLayerMathBinaryParams *params; @@ -82,9 +155,6 @@ int dnn_execute_layer_math_binary(DnnOperand *operands, const int32_t *input_ope const DnnOperand *input = &operands[input_operand_indexes[0]]; DnnOperand *output = &operands[output_operand_index]; const DnnLayerMathBinaryParams *params = (const DnnLayerMathBinaryParams *)parameters; - int dims_count; - const float *src; - float *dst; for (int i = 0; i < 4; ++i) output->dims[i] = input->dims[i]; @@ -97,100 +167,24 @@ int dnn_execute_layer_math_binary(DnnOperand *operands, const int32_t *input_ope if (!output->data) return DNN_ERROR; - dims_count = calculate_operand_dims_count(output); - src = input->data; - dst = output->data; - - switch (params->bin_op) { + switch (params->bin_op){ case DMBO_SUB: - if (params->input0_broadcast) { - for (int i = 0; i < dims_count; ++i) { - dst[i] = params->v - src[i]; - } - } else if (params->input1_broadcast) { - for (int i = 0; i < dims_count; ++i) { - dst[i] = src[i] - params->v; - } - } else { - const DnnOperand *input1 = &operands[input_operand_indexes[1]]; - const float *src1 = input1->data; - for (int i = 0; i < dims_count; ++i) { - dst[i] = src[i] - src1[i]; - } - } + math_binary_not_commutative(sub, params, input, output, operands, input_operand_indexes); return 0; case DMBO_ADD: - if (params->input0_broadcast || params->input1_broadcast) { - for (int i = 0; i < dims_count; ++i) { - dst[i] = params->v + src[i]; - } - } else { - const DnnOperand *input1 = &operands[input_operand_indexes[1]]; - const float *src1 = input1->data; - for (int i = 0; i < dims_count; ++i) { - dst[i] = src[i] + src1[i]; - } - } + math_binary_commutative(add, params, input, output, operands, input_operand_indexes); return 0; case DMBO_MUL: - if (params->input0_broadcast || params->input1_broadcast) { - for (int i = 0; i < dims_count; ++i) { - dst[i] = params->v * src[i]; - } - } else { - const DnnOperand *input1 = &operands[input_operand_indexes[1]]; - const float *src1 = input1->data; - for (int i = 0; i < dims_count; ++i) { - dst[i] = src[i] * src1[i]; - } - } + math_binary_commutative(mul, params, input, output, operands, input_operand_indexes); return 0; case DMBO_REALDIV: - if (params->input0_broadcast) { - for (int i = 0; i < dims_count; ++i) { - dst[i] = params->v / src[i]; - } - } else if (params->input1_broadcast) { - for (int i = 0; i < dims_count; ++i) { - dst[i] = src[i] / params->v; - } - } else { - const DnnOperand *input1 = &operands[input_operand_indexes[1]]; - const float *src1 = input1->data; - for (int i = 0; i < dims_count; ++i) { - dst[i] = src[i] / src1[i]; - } - } + math_binary_not_commutative(realdiv, params, input, output, operands, input_operand_indexes); return 0; case DMBO_MINIMUM: - if (params->input0_broadcast || params->input1_broadcast) { - for (int i = 0; i < dims_count; ++i) { - dst[i] = FFMIN(params->v, src[i]); - } - } else { - const DnnOperand *input1 = &operands[input_operand_indexes[1]]; - const float *src1 = input1->data; - for (int i = 0; i < dims_count; ++i) { - dst[i] = FFMIN(src[i], src1[i]); - } - } + math_binary_commutative(minimum, params, input, output, operands, input_operand_indexes); return 0; case DMBO_FLOORMOD: - if (params->input0_broadcast) { - for (int i = 0; i < dims_count; ++i) { - dst[i] = (int)(params->v) % (int)(src[i]); - } - } else if (params->input1_broadcast) { - for (int i = 0; i < dims_count; ++i) { - dst[i] = (int)(src[i]) % (int)(params->v); - } - } else { - const DnnOperand *input1 = &operands[input_operand_indexes[1]]; - const float *src1 = input1->data; - for (int i = 0; i < dims_count; ++i) { - dst[i] = (int)(src[i]) % (int)(src1[i]); - } - } + math_binary_not_commutative(floormod, params, input, output, operands, input_operand_indexes); return 0; default: return -1;