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 D6EA94B837 for ; Sat, 15 Jun 2024 11:51:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 49DA968D63E; Sat, 15 Jun 2024 14:51:02 +0300 (EEST) Received: from out203-205-251-82.mail.qq.com (out203-205-251-82.mail.qq.com [203.205.251.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A4BF068D50E for ; Sat, 15 Jun 2024 14:50:51 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1718452242; bh=WJyeDL9DUA0zCqYA9P7kQ6FOHUfKloPLBNvKbbMfPBg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eEw6QcktHjzE0fzDwYzPtyeArI0IiUSkrHSQIosb8lNkDyTtKEfaFZgY1pdkGZV9Q FtAWkIO0iLmy4pqo6ta00/Ub/oAd9sSS3czsA506v+VMh/gYPG2H/No89ED4fpVtI/ AMo8QQCO7Ra03EAq6NctjVDsyfjaGhUBz6FVNGek= Received: from localhost.localdomain ([113.236.90.228]) by newxmesmtplogicsvrszb16-1.qq.com (NewEsmtp) with SMTP id CA804889; Sat, 15 Jun 2024 19:50:40 +0800 X-QQ-mid: xmsmtpt1718452241t1mjymm2z Message-ID: X-QQ-XMAILINFO: MH5d/PVfwqP9LNfSCwuy9x0tTIUeMde3ey6yHiT/acJRHcH+K8lYGcvKCE9ZSa B7fNKpKquAKbczsdrr27r0+1UlwsZMv9Y/i/XPTz5YtJ25taWFKtGJws6sztGlbptthmvW2uPphu 3HXeyoGZmDABhl5aG8lAshFNwR7SR/Din98y4gYH4pxyF015IOahslWOMYbYzX8jv1nTcMf/Z15j fynYhuCzBwx0i89j2ONcUIu5MMHiAnsGV9Eg7KUYZeeu906KZw4+ARVxB2LfYRZdNDOQu8nufrch x5221Jid/95TpK8a2VoMXyV6AlYRnEaQBEcpN7wxEdT5HdRuLfuWNPaKQ1ZA4b/4DJ3TflbPq9+7 NVytDgUjucpu+kmCFETKWOxW0kiC/0h48TGcOIsx+uETGyhiDHDdoZuzPNGGGW85FoMdKI7dF9rE Ohh+YUuMVbrkU/bduOP0NQvHDiZwcUdzto1JEu0E7u6IpSn5k7eTlw9lN2dHmjMq3zZtrU3+Wvq0 KiWhQjVVMy20/3jJ6HjfRdL8b43GA92+ZpO+2YtfGQ/90Np39IthrTNfDYzLksUVADIQFvB7VCZQ eL0VUnFoQUakjWK+7n0W0jUAfK1ZFaQviq8lpqWL6R2k03pD5yy9s6YGSxi0EbkUP+cxYTypqq4i Aja0VY9s5D5+x2XaoQNXWaYg9qyqyD+YbSPmYXullkXC+DeQZdtvyjAxK6MesokPGTp6ZHHLRLEF C/vbpAV8Nevo2LtGaohfAzeNzwVs9+1jGIjwNjigav4VuijXETJuLq+qKBdbtlVZ9D7grkMZQnND MPl3agPbwOjOfogKlmbx2leZLxGknYBeP5bMkHQ/M0/4cNvISqYXcHf8MhvgU3aHKbSnUUSUqi1F yFFXYw75E2QUKSbdUUab3koeh93hctHeQGkt1yBy/2dcG4DkdH5mgagO0IV+hs1VU8vDzS9qtw X-QQ-XMRINFO: OD9hHCdaPRBwq3WW+NvGbIU= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 15 Jun 2024 19:50:32 +0800 X-OQ-MSGID: <20240615115034.3891490-2-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240615115034.3891490-1-uk7b@foxmail.com> References: <20240615115034.3891490-1-uk7b@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 2/4] lavc/vp9dsp: R-V V mc bilin hv 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: sunyuechi 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: From: sunyuechi C908 X60 vp9_avg_bilin_4hv_8bpp_c : 10.7 9.5 vp9_avg_bilin_4hv_8bpp_rvv_i32 : 4.0 3.5 vp9_avg_bilin_8hv_8bpp_c : 38.5 34.2 vp9_avg_bilin_8hv_8bpp_rvv_i32 : 7.2 6.5 vp9_avg_bilin_16hv_8bpp_c : 147.2 130.5 vp9_avg_bilin_16hv_8bpp_rvv_i32 : 14.5 12.7 vp9_avg_bilin_32hv_8bpp_c : 574.2 509.7 vp9_avg_bilin_32hv_8bpp_rvv_i32 : 42.5 38.0 vp9_avg_bilin_64hv_8bpp_c : 2321.2 2017.7 vp9_avg_bilin_64hv_8bpp_rvv_i32 : 163.5 131.0 vp9_put_bilin_4hv_8bpp_c : 10.0 8.7 vp9_put_bilin_4hv_8bpp_rvv_i32 : 3.5 3.0 vp9_put_bilin_8hv_8bpp_c : 35.2 31.2 vp9_put_bilin_8hv_8bpp_rvv_i32 : 6.5 5.7 vp9_put_bilin_16hv_8bpp_c : 134.0 119.0 vp9_put_bilin_16hv_8bpp_rvv_i32 : 12.7 11.5 vp9_put_bilin_32hv_8bpp_c : 538.5 464.2 vp9_put_bilin_32hv_8bpp_rvv_i32 : 39.7 35.2 vp9_put_bilin_64hv_8bpp_c : 2111.7 1833.2 vp9_put_bilin_64hv_8bpp_rvv_i32 : 138.5 122.5 --- libavcodec/riscv/vp9_mc_rvv.S | 38 +++++++++++++++++++++++++++++++++- libavcodec/riscv/vp9dsp_init.c | 10 +++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/libavcodec/riscv/vp9_mc_rvv.S b/libavcodec/riscv/vp9_mc_rvv.S index fb7377048a..5241562531 100644 --- a/libavcodec/riscv/vp9_mc_rvv.S +++ b/libavcodec/riscv/vp9_mc_rvv.S @@ -147,6 +147,40 @@ func ff_\op\()_vp9_bilin_64\type\()_rvv, zve32x endfunc .endm +.macro bilin_hv op +func ff_\op\()_vp9_bilin_64hv_rvv, zve32x + vsetvlstatic8 64, t0, 64 +.Lbilin_hv\op: +.ifc \op,avg + csrwi vxrm, 0 +.endif + neg t1, a5 + neg t2, a6 + li t4, 8 + bilin_load_h v24, put, a5 + add a2, a2, a3 +1: + addi a4, a4, -1 + bilin_load_h v4, put, a5 + vwmulu.vx v16, v4, a6 + vwmaccsu.vx v16, t2, v24 + vwadd.wx v16, v16, t4 + vnsra.wi v16, v16, 4 + vadd.vv v0, v16, v24 +.ifc \op,avg + vle8.v v16, (a0) + vaaddu.vv v0, v0, v16 +.endif + vse8.v v0, (a0) + vmv.v.v v24, v4 + add a2, a2, a3 + add a0, a0, a1 + bnez a4, 1b + + ret +endfunc +.endm + .irp len, 64, 32, 16, 8, 4 copy_avg \len .endr @@ -155,6 +189,8 @@ bilin_h_v put, h, a5 bilin_h_v avg, h, a5 bilin_h_v put, v, a6 bilin_h_v avg, v, a6 +bilin_hv put +bilin_hv avg .macro func_bilin_h_v len, op, type func ff_\op\()_vp9_bilin_\len\()\type\()_rvv, zve32x @@ -165,7 +201,7 @@ endfunc .irp len, 32, 16, 8, 4 .irp op, put, avg - .irp type, h, v + .irp type, h, v, hv func_bilin_h_v \len, \op, \type .endr .endr diff --git a/libavcodec/riscv/vp9dsp_init.c b/libavcodec/riscv/vp9dsp_init.c index 9606d8545f..b3700dfb08 100644 --- a/libavcodec/riscv/vp9dsp_init.c +++ b/libavcodec/riscv/vp9dsp_init.c @@ -83,6 +83,16 @@ static av_cold void vp9dsp_mc_init_riscv(VP9DSPContext *dsp, int bpp) dsp->mc[4][FILTER_BILINEAR ][0][1][0] = ff_put_vp9_bilin_4h_rvv; dsp->mc[4][FILTER_BILINEAR ][1][0][1] = ff_avg_vp9_bilin_4v_rvv; dsp->mc[4][FILTER_BILINEAR ][1][1][0] = ff_avg_vp9_bilin_4h_rvv; + dsp->mc[0][FILTER_BILINEAR ][0][1][1] = ff_put_vp9_bilin_64hv_rvv; + dsp->mc[0][FILTER_BILINEAR ][1][1][1] = ff_avg_vp9_bilin_64hv_rvv; + dsp->mc[1][FILTER_BILINEAR ][0][1][1] = ff_put_vp9_bilin_32hv_rvv; + dsp->mc[1][FILTER_BILINEAR ][1][1][1] = ff_avg_vp9_bilin_32hv_rvv; + dsp->mc[2][FILTER_BILINEAR ][0][1][1] = ff_put_vp9_bilin_16hv_rvv; + dsp->mc[2][FILTER_BILINEAR ][1][1][1] = ff_avg_vp9_bilin_16hv_rvv; + dsp->mc[3][FILTER_BILINEAR ][0][1][1] = ff_put_vp9_bilin_8hv_rvv; + dsp->mc[3][FILTER_BILINEAR ][1][1][1] = ff_avg_vp9_bilin_8hv_rvv; + dsp->mc[4][FILTER_BILINEAR ][0][1][1] = ff_put_vp9_bilin_4hv_rvv; + dsp->mc[4][FILTER_BILINEAR ][1][1][1] = ff_avg_vp9_bilin_4hv_rvv; #undef init_fpel } -- 2.45.2 _______________________________________________ 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".