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 B536F47332 for ; Sat, 4 May 2024 15:04:23 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2373D68D7A9; Sat, 4 May 2024 18:03:42 +0300 (EEST) Received: from out203-205-221-233.mail.qq.com (out203-205-221-233.mail.qq.com [203.205.221.233]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D3B768D767 for ; Sat, 4 May 2024 18:03:31 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1714835002; bh=/gD8Ugrwd00twentgiK+mcWmQ148JA60y/gwXvXV+fA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VgjVH6BNs4nZCMFYiCwB90D+T6pu5c5G3kp9p4aGBkunXHIJU8vwrXblaPwLpSR1v Dr0dWUupIDJc88lcx72hvI7RPbcAFsoJT5l8fM/3i3ceupuxD4e2TeLh/aJCqGop0n a3NwjziKcLlRVIfk7ZaTZ9+TRIjrLL5ADlUf7gdw= Received: from localhost.localdomain ([42.56.223.122]) by newxmesmtplogicsvrsza15-1.qq.com (NewEsmtp) with SMTP id D215A30; Sat, 04 May 2024 23:03:18 +0800 X-QQ-mid: xmsmtpt1714835001tljvw0ndr Message-ID: X-QQ-XMAILINFO: MJ0QbbALek+qjK6Q94zkunpDiWRP/TFlXuzv5NmLKiZVk5sFbwjYFqEWQOEnrw +4SlKYv6gcNIZ0dr4T0IinzgP5C9Imf2tndPuUqjJKm4k5JHBBQ9MGjs8lDdbJQl21h+sYAjjYBq 6Z/smLvzJyVNHCdk0f5oD1b23P/M/zYdQQspAJgJMBnwndfSH1Mr/Asv2aXXN2aRSFFVz0EiJn4d cG9zUy5567dlYDupU1Kt2GpHJJKazgfAcyOzvA1HOaQ3rBKWcgu6/KkkcsntxuvZY1uGMn805sOF fMNrYjjNpU7UkhyAtR5rVu1I3ktIiZGizm3IC2kfhzUAbeLUPwJmtDErqKMMUZ+oYNHBKGQFArbE n0nJsHSN6JzYkgv4A+e0fkxO+Kv9Zdegtc2arGcJ++tA2ZZumqsozysPdHjk33BKtRGay/8KDH6+ lKyB0w4ANJIW8/lWryYWf6va/DVOy8LJ+aWa7ypQXynbL/WlobfQd2pVZztEeWdu7+9g3tgiy31Q pvug5aK0qLNb0+uAcLQ6QNSMXheczbSFyJCVu7tsH2Az0FMofDVidYSMRuCSqGo4e4bn1RFdYmnE WlCnfdMbuPfBk4p+IvyJSwWOvW0bJWkYEQeMz7wrF5XcJTb6fipmV1VkPL2MsYHVBHdgqo45KNCa W+C3iX+I6OalYe3WSYgIILsxan9cbjmYj/5GdOVkguW7jjWSKYnK4tBgWCOy1hjD08RqIlU9YOUf EEdmeb7ub+n9whHUTCXZlbPKBcttNSaiwxxKXkAmF5/JzfGugYjEbzM/05gl9fpGvY6k4oLS9xMa E/LKv6CDFt25QmCHXqGa0awl/RbIRlgboky3nWzgaKhNuBalH+pRDYXPZ/tE+uig8ZWkJFGqA5zI drHgcUC1ggv9w55rLsZlPgLlcYY+nAJpL7F0NtqKBfqV0eGNiG+r5NhyJhKJsUWVr6Fae2KMFQTn qfdsJUiiyUvvsll2NDg/zC6YpLdql3 X-QQ-XMRINFO: Mp0Kj//9VHAxr69bL5MkOOs= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 May 2024 23:03:07 +0800 X-OQ-MSGID: <20240504150313.2472910-4-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240504150313.2472910-1-uk7b@foxmail.com> References: <20240504150313.2472910-1-uk7b@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/10] lavc/vp9dsp: R-V mc copy_avg 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: vp9_avg4_8bpp_c: 1.2 vp9_avg4_8bpp_rvv_i64: 1.0 vp9_avg8_8bpp_c: 3.7 vp9_avg8_8bpp_rvv_i64: 1.5 vp9_avg16_8bpp_c: 14.7 vp9_avg16_8bpp_rvv_i64: 3.5 vp9_avg32_8bpp_c: 57.7 vp9_avg32_8bpp_rvv_i64: 10.0 vp9_avg64_8bpp_c: 229.0 vp9_avg64_8bpp_rvv_i64: 31.7 vp9_put4_8bpp_c: 0.7 vp9_put4_8bpp_rvi: 0.2 vp9_put8_8bpp_c: 2.5 vp9_put8_8bpp_rvi: 0.5 vp9_put16_8bpp_c: 16.5 vp9_put16_8bpp_rvv_i64: 1.7 vp9_put32_8bpp_c: 37.2 vp9_put32_8bpp_rvv_i64: 5.7 vp9_put64_8bpp_c: 91.2 vp9_put64_8bpp_rvv_i64: 19.7 --- libavcodec/riscv/Makefile | 4 ++- libavcodec/riscv/vp9_mc_rvi.S | 43 +++++++++++++++++++++++ libavcodec/riscv/vp9_mc_rvv.S | 64 ++++++++++++++++++++++++++++++++++ libavcodec/riscv/vp9dsp_init.c | 47 +++++++++++++++++++++++++ 4 files changed, 157 insertions(+), 1 deletion(-) create mode 100644 libavcodec/riscv/vp9_mc_rvi.S create mode 100644 libavcodec/riscv/vp9_mc_rvv.S diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index 050c08ee61..43b5c21cf4 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -63,6 +63,8 @@ RVV-OBJS-$(CONFIG_VC1DSP) += riscv/vc1dsp_rvv.o OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_init.o RVV-OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_rvv.o OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9dsp_init.o -RVV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvv.o +RV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_mc_rvi.o +RVV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvv.o \ + riscv/vp9_mc_rvv.o OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_init.o RVV-OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_rvv.o diff --git a/libavcodec/riscv/vp9_mc_rvi.S b/libavcodec/riscv/vp9_mc_rvi.S new file mode 100644 index 0000000000..03d8dbbbae --- /dev/null +++ b/libavcodec/riscv/vp9_mc_rvi.S @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS). + * + * 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" + +func ff_copy8_rvi +1: + addi a4, a4, -1 + ld t4, (a2) + sd t4, (a0) + add a2, a2, a3 + add a0, a0, a1 + bnez a4, 1b + ret +endfunc + +func ff_copy4_rvi +1: + addi a4, a4, -1 + lw t4, (a2) + sw t4, (a0) + add a2, a2, a3 + add a0, a0, a1 + bnez a4, 1b + ret +endfunc diff --git a/libavcodec/riscv/vp9_mc_rvv.S b/libavcodec/riscv/vp9_mc_rvv.S new file mode 100644 index 0000000000..ba9ec3431f --- /dev/null +++ b/libavcodec/riscv/vp9_mc_rvv.S @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS). + * + * 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" + +.macro copy_avg len type +.ifc \type,avg + csrwi vxrm, 0 +.endif +.ifc \len,64 + li t5, 64 + vsetvli t0, t5, e8, m4, ta, ma +.elseif \len == 32 + li t5, 32 + vsetvli t0, t5, e8, m2, ta, ma +.elseif \len == 16 + vsetivli t0, 16, e8, m1, ta, ma +.elseif \len == 8 + vsetivli t0, 8, e8, mf2, ta, ma +.elseif \len == 4 + vsetivli t0, 4, e8, mf4, ta, ma +.endif +1: + addi a4, a4, -1 + vle8.v v8, (a2) +.ifc \type,avg + vle8.v v16, (a0) + vaaddu.vv v8, v8, v16 +.endif + vse8.v v8, (a0) + add a2, a2, a3 + add a0, a0, a1 + bnez a4, 1b + ret +.endm + +.irp len 64, 32, 16 +func ff_copy\len\()_rvv, zve32x + copy_avg \len copy +endfunc +.endr + +.irp len 64, 32, 16, 8, 4 +func ff_avg\len\()_rvv, zve32x + copy_avg \len avg +endfunc +.endr diff --git a/libavcodec/riscv/vp9dsp_init.c b/libavcodec/riscv/vp9dsp_init.c index f08c8f6a42..da33e15e97 100644 --- a/libavcodec/riscv/vp9dsp_init.c +++ b/libavcodec/riscv/vp9dsp_init.c @@ -65,7 +65,54 @@ static av_cold void vp9dsp_intrapred_init_rvv(VP9DSPContext *dsp, int bpp) #endif } +static av_cold void vp9dsp_mc_init_rvv(VP9DSPContext *dsp, int bpp) +{ +#if HAVE_RV + int flags = av_get_cpu_flags(); + + if (bpp == 8 && flags & AV_CPU_FLAG_RVI) { + dsp->mc[3][FILTER_8TAP_SMOOTH][0][0][0] = ff_copy8_rvi; + dsp->mc[3][FILTER_8TAP_REGULAR][0][0][0] = ff_copy8_rvi; + dsp->mc[3][FILTER_8TAP_SHARP][0][0][0] = ff_copy8_rvi; + dsp->mc[3][FILTER_BILINEAR][0][0][0] = ff_copy8_rvi; + dsp->mc[4][FILTER_8TAP_SMOOTH][0][0][0] = ff_copy4_rvi; + dsp->mc[4][FILTER_8TAP_REGULAR][0][0][0] = ff_copy4_rvi; + dsp->mc[4][FILTER_8TAP_SHARP][0][0][0] = ff_copy4_rvi; + dsp->mc[4][FILTER_BILINEAR][0][0][0] = ff_copy4_rvi; + } + +#if HAVE_RVV + if (bpp == 8 && flags & AV_CPU_FLAG_RVV_I64 && ff_get_rv_vlenb() >= 16) { + +#define init_fpel(idx1, idx2, sz, type) \ + dsp->mc[idx1][FILTER_8TAP_SMOOTH ][idx2][0][0] = ff_##type##sz##_rvv; \ + dsp->mc[idx1][FILTER_8TAP_REGULAR][idx2][0][0] = ff_##type##sz##_rvv; \ + dsp->mc[idx1][FILTER_8TAP_SHARP ][idx2][0][0] = ff_##type##sz##_rvv; \ + dsp->mc[idx1][FILTER_BILINEAR ][idx2][0][0] = ff_##type##sz##_rvv + +#define init_copy_avg(idx, sz) \ + init_fpel(idx, 0, sz, copy); \ + init_fpel(idx, 1, sz, avg) + +#define init_avg(idx, sz) \ + init_fpel(idx, 1, sz, avg) + + init_copy_avg(0, 64); + init_copy_avg(1, 32); + init_copy_avg(2, 16); + init_avg(3, 8); + init_avg(4, 4); + +#undef init_copy_avg +#undef init_avg +#undef init_fpel + } +#endif +#endif +} + av_cold void ff_vp9dsp_init_riscv(VP9DSPContext *dsp, int bpp, int bitexact) { vp9dsp_intrapred_init_rvv(dsp, bpp); + vp9dsp_mc_init_rvv(dsp, bpp); } -- 2.45.0 _______________________________________________ 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".