From patchwork Fri Oct 29 15:19:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 31250 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:a610:0:0:0:0:0 with SMTP id q16csp1805098ioi; Fri, 29 Oct 2021 08:20:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUhQR3W7LAAOhJzYTjK7Kr0H/ayXivOcWwNEF7+D73AXZiucy67pFyUtG1kPxmYYiLs7dn X-Received: by 2002:a17:906:c0cf:: with SMTP id bn15mr14075918ejb.54.1635520830558; Fri, 29 Oct 2021 08:20:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635520830; cv=none; d=google.com; s=arc-20160816; b=ordCF4pdSZMcS2aC5lR+Foa3aANZkQTSPC5JzdT1FnVsD4vGQZVGoBVL3ZLCBTtVuh OcTVH9Z1Z/JZgxFaOuDcSTZpX6jnsMwRyR1llXpPc2AVkPUKXoHVFIA2OPZVsI4PlMfK iWaMOUHp/pM73jt9UfH3InAaUbjz9pABVjENc5qLyVdetJfpXwwQfmhGS6mfAF/IGgQv kItZwm+ubbwN4dp+n1gIag8dOuqO6Yj3uzklk5lMAQAOXL2MxjCWeZmG60Pm1vHvHB0k u8gx0zsY+GRYojB+wyn0dg7T8088Xbtr7EXmrqxAVZ/N8eroiQSwuZv68q3uhHQ8vdrZ suUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=3Io3mr4n4fGJjiTxB1Ed8I45RrirUSu7P3/cNnTVr8Y=; b=P+ahIcl6e2xQsK6JrL0f7sYklkBYzgIvf00LiMXe3xYH+GKcVlWwnEWnBITbgoK85f vevmnLJJzs0O7u2EXmaxkuhfnOCodfBuLhsrl8GJLLYzwxuBT/fQJRDJK4mEYsl1NthX LjTfVEvP30qYti2uHMfem0MYzzVLBJUY0XQs5HWo0510xJmufDcd0llpeMWn4FpRkP30 8KcY/H2ZLVl3+ipkhbFWvY2Dd3yYGFI55MWXTe5J25It8E+lej8lPLyJLYmczYz6U0Y2 gYYDKlu3J0kWs8ztv9Ov+Bx2UVo+uG2fDKn4pXIahPpjPRujNREgNWmNgXD/ZRU96rWw jMDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QzA2UD7M; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 9si2033356edw.603.2021.10.29.08.20.30; Fri, 29 Oct 2021 08:20:30 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QzA2UD7M; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0A4B468AA8F; Fri, 29 Oct 2021 18:19:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B6E568A783 for ; Fri, 29 Oct 2021 18:19:07 +0300 (EEST) Received: by mail-ed1-f47.google.com with SMTP id z20so40171463edc.13 for ; Fri, 29 Oct 2021 08:19:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=gIpc7YqDeRbkkDMHHrGYL5AYqL04G2ZJCsMasWyjdos=; b=QzA2UD7Mq2KUNiAo3jc0CTJx7+YPqwy8pKMCqczz7ljnkoMak+uXM137Oxp2Bu0rXs DSQp/yy1wcKsTD/LYP8mDmOzZnc+whhXNS4gbXBV0h5/GCHKwulN7Qv3398EbKvMYwLl 4uMm+Dt37Qapeoz4AZXVLsxI/Mj0YZazMFypKCopgX1dIS2jfm34YQyjNj537B+0XiE7 +Cr0PImdazD6X/rT/OFUWVW9GHiSkhNaJlYddS2kZO+IXsHsHa1lXDbsxmSYEesbXsCB n5FUboDbsnIp6WQPJE+gQjudJIAuoJsYFu0/gDJb9mYUPq7au+6N9s4D859PvVPDK/tS sBng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gIpc7YqDeRbkkDMHHrGYL5AYqL04G2ZJCsMasWyjdos=; b=S+q82FG712nYC3uxq3V8/BtIkjTWl7EHZBIFvmnQKgPQ6xI1hoWSbBDhex+Ouav+dU IpxADhyPm9MRvIdFZDdtNC5t3W8+WSzCQlAWVWZGnQRgsLDdWm8YDNEr7XTa4dhpkJ8y P/XWfBYlbPoGIZguwSPynZGqWFVq3qNxhaIgzU673ALwO281ateQpB8iUwfojJByO/Lv iBIpdb9A2VbzwKJkTNQ7nfgA67czU5t33KwE92iNKvAb7T+2N6tUi/3xTOz8mIXyujYf 6JUuynYyD1LPvarqXsqhjKEJGmoVBurZi5ed6M1mp+kJ+GXuQigLub6khO3CaMOHFim/ EiDA== X-Gm-Message-State: AOAM5303CPHW1HHOj4qmvdCVIo5qso1RRIpGD9n8E2RdUsjAsR3GSzZ4 HR/FHGbhl7OQ4YPt2DoQu3K5ay0foF4= X-Received: by 2002:a17:906:fa90:: with SMTP id lt16mr9708487ejb.95.1635520746672; Fri, 29 Oct 2021 08:19:06 -0700 (PDT) Received: from localhost.localdomain ([212.15.177.28]) by smtp.gmail.com with ESMTPSA id gb3sm3101386ejc.81.2021.10.29.08.19.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Oct 2021 08:19:06 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Oct 2021 17:19:03 +0200 Message-Id: <20211029151903.1078367-7-onemda@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211029151903.1078367-1-onemda@gmail.com> References: <20211029151903.1078367-1-onemda@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/7] avfilter/vf_nlmeans: add x86 SIMD 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: icrrVgpvlZsE Signed-off-by: Paul B Mahol --- libavfilter/vf_nlmeans.c | 3 + libavfilter/vf_nlmeans.h | 1 + libavfilter/x86/Makefile | 2 + libavfilter/x86/vf_nlmeans.asm | 92 +++++++++++++++++++++++++++++++ libavfilter/x86/vf_nlmeans_init.c | 40 ++++++++++++++ 5 files changed, 138 insertions(+) create mode 100644 libavfilter/x86/vf_nlmeans.asm create mode 100644 libavfilter/x86/vf_nlmeans_init.c diff --git a/libavfilter/vf_nlmeans.c b/libavfilter/vf_nlmeans.c index dee1f68101..4d5dcba5cc 100644 --- a/libavfilter/vf_nlmeans.c +++ b/libavfilter/vf_nlmeans.c @@ -519,6 +519,9 @@ void ff_nlmeans_init(NLMeansDSPContext *dsp) if (ARCH_AARCH64) ff_nlmeans_init_aarch64(dsp); + + if (ARCH_X86) + ff_nlmeans_init_x86(dsp); } static av_cold int init(AVFilterContext *ctx) diff --git a/libavfilter/vf_nlmeans.h b/libavfilter/vf_nlmeans.h index cd1ee7c0bf..43611a03bd 100644 --- a/libavfilter/vf_nlmeans.h +++ b/libavfilter/vf_nlmeans.h @@ -41,5 +41,6 @@ typedef struct NLMeansDSPContext { void ff_nlmeans_init(NLMeansDSPContext *dsp); void ff_nlmeans_init_aarch64(NLMeansDSPContext *dsp); +void ff_nlmeans_init_x86(NLMeansDSPContext *dsp); #endif /* AVFILTER_NLMEANS_H */ diff --git a/libavfilter/x86/Makefile b/libavfilter/x86/Makefile index a29941eaeb..e87481bd7a 100644 --- a/libavfilter/x86/Makefile +++ b/libavfilter/x86/Makefile @@ -20,6 +20,7 @@ OBJS-$(CONFIG_LIMITER_FILTER) += x86/vf_limiter_init.o OBJS-$(CONFIG_LUT3D_FILTER) += x86/vf_lut3d_init.o OBJS-$(CONFIG_MASKEDCLAMP_FILTER) += x86/vf_maskedclamp_init.o OBJS-$(CONFIG_MASKEDMERGE_FILTER) += x86/vf_maskedmerge_init.o +OBJS-$(CONFIG_NLMEANS_FILTER) += x86/vf_nlmeans_init.o OBJS-$(CONFIG_NOISE_FILTER) += x86/vf_noise.o OBJS-$(CONFIG_OVERLAY_FILTER) += x86/vf_overlay_init.o OBJS-$(CONFIG_PP7_FILTER) += x86/vf_pp7_init.o @@ -61,6 +62,7 @@ X86ASM-OBJS-$(CONFIG_LIMITER_FILTER) += x86/vf_limiter.o X86ASM-OBJS-$(CONFIG_LUT3D_FILTER) += x86/vf_lut3d.o X86ASM-OBJS-$(CONFIG_MASKEDCLAMP_FILTER) += x86/vf_maskedclamp.o X86ASM-OBJS-$(CONFIG_MASKEDMERGE_FILTER) += x86/vf_maskedmerge.o +X86ASM-OBJS-$(CONFIG_NLMEANS_FILTER) += x86/vf_nlmeans.o X86ASM-OBJS-$(CONFIG_OVERLAY_FILTER) += x86/vf_overlay.o X86ASM-OBJS-$(CONFIG_PP7_FILTER) += x86/vf_pp7.o X86ASM-OBJS-$(CONFIG_PSNR_FILTER) += x86/vf_psnr.o diff --git a/libavfilter/x86/vf_nlmeans.asm b/libavfilter/x86/vf_nlmeans.asm new file mode 100644 index 0000000000..1047e43de4 --- /dev/null +++ b/libavfilter/x86/vf_nlmeans.asm @@ -0,0 +1,92 @@ +;***************************************************************************** +;* x86-optimized functions for nlmeans 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" + +%if HAVE_AVX2_EXTERNAL + +SECTION_RODATA + +SECTION .text + +; void ff_compute_weights_line(const uint32_t *const iia, +; const uint32_t *const iib, +; const uint32_t *const iid, +; const uint32_t *const iie, +; const uint8_t *const src, +; struct weighted_avg *wa, +; const float *const lut, +; int max, +; int startx, int endx); + +INIT_YMM avx2 +cglobal compute_weights_line, 11, 12, 7, iia, iib, iid, iie, src, total, sum, lut, max, startx, endx, x + movsxdifnidn startxq, startxd + movsxdifnidn endxq, endxd + movsxdifnidn maxq, maxd + + sub endxq, startxq + mov xq, mmsize / 4 + sub xq, 1 + not xq + and endxq, xq + add endxq, startxq + + mov xq, startxq + xor startxq, startxq + + VPBROADCASTD m4, maxm + vpcmpeqd m5, m5 + + .loop: + movu m0, [iieq + xq * 4] + movu m1, [iidq + xq * 4] + movu m2, [iibq + xq * 4] + movu m3, [iiaq + xq * 4] + + pmovzxbd m6, [srcq + xq] + cvtdq2ps m6, m6 + + psubd m0, m1 + psubd m0, m2 + paddd m0, m3 + pminud m0, m4 + pslld m0, 2 + mova m3, m5 + vgatherdps m1, [lutq + m0], m3 + + mulps m0, m1, m6 + + movups m3, [totalq + xq * 4] + movups m2, [sumq + xq * 4] + + addps m0, m2 + addps m1, m3 + + movups [totalq + xq * 4], m1 + movups [sumq + xq * 4], m0 + + add xq, mmsize / 4 + cmp xq, endxq + jl .loop + RET + +%endif diff --git a/libavfilter/x86/vf_nlmeans_init.c b/libavfilter/x86/vf_nlmeans_init.c new file mode 100644 index 0000000000..6fbd8f9008 --- /dev/null +++ b/libavfilter/x86/vf_nlmeans_init.c @@ -0,0 +1,40 @@ +/* + * 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/attributes.h" +#include "libavutil/x86/cpu.h" +#include "libavfilter/vf_nlmeans.h" + +void ff_compute_weights_line_avx2(const uint32_t *const iia, + const uint32_t *const iib, + const uint32_t *const iid, + const uint32_t *const iie, + const uint8_t *const src, + float *total_weight, + float *sum, + const float *const weight_lut, + int max_meaningful_diff, + int startx, int endx); + +av_cold void ff_nlmeans_init_x86(NLMeansDSPContext *dsp) +{ + int cpu_flags = av_get_cpu_flags(); + + if (EXTERNAL_AVX2_FAST(cpu_flags)) + dsp->compute_weights_line = ff_compute_weights_line_avx2; +}