From patchwork Mon Nov 22 08:08:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 31522 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp6599278iob; Mon, 22 Nov 2021 00:09:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJxXDTGGjMVGVBBBPNf/LzfV8KNW4GducGhA5ugwK6OzJFED3VXxUfuxwPU20IzQU878lBfD X-Received: by 2002:a17:906:64a:: with SMTP id t10mr39263903ejb.5.1637568547346; Mon, 22 Nov 2021 00:09:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637568547; cv=none; d=google.com; s=arc-20160816; b=wh5acL7vG9M51kZmBnsOTH0ABpg215MJ3YgpSBoZaM2EvFtDA2RZ+wSkglRZD+68bk 1uc6ehsJEdTZxiZpLr39a+LnPpn5PtHUQnMeB5WviMvjvJFlpRBma4YrF+p4zqthX4Wt Y649r66L5JFW3pSCZ2tIdNaDV6yPjR+U4Ipm+c2AJ+bG0n67gQLd8r8fDi39WdKuMZN8 +8TOWVJnkc5pS0epY5VKtARw5xt3PYJ2gi8aNK4OGh4sC4O9Cf4jqq9y+AamyytDdw/5 Q9NgSVq+kzN/pXNaI5jnyYFqs1cmy8eszkjS8jnEhOc40vavQNyy8UxB8BHxdBPo5y87 WdQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=6NuzBk2cT0tRcaZpIVZV0nfwRodDo439r9B/Ta/Z9uQ=; b=QLfiRzp9EHpbSmZoNVWn1xPQvg/ANkzx6Q43eWeIaECMggMymdHiL2bPBgVWvdw6s1 RSKTgzH6FfSKXn7eWc7LRUpQgzqp9ecBAhINMoFcv5ouDBCy6Ajr1LDKO0oXAT7AMgEJ ViDkh8ZF+q5YxAwY6uDrg55xAOeMLeqXhpx6t25JHcMpzLw5mYBW0gPC7tOm1/QC67HH XlDsyCoZA9FPv0BFK82ce4UMd3E+QC7We1Dx8uoYnxZe7V1qp1fH0iMJWRTjA8OBQbYV 9VOa4Owx5/fja65r75jTpgbPW3CeL5XOJfrlkhn1ssfskyNhOU1z+WTXaSWoj5n8AQE3 mn8A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l12si24412035edb.559.2021.11.22.00.09.06; Mon, 22 Nov 2021 00:09:07 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B98EC68AB71; Mon, 22 Nov 2021 10:09:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D8D168A701 for ; Mon, 22 Nov 2021 10:08:56 +0200 (EET) X-IronPort-AV: E=McAfee;i="6200,9189,10175"; a="221964800" X-IronPort-AV: E=Sophos;i="5.87,254,1631602800"; d="scan'208";a="221964800" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Nov 2021 00:08:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,254,1631602800"; d="scan'208";a="496769568" Received: from otc-skl-e5-server.sh.intel.com ([10.239.43.106]) by orsmga007.jf.intel.com with ESMTP; 22 Nov 2021 00:08:54 -0800 From: Wu Jianhua To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Nov 2021 16:08:46 +0800 Message-Id: <20211122080848.39566-1-jianhua.wu@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v3 1/3] avfilter/x86/vf_exposure: add x86 SIMD optimization X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Wu Jianhua MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xbtIAh74zlCF Performance data(Less is better): exposure_c: 857394 exposure_sse: 327589 Signed-off-by: Wu Jianhua --- libavfilter/exposure.h | 36 +++++++++++++++++++ libavfilter/vf_exposure.c | 36 +++++++++---------- libavfilter/x86/Makefile | 2 ++ libavfilter/x86/vf_exposure.asm | 55 ++++++++++++++++++++++++++++++ libavfilter/x86/vf_exposure_init.c | 36 +++++++++++++++++++ 5 files changed, 147 insertions(+), 18 deletions(-) create mode 100644 libavfilter/exposure.h create mode 100644 libavfilter/x86/vf_exposure.asm create mode 100644 libavfilter/x86/vf_exposure_init.c diff --git a/libavfilter/exposure.h b/libavfilter/exposure.h new file mode 100644 index 0000000000..e76a517826 --- /dev/null +++ b/libavfilter/exposure.h @@ -0,0 +1,36 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVFILTER_EXPOSURE_H +#define AVFILTER_EXPOSURE_H +#include "avfilter.h" + +typedef struct ExposureContext { + const AVClass *class; + + float exposure; + float black; + float scale; + + void (*exposure_func)(float *ptr, int length, float black, float scale); +} ExposureContext; + +void ff_exposure_init(ExposureContext *s); +void ff_exposure_init_x86(ExposureContext *s); + +#endif diff --git a/libavfilter/vf_exposure.c b/libavfilter/vf_exposure.c index 108fba7930..045ae710d3 100644 --- a/libavfilter/vf_exposure.c +++ b/libavfilter/vf_exposure.c @@ -26,23 +26,20 @@ #include "formats.h" #include "internal.h" #include "video.h" +#include "exposure.h" -typedef struct ExposureContext { - const AVClass *class; - - float exposure; - float black; +static void exposure_c(float *ptr, int length, float black, float scale) +{ + int i; - float scale; - int (*do_slice)(AVFilterContext *s, void *arg, - int jobnr, int nb_jobs); -} ExposureContext; + for (i = 0; i < length; i++) + ptr[i] = (ptr[i] - black) * scale; +} static int exposure_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { ExposureContext *s = ctx->priv; AVFrame *frame = arg; - const int width = frame->width; const int height = frame->height; const int slice_start = (height * jobnr) / nb_jobs; const int slice_end = (height * (jobnr + 1)) / nb_jobs; @@ -52,24 +49,27 @@ static int exposure_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_job for (int p = 0; p < 3; p++) { const int linesize = frame->linesize[p] / 4; float *ptr = (float *)frame->data[p] + slice_start * linesize; - for (int y = slice_start; y < slice_end; y++) { - for (int x = 0; x < width; x++) - ptr[x] = (ptr[x] - black) * scale; - - ptr += linesize; - } + s->exposure_func(ptr, linesize * (slice_end - slice_start), black, scale); } return 0; } +void ff_exposure_init(ExposureContext *s) +{ + s->exposure_func = exposure_c; + + if (ARCH_X86) + ff_exposure_init_x86(s); +} + static int filter_frame(AVFilterLink *inlink, AVFrame *frame) { AVFilterContext *ctx = inlink->dst; ExposureContext *s = ctx->priv; s->scale = 1.f / (exp2f(-s->exposure) - s->black); - ff_filter_execute(ctx, s->do_slice, frame, NULL, + ff_filter_execute(ctx, exposure_slice, frame, NULL, FFMIN(frame->height, ff_filter_get_nb_threads(ctx))); return ff_filter_frame(ctx->outputs[0], frame); @@ -80,7 +80,7 @@ static av_cold int config_input(AVFilterLink *inlink) AVFilterContext *ctx = inlink->dst; ExposureContext *s = ctx->priv; - s->do_slice = exposure_slice; + ff_exposure_init(s); return 0; } diff --git a/libavfilter/x86/Makefile b/libavfilter/x86/Makefile index e87481bd7a..830a1e94cb 100644 --- a/libavfilter/x86/Makefile +++ b/libavfilter/x86/Makefile @@ -8,6 +8,7 @@ OBJS-$(CONFIG_BWDIF_FILTER) += x86/vf_bwdif_init.o OBJS-$(CONFIG_COLORSPACE_FILTER) += x86/colorspacedsp_init.o OBJS-$(CONFIG_CONVOLUTION_FILTER) += x86/vf_convolution_init.o OBJS-$(CONFIG_EQ_FILTER) += x86/vf_eq_init.o +OBJS-$(CONFIG_EXPOSURE_FILTER) += x86/vf_exposure_init.o OBJS-$(CONFIG_FSPP_FILTER) += x86/vf_fspp_init.o OBJS-$(CONFIG_GBLUR_FILTER) += x86/vf_gblur_init.o OBJS-$(CONFIG_GRADFUN_FILTER) += x86/vf_gradfun_init.o @@ -50,6 +51,7 @@ X86ASM-OBJS-$(CONFIG_BWDIF_FILTER) += x86/vf_bwdif.o X86ASM-OBJS-$(CONFIG_COLORSPACE_FILTER) += x86/colorspacedsp.o X86ASM-OBJS-$(CONFIG_CONVOLUTION_FILTER) += x86/vf_convolution.o X86ASM-OBJS-$(CONFIG_EQ_FILTER) += x86/vf_eq.o +X86ASM-OBJS-$(CONFIG_EXPOSURE_FILTER) += x86/vf_exposure.o X86ASM-OBJS-$(CONFIG_FRAMERATE_FILTER) += x86/vf_framerate.o X86ASM-OBJS-$(CONFIG_FSPP_FILTER) += x86/vf_fspp.o X86ASM-OBJS-$(CONFIG_GBLUR_FILTER) += x86/vf_gblur.o diff --git a/libavfilter/x86/vf_exposure.asm b/libavfilter/x86/vf_exposure.asm new file mode 100644 index 0000000000..3351c6fb3b --- /dev/null +++ b/libavfilter/x86/vf_exposure.asm @@ -0,0 +1,55 @@ +;***************************************************************************** +;* x86-optimized functions for exposure filter +;* +;* This file is part of FFmpeg. +;* +;* FFmpeg is free software; you can redistribute it and/or +;* modify it under the terms of the GNU Lesser General Public +;* License as published by the Free Software Foundation; either +;* version 2.1 of the License, or (at your option) any later version. +;* +;* FFmpeg is distributed in the hope that it will be useful, +;* but WITHOUT ANY WARRANTY; without even the implied warranty of +;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;* Lesser General Public License for more details. +;* +;* You should have received a copy of the GNU Lesser General Public +;* License along with FFmpeg; if not, write to the Free Software +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +;****************************************************************************** + +%include "libavutil/x86/x86util.asm" + +SECTION .text + +;******************************************************************************* +; void ff_exposure(float *ptr, int length, float black, float scale); +;******************************************************************************* +%macro EXPOSURE 0 +cglobal exposure, 2, 2, 4, ptr, length, black, scale + movsxdifnidn lengthq, lengthd +%if WIN64 + VBROADCASTSS m0, xmm2 + VBROADCASTSS m1, xmm3 +%else + VBROADCASTSS m0, xmm0 + VBROADCASTSS m1, xmm1 +%endif + +.loop: + movu m2, [ptrq] + subps m2, m2, m0 + mulps m2, m2, m1 + movu [ptrq], m2 + add ptrq, mmsize + sub lengthq, mmsize/4 + + jg .loop + + RET +%endmacro + +%if ARCH_X86_64 +INIT_XMM sse +EXPOSURE +%endif diff --git a/libavfilter/x86/vf_exposure_init.c b/libavfilter/x86/vf_exposure_init.c new file mode 100644 index 0000000000..de1b360f6c --- /dev/null +++ b/libavfilter/x86/vf_exposure_init.c @@ -0,0 +1,36 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" + +#include "libavutil/attributes.h" +#include "libavutil/cpu.h" +#include "libavutil/x86/cpu.h" +#include "libavfilter/exposure.h" + +void ff_exposure_sse(float *ptr, int length, float black, float scale); + +av_cold void ff_exposure_init_x86(ExposureContext *s) +{ + int cpu_flags = av_get_cpu_flags(); + +#if ARCH_X86_64 + if (EXTERNAL_SSE(cpu_flags)) + s->exposure_func = ff_exposure_sse; +#endif +} From patchwork Mon Nov 22 08:08:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 31524 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp6599403iob; Mon, 22 Nov 2021 00:09:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJyK/8/3Rukv+8HF0COWMY549RA2P11ZcwU2npB3G8YJ1zSi4nFvBkvQ0gRyTzyuC61kDATZ X-Received: by 2002:a05:6402:11c9:: with SMTP id j9mr64691290edw.346.1637568557048; Mon, 22 Nov 2021 00:09:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637568557; cv=none; d=google.com; s=arc-20160816; b=rDAE8KKZYlpNEpBmU+kQG9CrhA4TNSdSla+ARubtseg6GSCXnEaoosPic6uN5vLuZj Rlwk24q19F2gUXFxWuNhZMiWzotaSiv0tmAPWWKdT9SagFXRwgPDruIKyKB9uYYNDc9Y JKlTN9FOX8N8B6a05tYjfr8uqKyiPAV6JWqL6+naqmc15s1jzPTvFzO9mKafxXyb9gI5 1+FQVyCgjq+7Gb0c2OCLSIu05aopKlyNdjJJLBWnDWMfq7XXTrxi110+XZtN8Uu2EOY1 WUY3XdElS9Q0JNNGJsV9pyOmrFMH0r1oIjcpprORcJusMwkCz5kGbmlh6K35Bra9yJvT yxeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=PU8eby6Oh1LFnteecsCs+C6XT1/SOR4+6nOXN/4BM5k=; b=Mq/8WZWHmgAWvVh1oXZ93v9XaJtQXPpBXJ8rGH5BAKeGiyDuo2MM1Za6caUB91WD5K jU9Yu8/liV9gtpJBr8nFirsBBMrcws/FWyZVMVfPUsCswa1aMcLNl5vD6n0Um3mLPaTl j+6h6bTi34fT4sU5lezq3QuM4YwzkXF4L3nLxBjADJeE18bDa+8Q1lWezdau3L2aVpjA GGaooYMfWmGVnyK27C2XdxUvZTiGPjLM2laQbx7DT9qHKgB9etmhRxDHN2wlldj0D0fJ RgFqez00ErTQLdhb4qKgR5CGfwP9hSrSyp+ZVsvjYJ2Kyw7teS2BI85TvafOIs6xx4e8 IqKA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ji9si26906609ejc.16.2021.11.22.00.09.16; Mon, 22 Nov 2021 00:09:17 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B4C5668921B; Mon, 22 Nov 2021 10:09:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7B7D068A927 for ; Mon, 22 Nov 2021 10:08:59 +0200 (EET) X-IronPort-AV: E=McAfee;i="6200,9189,10175"; a="221964804" X-IronPort-AV: E=Sophos;i="5.87,254,1631602800"; d="scan'208";a="221964804" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Nov 2021 00:08:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,254,1631602800"; d="scan'208";a="496769586" Received: from otc-skl-e5-server.sh.intel.com ([10.239.43.106]) by orsmga007.jf.intel.com with ESMTP; 22 Nov 2021 00:08:55 -0800 From: Wu Jianhua To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Nov 2021 16:08:47 +0800 Message-Id: <20211122080848.39566-2-jianhua.wu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211122080848.39566-1-jianhua.wu@intel.com> References: <20211122080848.39566-1-jianhua.wu@intel.com> Subject: [FFmpeg-devel] [PATCH v3 2/3] avfilter/x86/vf_exposure: add ff_exposure_avx2 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Wu Jianhua MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: oJ8a4/rLENqs Performance data(Less is better): exposure_sse: 500491 exposure_avx2: 449122 Signed-off-by: Wu Jianhua --- libavfilter/x86/vf_exposure.asm | 15 +++++++++++++++ libavfilter/x86/vf_exposure_init.c | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/libavfilter/x86/vf_exposure.asm b/libavfilter/x86/vf_exposure.asm index 3351c6fb3b..4ee9fbcb15 100644 --- a/libavfilter/x86/vf_exposure.asm +++ b/libavfilter/x86/vf_exposure.asm @@ -36,11 +36,21 @@ cglobal exposure, 2, 2, 4, ptr, length, black, scale VBROADCASTSS m1, xmm1 %endif +%if cpuflag(fma3) + mulps m0, m0, m1 ; black * scale +%endif + .loop: +%if cpuflag(fma3) + mova m2, m0 + vfmsub231ps m2, m1, [ptrq] + movu [ptrq], m2 +%else movu m2, [ptrq] subps m2, m2, m0 mulps m2, m2, m1 movu [ptrq], m2 +%endif add ptrq, mmsize sub lengthq, mmsize/4 @@ -52,4 +62,9 @@ cglobal exposure, 2, 2, 4, ptr, length, black, scale %if ARCH_X86_64 INIT_XMM sse EXPOSURE + +%if HAVE_AVX2_EXTERNAL +INIT_YMM avx2 +EXPOSURE +%endif %endif diff --git a/libavfilter/x86/vf_exposure_init.c b/libavfilter/x86/vf_exposure_init.c index de1b360f6c..edc1452850 100644 --- a/libavfilter/x86/vf_exposure_init.c +++ b/libavfilter/x86/vf_exposure_init.c @@ -24,6 +24,7 @@ #include "libavfilter/exposure.h" void ff_exposure_sse(float *ptr, int length, float black, float scale); +void ff_exposure_avx2(float *ptr, int length, float black, float scale); av_cold void ff_exposure_init_x86(ExposureContext *s) { @@ -32,5 +33,8 @@ av_cold void ff_exposure_init_x86(ExposureContext *s) #if ARCH_X86_64 if (EXTERNAL_SSE(cpu_flags)) s->exposure_func = ff_exposure_sse; + + if (EXTERNAL_AVX2_FAST(cpu_flags)) + s->exposure_func = ff_exposure_avx2; #endif } From patchwork Mon Nov 22 08:08:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 31523 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp6599619iob; Mon, 22 Nov 2021 00:09:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJznXcIk/L0n2s1unypCbb953wkPzyzq7rZM0Wji/0AJfarRtm+NRVF0wauGZnuTdihrrAWy X-Received: by 2002:a17:907:7f28:: with SMTP id qf40mr37308227ejc.196.1637568568533; Mon, 22 Nov 2021 00:09:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637568568; cv=none; d=google.com; s=arc-20160816; b=XYYO+C0bcBTqJJaE63IUVCz0Aa2FR/0GFh4Gd0fvu3uJB7klM1+ZjIZtjUFXfDla4R 16H2++7Kmm2ch1VseUmFtemuwRXy+ZUN0+JvT+Mfu/QE22M7sbGl3z/QPnjuaq0Swp7k wRLO5B7D5Fi5mbO3NEZg8VthSC0zjCAoLYGCS/Oxkz4luGUpaOTJcIlsjb8kOC5qrhqi DMZ9jyEpgLTcLwUf+cH71HN9wVs93vSvOGDUxj9RiAJQpDwOL+cTcDTJ6CWnBrZ1gF+l hK96SwLtMMPXoEsdJQDSfoxvWy87gupjHFzNM/tD/xeL9/57pNncT4Se3f6qnTrGFZlY 8X9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=WSnCYBuCeGF0e0O6nNx0eoctwUvT8Waznz0t2iH4xWU=; b=KmUnF28IECL90CnlKOE+PnBTcwGz3OgDLnK8Z7eLq5T3/Qk4FV3XSAqH7qHdK7AxLL +zZxq0xAzBqokRpXWzrb0NrGg16I5xXL11dfAU/KHBVoWsBNy49XL7xjJ0Qm51DvPpGH 4BTV/pNfIbg7k8loT3+6n6o++es7BsNPgcLOtWSkU7gUxtp3LgH7wrfztf71lbU9g81t S1YMt0O/NF6eQpV4BRxvN4IHWlnLYgFTJr2rsV8oDkRaSWyGdWvkPD+Cz8vOLZf6XIBL NSIjR5Xt2gQQLnEUvFD2LlFcZ0SRRlJC/0gA6/8YCMx11SOyXgK1gJT7XwMtdT9/tqrv Eb3A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p23si15995262ejf.315.2021.11.22.00.09.28; Mon, 22 Nov 2021 00:09:28 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CC9BC68ACE7; Mon, 22 Nov 2021 10:09:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1962668ABAC for ; Mon, 22 Nov 2021 10:09:02 +0200 (EET) X-IronPort-AV: E=McAfee;i="6200,9189,10175"; a="221964806" X-IronPort-AV: E=Sophos;i="5.87,254,1631602800"; d="scan'208";a="221964806" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Nov 2021 00:08:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,254,1631602800"; d="scan'208";a="496769594" Received: from otc-skl-e5-server.sh.intel.com ([10.239.43.106]) by orsmga007.jf.intel.com with ESMTP; 22 Nov 2021 00:08:56 -0800 From: Wu Jianhua To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Nov 2021 16:08:48 +0800 Message-Id: <20211122080848.39566-3-jianhua.wu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211122080848.39566-1-jianhua.wu@intel.com> References: <20211122080848.39566-1-jianhua.wu@intel.com> Subject: [FFmpeg-devel] [PATCH v3 3/3] tests/checkasm: add check for vf_exposure X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Wu Jianhua MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ysbuJf8WfQ3l Signed-off-by: Wu Jianhua --- tests/checkasm/Makefile | 1 + tests/checkasm/checkasm.c | 3 ++ tests/checkasm/checkasm.h | 1 + tests/checkasm/vf_exposure.c | 59 ++++++++++++++++++++++++++++++++++++ tests/fate/checkasm.mak | 1 + 5 files changed, 65 insertions(+) create mode 100644 tests/checkasm/vf_exposure.c diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile index 4ef5fa87da..7b86ffca6b 100644 --- a/tests/checkasm/Makefile +++ b/tests/checkasm/Makefile @@ -37,6 +37,7 @@ AVFILTEROBJS-$(CONFIG_AFIR_FILTER) += af_afir.o AVFILTEROBJS-$(CONFIG_BLEND_FILTER) += vf_blend.o AVFILTEROBJS-$(CONFIG_COLORSPACE_FILTER) += vf_colorspace.o AVFILTEROBJS-$(CONFIG_EQ_FILTER) += vf_eq.o +AVFILTEROBJS-$(CONFIG_EXPOSURE_FILTER) += vf_exposure.o AVFILTEROBJS-$(CONFIG_GBLUR_FILTER) += vf_gblur.o AVFILTEROBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o AVFILTEROBJS-$(CONFIG_THRESHOLD_FILTER) += vf_threshold.o diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c index b1353f7cbe..50961d9961 100644 --- a/tests/checkasm/checkasm.c +++ b/tests/checkasm/checkasm.c @@ -169,6 +169,9 @@ static const struct { #if CONFIG_EQ_FILTER { "vf_eq", checkasm_check_vf_eq }, #endif + #if CONFIG_EXPOSURE_FILTER + { "vf_exposure", checkasm_check_vf_exposure }, + #endif #if CONFIG_GBLUR_FILTER { "vf_gblur", checkasm_check_vf_gblur }, #endif diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h index 68b0697d3e..b402894ad3 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -78,6 +78,7 @@ void checkasm_check_utvideodsp(void); void checkasm_check_v210dec(void); void checkasm_check_v210enc(void); void checkasm_check_vf_eq(void); +void checkasm_check_vf_exposure(void); void checkasm_check_vf_gblur(void); void checkasm_check_vf_hflip(void); void checkasm_check_vf_threshold(void); diff --git a/tests/checkasm/vf_exposure.c b/tests/checkasm/vf_exposure.c new file mode 100644 index 0000000000..7301a6ef33 --- /dev/null +++ b/tests/checkasm/vf_exposure.c @@ -0,0 +1,59 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with FFmpeg; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include +#include +#include "checkasm.h" +#include "libavfilter/exposure.h" + +#define PIXELS 256 +#define BUF_SIZE (PIXELS * 4) + +#define randomize_buffers(buf, size) \ + do { \ + int j; \ + float *tmp_buf = (float *)buf; \ + for (j = 0; j < size; j++) \ + tmp_buf[j] = (float)(rnd() & 0xFF); \ + } while (0) + +void checkasm_check_vf_exposure(void) +{ + float *dst_ref[BUF_SIZE] = { 0 }; + float *dst_new[BUF_SIZE] = { 0 }; + ExposureContext s; + + s.exposure = 0.5f; + s.black = 0.1f; + s.scale = 1.f / (exp2f(-s.exposure) - s.black); + + randomize_buffers(dst_ref, PIXELS); + memcpy(dst_new, dst_ref, BUF_SIZE); + + ff_exposure_init(&s); + + if (check_func(s.exposure_func, "exposure")) { + declare_func(void, float *dst, int length, float black, float scale); + call_ref(dst_ref, PIXELS, s.black, s.scale); + call_new(dst_new, PIXELS, s.black, s.scale); + if (!float_near_abs_eps_array(dst_ref, dst_new, 0.01f, PIXELS)) + fail(); + bench_new(dst_new, PIXELS, s.black, s.scale); + } + report("exposure"); +} diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak index 6e7edbe655..4d4cd6cc88 100644 --- a/tests/fate/checkasm.mak +++ b/tests/fate/checkasm.mak @@ -34,6 +34,7 @@ FATE_CHECKASM = fate-checkasm-aacpsdsp \ fate-checkasm-vf_blend \ fate-checkasm-vf_colorspace \ fate-checkasm-vf_eq \ + fate-checkasm-vf_exposure \ fate-checkasm-vf_gblur \ fate-checkasm-vf_hflip \ fate-checkasm-vf_nlmeans \