From patchwork Sun May 26 09:28:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 49269 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2662426vqf; Sun, 26 May 2024 02:28:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUMZHUk35LURZHjOViwznnOlqMkCiLQEoW8U1e4GRn22nUzEvvwkxbRhXb8V95ILlF6zHRfFoAev+2RvFLwhFmdK9H6RUdn0J3fOw== X-Google-Smtp-Source: AGHT+IGfstBRr+yPqhY9ZgieNThg+pjUQRnVtSTIVpZytS+COlPcPo+4MsKR2wNvV/8r9RdnmMQo X-Received: by 2002:a50:cc08:0:b0:579:c5df:af84 with SMTP id 4fb4d7f45d1cf-579c5dfb2e5mr1459102a12.15.1716715714038; Sun, 26 May 2024 02:28:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716715714; cv=none; d=google.com; s=arc-20160816; b=eumMuDep6VNWl11iG1plH6kFYsvgp2GEijmz/N+qQtCvi49O1UAw+KIgXKL22nB0QP qn2ARBV6uLnbb8BbVVBCDnG4I1uEY8Rhwlr+oP2FkEC4KZglFrWAd05zgNkj869w6dHA Dt4wqqBVWeg3qAMabpPe3apgkPjnp71RQmIWPSrooFHlDmv/LdfzlXAEi6mqYcKQoI1w 6e4kCiocxvYKmQVeCg7ytE6ZimnQDBDUlWqRW9yGRj5VY20nPy3qfSAXAD3Rysj3sfqf eaCPMClLOpIVItoFpQZRiAOGUU65uNmsEn/t8SVZ16ugX/lQaxC/c+C9pTa+VJP66Xyv /Ciw== 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:message-id:date:to:from :delivered-to; bh=40SbzB8jHhU1Q832ReoEsWkeLEp6aBCkTT6SQtEn6Bk=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=pGLqCQR2TmTUhjK8hQioLTn0Ssu3KFZBsA+NnzxOc+2hcEj6422Uvab++RhpCQsbTU sYn+NwscVDFIdOVcTcrtqEBKVOHRQWNBCzoh4zHf8ZJB+7PUCENuogOanVwWBqcfJ+Zc W3TFZGEf0vvaokHBYNehgNztMbV82F6Y7u+XJ3QGtwWxb7Bnrk3oXcgErm43KIpbH/oQ adQyTyHEdnYOJeSaElTnlVvKmRkXQT8d2J1XGO4bEurQWZtO1s6Hg/0JFHAWmWMqOInI C8I5sGZLAhwU5TK119ZaFCHfgXvO1Bvz2NDhdu5pakLzEH3ViQg3VuWGDVpZ0v5AogHg AdTw==; dara=google.com 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-57863fc680dsi1959775a12.8.2024.05.26.02.28.33; Sun, 26 May 2024 02:28:34 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7664968D4BE; Sun, 26 May 2024 12:28:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ursule.remlab.net (vps-a2bccee9.vps.ovh.net [51.75.19.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CCD1768D12C for ; Sun, 26 May 2024 12:28:23 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 48420C006F for ; Sun, 26 May 2024 12:28:23 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 May 2024 12:28:20 +0300 Message-ID: <20240526092823.16116-1-remi@remlab.net> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/vp7dsp: add R-V V vp7_luma_dc_wht 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: 2HfyU3Cow+hs This works out a bit more favourably than VP8's due to: - additional multiplications that can be vectored, - hardware-supported fixed-point rounding mode. vp7_luma_dc_wht_c: 3.2 vp7_luma_dc_wht_rvv_i64: 2.0 --- libavcodec/riscv/Makefile | 2 + libavcodec/riscv/vp7dsp_init.c | 41 +++++++++++++++ libavcodec/riscv/vp7dsp_rvv.S | 96 ++++++++++++++++++++++++++++++++++ libavcodec/vp8dsp.c | 4 ++ libavcodec/vp8dsp.h | 2 + 5 files changed, 145 insertions(+) create mode 100644 libavcodec/riscv/vp7dsp_init.c create mode 100644 libavcodec/riscv/vp7dsp_rvv.S diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index e608436aa4..590655f829 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -65,6 +65,8 @@ RVV-OBJS-$(CONFIG_UTVIDEO_DECODER) += riscv/utvideodsp_rvv.o OBJS-$(CONFIG_VC1DSP) += riscv/vc1dsp_init.o RV-OBJS-$(CONFIG_VC1DSP) += riscv/vc1dsp_rvi.o RVV-OBJS-$(CONFIG_VC1DSP) += riscv/vc1dsp_rvv.o +OBJS-$(CONFIG_VP7_DECODER) += riscv/vp7dsp_init.o +RVV-OBJS-$(CONFIG_VP7_DECODER) += riscv/vp7dsp_rvv.o OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_init.o RV-OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_rvi.o RVV-OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_rvv.o diff --git a/libavcodec/riscv/vp7dsp_init.c b/libavcodec/riscv/vp7dsp_init.c new file mode 100644 index 0000000000..6d9aba43d9 --- /dev/null +++ b/libavcodec/riscv/vp7dsp_init.c @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2024 Rémi Denis-Courmont. + * + * 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/riscv/cpu.h" +#include "libavcodec/vp8dsp.h" + +void ff_vp7_luma_dc_wht_rvv(int16_t block[4][4][16], int16_t dc[16]); + +av_cold void ff_vp7dsp_init_riscv(VP8DSPContext *c) +{ +#if HAVE_RVV + int flags = av_get_cpu_flags(); + + if (flags & AV_CPU_FLAG_RVV_I32 && ff_rv_vlen_least(128)) { +#if __riscv_xlen >= 64 + c->vp8_luma_dc_wht = ff_vp7_luma_dc_wht_rvv; +#endif + } +#endif +} diff --git a/libavcodec/riscv/vp7dsp_rvv.S b/libavcodec/riscv/vp7dsp_rvv.S new file mode 100644 index 0000000000..fb21e9a595 --- /dev/null +++ b/libavcodec/riscv/vp7dsp_rvv.S @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2024 Rémi Denis-Courmont. + * + * 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/riscv/asm.S" + +#if __riscv_xlen >= 64 +func ff_vp7_luma_dc_wht_rvv, zve32x + csrwi vxrm, 0 + li t4, 12540 + vsetivli zero, 4, e16, mf2, ta, ma + vlseg4e16.v v0, (a1) + li t6, 30274 + vwmul.vx v8, v1, t4 + li t5, 23170 + vwmul.vx v9, v3, t6 + addi t1, sp, -12 * 2 + vwmul.vx v10, v1, t6 + addi t2, sp, -8 * 2 + vwmul.vx v11, v3, t4 + addi t3, sp, -4 * 2 + vwadd.vv v4, v0, v2 + addi sp, sp, -16 * 2 + vwsub.vv v5, v0, v2 + vsetvli zero, zero, e32, m1, ta, ma + vadd.vv v7, v10, v11 + vmul.vx v4, v4, t5 + vsub.vv v6, v8, v9 + vmul.vx v5, v5, t5 + vadd.vv v0, v4, v7 + vsub.vv v3, v4, v7 + vadd.vv v1, v5, v6 + vsub.vv v2, v5, v6 + vsetvli zero, zero, e16, mf2, ta, ma + vnsra.wi v4, v0, 14 + vnsra.wi v7, v3, 14 + vnsra.wi v5, v1, 14 + vnsra.wi v6, v2, 14 + vsseg4e16.v v4, (sp) + vle16.v v0, (sp) + vle16.v v1, (t1) + vle16.v v2, (t2) + vle16.v v3, (t3) + vwmul.vx v8, v1, t4 + li t0, 16 * 2 + vwmul.vx v9, v3, t6 + addi t1, a0, 1 * 4 * 16 * 2 + vwmul.vx v10, v1, t6 + addi t2, a0, 2 * 4 * 16 * 2 + vwmul.vx v11, v3, t4 + addi t3, a0, 3 * 4 * 16 * 2 + vwadd.vv v4, v0, v2 + vwsub.vv v5, v0, v2 + vsetvli zero, zero, e32, m1, ta, ma + vmul.vx v4, v4, t5 + sd zero, (a1) + vadd.vv v7, v10, v11 + sd zero, 8(a1) + vmul.vx v5, v5, t5 + sd zero, 16(a1) + vsub.vv v6, v8, v9 + sd zero, 24(a1) + vadd.vv v0, v4, v7 + addi sp, sp, 16 * 2 + vsub.vv v3, v4, v7 + vadd.vv v1, v5, v6 + vsub.vv v2, v5, v6 + vsetvli zero, zero, e16, mf2, ta, ma + vnclip.wi v4, v0, 18 + vnclip.wi v5, v1, 18 + vnclip.wi v6, v2, 18 + vnclip.wi v7, v3, 18 + vsse16.v v4, (a0), t0 + vsse16.v v5, (t1), t0 + vsse16.v v6, (t2), t0 + vsse16.v v7, (t3), t0 + + ret +endfunc +#endif diff --git a/libavcodec/vp8dsp.c b/libavcodec/vp8dsp.c index 8624c3ae15..88bb67f78d 100644 --- a/libavcodec/vp8dsp.c +++ b/libavcodec/vp8dsp.c @@ -712,6 +712,10 @@ av_cold void ff_vp7dsp_init(VP8DSPContext *dsp) dsp->vp8_v_loop_filter_simple = vp7_v_loop_filter_simple_c; dsp->vp8_h_loop_filter_simple = vp7_h_loop_filter_simple_c; + +#if ARCH_RISCV + ff_vp7dsp_init_riscv(dsp); +#endif } #endif /* CONFIG_VP7_DECODER */ diff --git a/libavcodec/vp8dsp.h b/libavcodec/vp8dsp.h index 3bf12b6b45..e3de2e0494 100644 --- a/libavcodec/vp8dsp.h +++ b/libavcodec/vp8dsp.h @@ -90,6 +90,8 @@ void ff_vp78dsp_init_ppc(VP8DSPContext *c); void ff_vp78dsp_init_riscv(VP8DSPContext *c); void ff_vp78dsp_init_x86(VP8DSPContext *c); +void ff_vp7dsp_init_riscv(VP8DSPContext *c); + void ff_vp8dsp_init(VP8DSPContext *c); void ff_vp8dsp_init_aarch64(VP8DSPContext *c); void ff_vp8dsp_init_arm(VP8DSPContext *c); From patchwork Sun May 26 11:12:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 49270 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2694055vqf; Sun, 26 May 2024 04:12:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVr80Wc+XgVhkjYW3cfRRAf5SUzp6hYaP19SY+GUN6uKU2EYWqGuRxUyuGuyl+OunzH000CLSKBz6QLRAQru/HMb4bQpV8xAOtjtQ== X-Google-Smtp-Source: AGHT+IHxgVJrQHvbJAnrf2klMMZc++TvtczDavZ4BL0u3wXVBYpCpFgZ+WsaQF0dFuts52BVOxmj X-Received: by 2002:a50:875d:0:b0:578:5756:1519 with SMTP id 4fb4d7f45d1cf-578575616d5mr5218131a12.16.1716721937238; Sun, 26 May 2024 04:12:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716721937; cv=none; d=google.com; s=arc-20160816; b=E+Coe9WjtjmssSokvMrfb2OXWVAmQuIVckShdF4zO1Uod4SjKMiukngmEzkHjt73n0 K1NIasFVWHDaEQ7wc1t5WgdKBuLhB57iXDZymypJDyV10W9ifrW2k3wDa/fe51mmmlQo TQ9pf+CfiWrfKxeUflzi546ZMDaUY78PxOiCxGRy2TjflKQyc4p9Ad9ZvZsxXShMWgIs urdFd5gzkPPy5SJfDIRhJn53L3ZlHM1HXqyz1a+goTkV0WVCMvq0UFeJ0X8d4d9Bsws8 hM1zu85kJdau5CvTKKN8R/Pr5wRHarXsG2+nKcnIi1M/VSxvKw5ui2DXAnNQPS2Phzs2 xhFQ== 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:delivered-to; bh=bOqDxv0gmqJnt11OKrwFpFQJm8Zdr1m0gofteHcXILI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=exbvfCw7OiS9XsHQAzbKsWVCaxqjF45hII6HVZa2GhnVaVoVdgPsYWRGCEGZJFlR9V oWXy6JSR47OXmnqomAjdo2iUrBM2J7SJUfJN9/76P81/TAKy9bCLFk4znBN/FbrhfgC7 n5l/6Sr8xqA10v9luUfYH+fFgAj5KrmZ/K2meu5FT2sO55CayaHNsPKJ5WEek2DQlLfx Nkrfy655zTtc7bRpjBG2qCgzUXMSKRmrJQrKh/WGwnkAkrS3GsQpspUUa8VFCl/VQgYK Zy62yPAVyDgR9Tgbtzmp1rgbbL5g4bdsSswRLCQzvmtEhoHANLK4Svg/xGsi+7COHhoB 9nYg==; dara=google.com 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5785f41e9efsi2357742a12.542.2024.05.26.04.12.16; Sun, 26 May 2024 04:12:17 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A4C8C68D4D5; Sun, 26 May 2024 14:12:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ursule.remlab.net (vps-a2bccee9.vps.ovh.net [51.75.19.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6398468D1FD for ; Sun, 26 May 2024 14:12:06 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 0628CC006F for ; Sun, 26 May 2024 14:12:05 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 May 2024 14:12:04 +0300 Message-ID: <20240526111205.21965-1-remi@remlab.net> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240526092823.16116-1-remi@remlab.net> References: <20240526092823.16116-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavc/vp7dsp: revector ff_vp7_dc_wht_rvv 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: hHTc7HC4t1NM This prepares for some code reuse. --- libavcodec/riscv/vp7dsp_init.c | 3 ++- libavcodec/riscv/vp7dsp_rvv.S | 23 ++++++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/libavcodec/riscv/vp7dsp_init.c b/libavcodec/riscv/vp7dsp_init.c index 5a57a39d0b..1406eb1c6a 100644 --- a/libavcodec/riscv/vp7dsp_init.c +++ b/libavcodec/riscv/vp7dsp_init.c @@ -32,7 +32,8 @@ av_cold void ff_vp7dsp_init_riscv(VP8DSPContext *c) #if HAVE_RVV int flags = av_get_cpu_flags(); - if ((flags & AV_CPU_FLAG_RVV_I32) && ff_rv_vlen_least(128)) { + if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR) && + ff_rv_vlen_least(128)) { #if __riscv_xlen >= 64 c->vp8_luma_dc_wht = ff_vp7_luma_dc_wht_rvv; #endif diff --git a/libavcodec/riscv/vp7dsp_rvv.S b/libavcodec/riscv/vp7dsp_rvv.S index 819d2056dc..06e251f5ce 100644 --- a/libavcodec/riscv/vp7dsp_rvv.S +++ b/libavcodec/riscv/vp7dsp_rvv.S @@ -22,6 +22,15 @@ #if __riscv_xlen >= 64 func ff_vp7_luma_dc_wht_rvv, zve32x + li a2, 4 * 16 * 2 + li a7, 16 * 2 + jal t0, 1f + vsse16.v v4, (a0), a7 + vsse16.v v5, (t1), a7 + vsse16.v v6, (t2), a7 + vsse16.v v7, (t3), a7 + ret +1: csrwi vxrm, 0 li t4, 12540 vsetivli zero, 4, e16, mf2, ta, ma @@ -58,14 +67,14 @@ func ff_vp7_luma_dc_wht_rvv, zve32x vle16.v v2, (t2) vle16.v v3, (t3) vwmul.vx v8, v1, t4 - li t0, 16 * 2 vwmul.vx v9, v3, t6 - addi t1, a0, 1 * 4 * 16 * 2 + add t1, a2, a0 vwmul.vx v10, v1, t6 - addi t2, a0, 2 * 4 * 16 * 2 + sh1add t2, a2, a0 vwmul.vx v11, v3, t4 - addi t3, a0, 3 * 4 * 16 * 2 + sh1add a2, a2, a2 # a2 *= 3 vwadd.vv v4, v0, v2 + add t3, a2, a0 vwsub.vv v5, v0, v2 vsetvli zero, zero, e32, m1, ta, ma vmul.vx v4, v4, t5 @@ -86,10 +95,6 @@ func ff_vp7_luma_dc_wht_rvv, zve32x vnclip.wi v5, v1, 18 vnclip.wi v6, v2, 18 vnclip.wi v7, v3, 18 - vsse16.v v4, (a0), t0 - vsse16.v v5, (t1), t0 - vsse16.v v6, (t2), t0 - vsse16.v v7, (t3), t0 - ret + jr t0 endfunc #endif From patchwork Sun May 26 11:12:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 49271 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2694112vqf; Sun, 26 May 2024 04:12:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWlG9ixMXo6ynkb+HxWSv/nAP7hmscN2GRwm+JK91G/e4FVoexOgoJaZhiTkk8gzW9oDIxiuTbHsLspBKUqv4FPeBujJ8nZ+DfgSg== X-Google-Smtp-Source: AGHT+IFGCETtOkX71GIWtkI8ALmHPY46db5oFUt0uULXiIdyXFpwWP4carQcd84lwT+yMWuYKvyW X-Received: by 2002:a05:6512:3d15:b0:51d:2af8:2e7b with SMTP id 2adb3069b0e04-529679318demr6783112e87.57.1716721947755; Sun, 26 May 2024 04:12:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716721947; cv=none; d=google.com; s=arc-20160816; b=iSVZhsTM/DBmzDQvBvw3S2hVtOq193TkSzEXeu5utcqcG5nRInMlWLrVg2K7XcWoDZ uRLekp97ZPUbORsy0470I47mRaPeECgYLt3ULDsPI/6uyFBTXeq/KIc/eyBXu7Io5L8m KtVqAnkxNvbPVzoGmuoYK9k12r4yUS2YUMlUFTVM2PDiXMYt6p/TUCE0A4WRXKYCqF3O AaZ23ndnwRZx6VyQVD+J4QYG1Ow4gxAeXwRET2UAIGB8X1e/dMOumwbS1VYXVFNt3JZ3 4hQy6WbN7sj9rI+Ys5sSGhWMvx8IQ+axz5dGfB/zVuc9K3gEojmmbTczoxPHbPfUkg8D J0LQ== 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:delivered-to; bh=p3Yv2R5RYC9yvElXgp3jzLgKQfJFpeOlN5BUaQEzr0w=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=0o8qPwL64ZpBKZmWTC9wkQ9wgBKyjbPOQIodVKPE0EI5QgD0fl9WLqtkboy2T5VZY1 wnANsGeL8tFME222KeV4ijSrY5ib+Ca4shs9ZOSnkkcHZR809HoNtOIFYEIV5LvZnsCC O2OCvB87PeNIwl6N06yqZmsN5kyLmOXx7rdsyhfhCf5AZVdMKKWfWZIg0FMMeRbiE/N3 pD6NpqKu0vSjdd4HR63Cp6sEB+ROEUz2ZjPhWZG91NWR7S+k2X4driceDXuZAZu123W+ NEBW5J6kJ58crnHztVxVg8O4a8/WJDx5vIVlkMc+tqmaYRAvMMWAvvELvCeNTgE3n0/r 0X/Q==; dara=google.com 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a626cd95aa9si278897966b.874.2024.05.26.04.12.27; Sun, 26 May 2024 04:12:27 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B184068D4ED; Sun, 26 May 2024 14:12:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ursule.remlab.net (vps-a2bccee9.vps.ovh.net [51.75.19.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A0D6668D1FD for ; Sun, 26 May 2024 14:12:06 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 3327AC009A for ; Sun, 26 May 2024 14:12:06 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 May 2024 14:12:05 +0300 Message-ID: <20240526111205.21965-2-remi@remlab.net> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240526111205.21965-1-remi@remlab.net> References: <20240526092823.16116-1-remi@remlab.net> <20240526111205.21965-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] lavc/vp7dsp: R-V V vp7_idct_add 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: RW+HYetkPtOH Most of the code is shared with DC, thanks to minor earlier changes. vp7_idct_add_c: 5.2 vp7_idct_add_rvv_i32: 2.5 --- libavcodec/riscv/vp7dsp_init.c | 2 ++ libavcodec/riscv/vp7dsp_rvv.S | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/libavcodec/riscv/vp7dsp_init.c b/libavcodec/riscv/vp7dsp_init.c index 1406eb1c6a..ae7f2d4277 100644 --- a/libavcodec/riscv/vp7dsp_init.c +++ b/libavcodec/riscv/vp7dsp_init.c @@ -26,6 +26,7 @@ #include "libavcodec/vp8dsp.h" void ff_vp7_luma_dc_wht_rvv(int16_t block[4][4][16], int16_t dc[16]); +void ff_vp7_idct_add_rvv(uint8_t *dst, int16_t block[16], ptrdiff_t stride); av_cold void ff_vp7dsp_init_riscv(VP8DSPContext *c) { @@ -37,6 +38,7 @@ av_cold void ff_vp7dsp_init_riscv(VP8DSPContext *c) #if __riscv_xlen >= 64 c->vp8_luma_dc_wht = ff_vp7_luma_dc_wht_rvv; #endif + c->vp8_idct_add = ff_vp7_idct_add_rvv; } #endif } diff --git a/libavcodec/riscv/vp7dsp_rvv.S b/libavcodec/riscv/vp7dsp_rvv.S index 06e251f5ce..2a4c404bbb 100644 --- a/libavcodec/riscv/vp7dsp_rvv.S +++ b/libavcodec/riscv/vp7dsp_rvv.S @@ -97,4 +97,33 @@ func ff_vp7_luma_dc_wht_rvv, zve32x vnclip.wi v7, v3, 18 jr t0 endfunc + +func ff_vp7_idct_add_rvv, zve32x + jal t0, 1b + csrwi vxrm, 2 + vsetvli zero, zero, e8, mf4, ta, ma + vle8.v v12, (a0) + vle8.v v13, (t1) + vwaddu.wv v4, v4, v12 + vle8.v v14, (t2) + vwaddu.wv v5, v5, v13 + vle8.v v15, (t3) + vwaddu.wv v6, v6, v14 + vwaddu.wv v7, v7, v15 + vsetvli zero, zero, e16, mf2, ta, ma + vmax.vx v4, v4, zero + vmax.vx v5, v5, zero + vmax.vx v6, v6, zero + vmax.vx v7, v7, zero + vsetvli zero, zero, e8, mf4, ta, ma + vnclipu.wi v0, v4, 0 + vnclipu.wi v1, v5, 0 + vse8.v v0, (a0) + vnclipu.wi v2, v6, 0 + vse8.v v1, (t1) + vnclipu.wi v3, v7, 0 + vse8.v v2, (t2) + vse8.v v3, (t3) + ret +endfunc #endif