From patchwork Sun May 5 09:15:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: uk7b@foxmail.com X-Patchwork-Id: 48521 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:e68f:b0:1af:836d:81b3 with SMTP id mz15csp786861pzb; Sun, 5 May 2024 02:17:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXPMmoOVSQAz4OcyLhrYleBQbT6oTQw3WQGcH8geug7sBfif1Ex7el7ETYYwaDnKn5AdmNe/EwaTplEIsEzpH/qg7FWSFslx6NTtA== X-Google-Smtp-Source: AGHT+IEyzx6Jlk62LCzGFExy8lrN4WblvTjSt4TAnybbyXQvMRnfbcQ6IFuxBNzDIVashhnWVHnI X-Received: by 2002:a05:6402:4006:b0:571:bff5:b793 with SMTP id d6-20020a056402400600b00571bff5b793mr4672951eda.0.1714900657681; Sun, 05 May 2024 02:17:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714900657; cv=none; d=google.com; s=arc-20160816; b=Psx7Y29iqKDJx1uDuQgHl/YZriwlEd7kPNxaf8SZXFh5t/OrK82rOzzFpnrJI8k0on Zb9T7enOfMSHJ8v3k6kzhH8MryOHDeOcijd866Cb0i/kS5zXQ4xuSbCQhl8hjCJyyCBu kDJlGXQ4p7zoOUMh15je+22YjPGkN8TCmF16kSmV2gJifOXwHqesS350ZYYpSetUOpye M/LIWoWpEi4dDVOJjjxycjxbxH9T7gzp6SPis4Ked2WwNCXONiOFsO21N9ojvAIkrlIi 99kyaH/T160mGyLJQ9q5Q6+9Te59G4X6M6aT28QKIIhZyi7ICWOL1f3UNELDz1jrQxHt Nq+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=LJGHAaKh5XLu8cDDOErgzm5Dhp3QlwjS6AaUsv7KCKI=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=fAKHgKxraeYoJjKCTYNAqABXkyvnpqpElpomfy6x3ccBdHzfovqAIPUNMGx0lY8jOp 0X2wUUkhaXcrghaSipvdxwBkCfYnbQ5ETS1FwDU7T/gzUzdf841lySHdNYnu0BRSjxLm DwWP61jwL3xHPxHNMjN3iAy93KdL9J6PWPMNRhrvNPGK65SPBOevw1XCk2T4Ykv0eX8s zws5pVLEZV3AhIemwIXTcsHYC7bOyvy2sYiWPBnu/oFsIOQIn7pXyr/lbLKfHgF4jQEo Cc3lidokQTWn9HT9r110BUnfgF1pIM7KgUAA/RMI/dqeyYc2aU7R0u1tOFSvtcLFBIFn JKIw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=cH8DuOy7; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w23-20020a50d797000000b00571ba2839c4si2335193edi.130.2024.05.05.02.17.37; Sun, 05 May 2024 02:17:37 -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=@foxmail.com header.s=s201512 header.b=cH8DuOy7; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AA1C368D5A2; Sun, 5 May 2024 12:17:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-53.mail.qq.com (out203-205-251-53.mail.qq.com [203.205.251.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0EDEB68D534 for ; Sun, 5 May 2024 12:17:23 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1714900639; bh=ITechOYt+orlAFbDbIoJkpjutzTMx0KhAwS8lBWDa9M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cH8DuOy7usC+DLeZgdnEAZrDk2of1VJQ3Fbs/AK4O23hsclj11B+1JzU//bYGhSXE UM+92xpq1Pd28fuRBafdnzY4xF8Shl1Br2BXH35httCsLwWgGWupN6M+jtjzBQNzfr FKqVMpbssNwhrCDtkim3QdxzIthT4AsRx/k/i1YM= Received: from localhost.localdomain ([42.56.223.122]) by newxmesmtplogicsvrsza29-0.qq.com (NewEsmtp) with SMTP id 406288BB; Sun, 05 May 2024 17:16:06 +0800 X-QQ-mid: xmsmtpt1714900566t9owcava4 Message-ID: X-QQ-XMAILINFO: OUMxvQDaATie77OtZ6Bb2DnxpuPSCC+Iv/dKFeDCZSmkjj5CnRzo85gp6XM2ZA WvXoMs4asMqByygLrxu8K7XZ9tWzW+YF4UxEf5supykj7vB3atxIBRp6B6F04HrMgvvg2Cq2cHqP E6pCa9/a8Z9tvCJMhzMRVX6wdVh9tMs/f7FEXPLj5XdFPOCzsLE8tLvG59//ovU3tClWM7UzPVNV 3T21pTCKeTQM0p/Z+zRyr8mh2+bL/6Vd9UBbRHG04WU2yTw0fj0WQTXHtlx5ENFx722Enr/zk2t4 KrMb89Gq6CoKIYjTt9tn2caNgijBngILCPgYytpsQli615L0w52GjsM2dvg73eVt3xZgypVnikMh VVtJp63ueP5NYoqh0etemIDaYpKUqRuypnGrnLMGDeuyUWpCce5h5tdyYsvgJGtXDWu5yK3Ei/pj bHtPivTArMJiLiS2RaVlf0IMontW28uNKZP5GV5JdP7VXaKeRo3cf5TjbTrJ0E4ByRaCjMKPSN3J WA8XqRhWBftSmeDUX2KIYfwngXxoau8rUiu5l4K94xZy9KaL++qcsNUlY4SV1D3upshXJrhYendO sfURbycVdITV/KmxpEQrwr//5yQKSa5JIMmipFRuiULSAG0+qdZrHJjdPnkGBiq78fEhRg5v1Z6N n9Mb9DmpQsfCbnJnG2R0eG3jeVONzyH8m8llijfQ2BIHhw2alnqS8tPegUI9ADz2F2FpgZmCPki3 7VgVyGim1u6cfcYRLPocCC9+tdE70jkuzXsepBi6NI6Y4AWvPzWOEKXJs/hM4xpDoJ+8TYUM5GEp G0DCYpKm43oxj2uvXVfdmdK4y/sIzQxYCAITCKEsj7w8+EmOfzM6F6P9qQIg0FPsO6GpbW9OVVG4 Exrt7rKIDVmCsirYl/i01LYu0ljXkwtQ== X-QQ-XMRINFO: OWPUhxQsoeAVDbp3OJHYyFg= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 May 2024 17:15:58 +0800 X-OQ-MSGID: <20240505091558.3045960-1-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <7116774.evdviihFTz@basile.remlab.net> References: <7116774.evdviihFTz@basile.remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/vc1dsp: R-V V mspel_pixels 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tXa5hFuuHr4c From: sunyuechi vc1dsp.avg_vc1_mspel_pixels_tab[0][0]_c: 875.2 vc1dsp.avg_vc1_mspel_pixels_tab[0][0]_rvv_i32: 141.7 vc1dsp.avg_vc1_mspel_pixels_tab[1][0]_c: 226.5 vc1dsp.avg_vc1_mspel_pixels_tab[1][0]_rvv_i64: 56.2 vc1dsp.put_vc1_mspel_pixels_tab[0][0]_c: 529.5 vc1dsp.put_vc1_mspel_pixels_tab[0][0]_rvv_i32: 79.5 vc1dsp.put_vc1_mspel_pixels_tab[1][0]_c: 144.5 vc1dsp.put_vc1_mspel_pixels_tab[1][0]_rvi: 26.7 --- libavcodec/riscv/Makefile | 1 + libavcodec/riscv/vc1dsp_init.c | 16 +++++++++- libavcodec/riscv/vc1dsp_rvi.S | 37 ++++++++++++++++++++++ libavcodec/riscv/vc1dsp_rvv.S | 57 ++++++++++++++++++++++++++++++++++ 4 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 libavcodec/riscv/vc1dsp_rvi.S diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index 43b5c21cf4..cd5cc21cfd 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -59,6 +59,7 @@ RVV-OBJS-$(CONFIG_TAK_DECODER) += riscv/takdsp_rvv.o OBJS-$(CONFIG_UTVIDEO_DECODER) += riscv/utvideodsp_init.o 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_VP8DSP) += riscv/vp8dsp_init.o RVV-OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_rvv.o diff --git a/libavcodec/riscv/vc1dsp_init.c b/libavcodec/riscv/vc1dsp_init.c index e47b644f80..bddc4b65eb 100644 --- a/libavcodec/riscv/vc1dsp_init.c +++ b/libavcodec/riscv/vc1dsp_init.c @@ -29,19 +29,33 @@ void ff_vc1_inv_trans_8x8_dc_rvv(uint8_t *dest, ptrdiff_t stride, int16_t *block void ff_vc1_inv_trans_4x8_dc_rvv(uint8_t *dest, ptrdiff_t stride, int16_t *block); void ff_vc1_inv_trans_8x4_dc_rvv(uint8_t *dest, ptrdiff_t stride, int16_t *block); void ff_vc1_inv_trans_4x4_dc_rvv(uint8_t *dest, ptrdiff_t stride, int16_t *block); +void ff_put_pixels16x16_rvv(uint8_t *dst, const uint8_t *src, ptrdiff_t line_size, int rnd); +void ff_put_pixels8x8_rvi(uint8_t *dst, const uint8_t *src, ptrdiff_t line_size, int rnd); +void ff_avg_pixels16x16_rvv(uint8_t *dst, const uint8_t *src, ptrdiff_t line_size, int rnd); +void ff_avg_pixels8x8_rvv(uint8_t *dst, const uint8_t *src, ptrdiff_t line_size, int rnd); av_cold void ff_vc1dsp_init_riscv(VC1DSPContext *dsp) { -#if HAVE_RVV +#if HAVE_RV int flags = av_get_cpu_flags(); +# if __riscv_xlen >= 64 + if (flags & AV_CPU_FLAG_RVI) { + dsp->put_vc1_mspel_pixels_tab[1][0] = ff_put_pixels8x8_rvi; + } +# endif +#if HAVE_RVV if (flags & AV_CPU_FLAG_RVV_I32 && ff_get_rv_vlenb() >= 16) { dsp->vc1_inv_trans_4x8_dc = ff_vc1_inv_trans_4x8_dc_rvv; dsp->vc1_inv_trans_4x4_dc = ff_vc1_inv_trans_4x4_dc_rvv; + dsp->put_vc1_mspel_pixels_tab[0][0] = ff_put_pixels16x16_rvv; + dsp->avg_vc1_mspel_pixels_tab[0][0] = ff_avg_pixels16x16_rvv; if (flags & AV_CPU_FLAG_RVV_I64) { dsp->vc1_inv_trans_8x8_dc = ff_vc1_inv_trans_8x8_dc_rvv; dsp->vc1_inv_trans_8x4_dc = ff_vc1_inv_trans_8x4_dc_rvv; + dsp->avg_vc1_mspel_pixels_tab[1][0] = ff_avg_pixels8x8_rvv; } } #endif +#endif } diff --git a/libavcodec/riscv/vc1dsp_rvi.S b/libavcodec/riscv/vc1dsp_rvi.S new file mode 100644 index 0000000000..bee8e52f2e --- /dev/null +++ b/libavcodec/riscv/vc1dsp_rvi.S @@ -0,0 +1,37 @@ +/* + * 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" + +#if __riscv_xlen >= 64 +func ff_put_pixels8x8_rvi +.rept 7 + ld t0, (a1) + sd t0, (a0) + add a1, a1, a2 + add a0, a0, a2 +.endr + ld t0, (a1) + sd t0, (a0) + + ret +endfunc +#endif + diff --git a/libavcodec/riscv/vc1dsp_rvv.S b/libavcodec/riscv/vc1dsp_rvv.S index 4a00945ead..08c93476de 100644 --- a/libavcodec/riscv/vc1dsp_rvv.S +++ b/libavcodec/riscv/vc1dsp_rvv.S @@ -111,3 +111,60 @@ func ff_vc1_inv_trans_4x4_dc_rvv, zve32x vsse32.v v0, (a0), a1 ret endfunc + +.macro mspel_op op pos n1 n2 + add t1, \pos, a2 + v\op\()e8.v v\n1, (\pos) + sh1add \pos, a2, \pos + v\op\()e8.v v\n2, (t1) +.endm + +.macro mspel_op_all op pos a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 + mspel_op \op \pos \a1 \a2 + mspel_op \op \pos \a3 \a4 + mspel_op \op \pos \a5 \a6 + mspel_op \op \pos \a7 \a8 + mspel_op \op \pos \a9 \a10 + mspel_op \op \pos \a11 \a12 + mspel_op \op \pos \a13 \a14 + mspel_op \op \pos \a15 \a16 +.endm + +func ff_put_pixels16x16_rvv, zve32x + vsetivli zero, 16, e8, m1, ta, ma + mspel_op_all l a1 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 + mspel_op_all s a0 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 + + ret +endfunc + +func ff_avg_pixels16x16_rvv, zve32x + csrwi vxrm, 0 + vsetivli zero, 16, e8, m1, ta, ma + li t0, 128 + mspel_op_all l a1 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 + mspel_op_all l a0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + vsetvli zero, t0, e8, m8, ta, ma + sub a0, a0, a2 + vaaddu.vv v0, v0, v16 + neg a2, a2 + vaaddu.vv v8, v8, v24 + vsetivli zero, 16, e8, m1, ta, ma + mspel_op_all s a0 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0 + + ret +endfunc + +func ff_avg_pixels8x8_rvv, zve64x + csrwi vxrm, 0 + li t0, 64 + vsetivli zero, 8, e8, mf2, ta, ma + vlse64.v v16, (a1), a2 + vlse64.v v8, (a0), a2 + vsetvli zero, t0, e8, m4, ta, ma + vaaddu.vv v16, v16, v8 + vsetivli zero, 8, e8, mf2, ta, ma + vsse64.v v16, (a0), a2 + + ret +endfunc