From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D9CBD45CD5 for ; Sun, 2 Jul 2023 17:27:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3391868C3BB; Sun, 2 Jul 2023 20:27:02 +0300 (EEST) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0182C68C39B for ; Sun, 2 Jul 2023 20:26:55 +0300 (EEST) Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-262d9e75438so2625461a91.2 for ; Sun, 02 Jul 2023 10:26:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688318814; x=1690910814; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Xbn1gmAz7AJ/+UKQplzb9hwsZB8uvj4Hkbc/M7vVFxg=; b=WRtmBZOyQhsM/YNMhWCg7D2pCI5UUWJmZdKm/WVMMsSORfQAbhkfy2PURZaAbV1eV1 sx7flk4C7+SNaWNDqauKVKrCA5EUBMIyJ75vV5R/NPBx09a0C/jtW3o6NT/dNnKRJjyV 9Y92xHBVpUbbkuNFO1KJsQsWYms68WNXu+EWIC8pVKaSEm21iQoQMv6A8ljykqzuLEgR YKTMsgVNsuFYo03+UEAalaomN/5nOX/kg6sNQ9DRfo9HAwbjGG4yGlKu74OB4mlzRMHp wFCvHgVYbLkjxb5mUHAGgXDyJc/s84cVz6XBrWm5mIRsEPgk2HPHbi5G2Vhl8/4AH5H1 aVwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688318814; x=1690910814; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Xbn1gmAz7AJ/+UKQplzb9hwsZB8uvj4Hkbc/M7vVFxg=; b=KVB4X86jmTDUOj1i/VnFkx9njLRG8j+crV9Lb00tGFc9nvyielDO4cMfeAb2h5tUIb pEj5jPvB7jXFFTjKEvHQpfmcqYTrBJ8mfgRnCLTEXxOrr2TzciNIVMjM0RLVIMPsULz6 P3kKGxeSkyrH3JiR/lPMiqobUNyphqvayuhxCiGhRtXjn55BFeD6ZVGlrXg6+/eJca1l u6n2E/6sPdhbHGEqiCyVXgExpIyIHl2TiaQodFOG8XJ6kMZvKMs//EJ0+g3CtOMKGLxO YVkh/2IaTaqTzgdxa5S0qHgsFT6y28qvO8xnqqQwn9HDCn6DI4REmv3QdgZTfmNSryZS O7mw== X-Gm-Message-State: ABy/qLYkguC3nQiV11D1hTHxjU/j+i8UPIyloREi5+rSvPJ2fYICDEdH USW0Ai81HI2uuVkfWXEu+2R6JyBiOhnrgStTtNlyeqTJgUKh9w== X-Google-Smtp-Source: APBJJlFGQMkqndcn03ebgg1oOn27Xx6ZWkL9XBFdA62f0xUfzegMEpJ6OVfy/YJ/ORjR4yTRGPXL6ehXAAwK9NVYxyc= X-Received: by 2002:a17:90b:3b88:b0:25b:d4bc:28d4 with SMTP id pc8-20020a17090b3b8800b0025bd4bc28d4mr8269170pjb.40.1688318813706; Sun, 02 Jul 2023 10:26:53 -0700 (PDT) MIME-Version: 1.0 References: <20230702123242.232484-1-jc@kynesim.co.uk> <20230702123242.232484-13-jc@kynesim.co.uk> In-Reply-To: <20230702123242.232484-13-jc@kynesim.co.uk> From: Thomas Mundt Date: Sun, 2 Jul 2023 19:26:42 +0200 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [FFmpeg-devel] [PATCH v2 12/15] avfilter/vf_bwdif: Add a filter_line3 method for optimisation 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: martin@martin.st, John Cox Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Am So., 2. Juli 2023 um 14:34 Uhr schrieb John Cox : > Add an optional filter_line3 to the available optimisations. > > filter_line3 is equivalent to filter_line, memcpy, filter_line > > filter_line shares quite a number of loads and some calculations in > common with its next iteration and testing shows that using aarch64 > neon filter_line3s performance is 30% better than two filter_lines > and a memcpy. > > Signed-off-by: John Cox > --- > libavfilter/bwdif.h | 7 +++++++ > libavfilter/vf_bwdif.c | 31 +++++++++++++++++++++++++++++++ > 2 files changed, 38 insertions(+) > > diff --git a/libavfilter/bwdif.h b/libavfilter/bwdif.h > index cce99953f3..496cec72ef 100644 > --- a/libavfilter/bwdif.h > +++ b/libavfilter/bwdif.h > @@ -35,6 +35,9 @@ typedef struct BWDIFContext { > void (*filter_edge)(void *dst, void *prev, void *cur, void *next, > int w, int prefs, int mrefs, int prefs2, int > mrefs2, > int parity, int clip_max, int spat); > + void (*filter_line3)(void *dst, int dstride, > + const void *prev, const void *cur, const void > *next, int prefs, > + int w, int parity, int clip_max); > } BWDIFContext; > > void ff_bwdif_init_filter_line(BWDIFContext *bwdif, int bit_depth); > @@ -53,4 +56,8 @@ void ff_bwdif_filter_line_c(void *dst1, void *prev1, > void *cur1, void *next1, > int prefs3, int mrefs3, int prefs4, int > mrefs4, > int parity, int clip_max); > > +void ff_bwdif_filter_line3_c(void * dst1, int d_stride, > + const void * prev1, const void * cur1, const > void * next1, int s_stride, > + int w, int parity, int clip_max); > + > #endif /* AVFILTER_BWDIF_H */ > diff --git a/libavfilter/vf_bwdif.c b/libavfilter/vf_bwdif.c > index 26349da1fd..52bc676cf8 100644 > --- a/libavfilter/vf_bwdif.c > +++ b/libavfilter/vf_bwdif.c > @@ -150,6 +150,31 @@ void ff_bwdif_filter_line_c(void *dst1, void *prev1, > void *cur1, void *next1, > FILTER2() > } > > +#define NEXT_LINE()\ > + dst += d_stride; \ > + prev += prefs; \ > + cur += prefs; \ > + next += prefs; > + > +void ff_bwdif_filter_line3_c(void * dst1, int d_stride, > + const void * prev1, const void * cur1, const > void * next1, int s_stride, > + int w, int parity, int clip_max) > +{ > + const int prefs = s_stride; > + uint8_t * dst = dst1; > + const uint8_t * prev = prev1; > + const uint8_t * cur = cur1; > + const uint8_t * next = next1; > + > + ff_bwdif_filter_line_c(dst, (void*)prev, (void*)cur, (void*)next, w, > + prefs, -prefs, prefs * 2, - prefs * 2, prefs * > 3, -prefs * 3, prefs * 4, -prefs * 4, parity, clip_max); > + NEXT_LINE(); > + memcpy(dst, cur, w); > + NEXT_LINE(); > + ff_bwdif_filter_line_c(dst, (void*)prev, (void*)cur, (void*)next, w, > + prefs, -prefs, prefs * 2, - prefs * 2, prefs * > 3, -prefs * 3, prefs * 4, -prefs * 4, parity, clip_max); > +} > + > void ff_bwdif_filter_edge_c(void *dst1, void *prev1, void *cur1, void > *next1, > int w, int prefs, int mrefs, int prefs2, int > mrefs2, > int parity, int clip_max, int spat) > @@ -244,6 +269,11 @@ static int filter_slice(AVFilterContext *ctx, void > *arg, int jobnr, int nb_jobs) > refs << 1, -(refs << 1), > td->parity ^ td->tff, clip_max, > (y < 2) || ((y + 3) > td->h) ? 0 : 1); > + } else if (s->filter_line3 && y + 2 < slice_end && y + 6 < > td->h) { > + s->filter_line3(dst, td->frame->linesize[td->plane], > + prev, cur, next, linesize, td->w, > + td->parity ^ td->tff, clip_max); > + y += 2; > } else { > s->filter_line(dst, prev, cur, next, td->w, > refs, -refs, refs << 1, -(refs << 1), > Maybe I'm missing something, but doesn't this kick out most of the x86 SIMD optimization because there is no filter_line3? _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".