From patchwork Wed May 15 17:10:48 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: 48901 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp1740704pzb; Wed, 15 May 2024 10:11:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUI6M2/VpZrj9BX+UFtScvM5RgF1er87f4LgvGFg1cBjiWupDYs+7c1F+D/V4rEj6mS4Nv9ThUXZp3/biHKvOq3wJoEz1omky/O0Q== X-Google-Smtp-Source: AGHT+IFbzZNHLk2iI5kcp5XiRUX4AtU9av8Cif/SH424ta4l/mvgPUIAaBG5iGVL0D9hMPEbkxGo X-Received: by 2002:a17:907:30c5:b0:a5c:e0c3:fb38 with SMTP id a640c23a62f3a-a5ce0c3fc6bmr21874566b.31.1715793061845; Wed, 15 May 2024 10:11:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715793061; cv=none; d=google.com; s=arc-20160816; b=CgwlrLdiXXXKRJqKXM+HEMpTZ5yjnzBWYv4C8mXQlXvdHeGPmton4bRCGihPXDkPcB NQpom2/bsZXpLjv8jzbVLYqOyQEROJsQfFeiS1TrvmpikGGApQtmwFdPnqXqjNT9zjAV H5tmfpcluVBD+YMHORKJpX0YL994Zlp5VnPmItphPsduB4xcgFliWsQGmET3Z/hlBzES hXQa+KjtFSPLGBBdXFWzV05iAnLQhsluoAkVNXQJKpeLP03Kb+ymhF0GFV5CTagbPe+W gbSO0tRnQJF3KkArAcJ8Zk/FCtUtpsWkADbl1/a1L+leLvoTBffcyC0NZnbNyXD4Zcl0 f5MQ== 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=Qv2UN9fVamE9oXQAmYS0Mmw02+7Y3/SQ41oZv7/ph8c=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=flSgibfmScJSiCQzYwBkGPAIrNDOLxmXG2nw1UnJiJlDrkwcKB2HPlO3qptFyUBSeM IHh/gGehdk9/Cm2wTQfYi6er9Y9COQpy+sjiHo5ETHUOdoKo6w0w0hSVhPRTBBy8vdiT WVySwOivivmaukTMCux0TOzYSb0RF2yn15g24lfY8btCrqd+Icg3Cqt9Pk65lnVOQzyF LugnSoAIKVYX2ZEO9A2mmxintPOK29F+MJwX+fLVJS3gK+vPvB4gN8uW8l3m8/E0P3bv 1R2ZuGjw3pbjuGJnc9Xs38rQxBZEOvwt1VuFm/sZ4Kt2G9bumFE/9YpG+0q9NR198aN2 8Mkw==; 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-a5a89cd347fsi180418766b.585.2024.05.15.10.11.01; Wed, 15 May 2024 10:11:01 -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 88EE768D66B; Wed, 15 May 2024 20:10:57 +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 EB20A68CF1F for ; Wed, 15 May 2024 20:10:50 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 0FC63C006D for ; Wed, 15 May 2024 20:10:50 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 May 2024 20:10:48 +0300 Message-ID: <20240515171049.14567-1-remi@remlab.net> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCHv2 1/2] lavc/startcode: add R-V Zbb startcode_find_candidate 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: IBLPwX7Mcmgj --- libavcodec/h264dsp.c | 2 + libavcodec/h264dsp.h | 2 + libavcodec/riscv/Makefile | 2 + libavcodec/riscv/h264dsp_init.c | 40 +++++++++++++++ libavcodec/riscv/startcode_rvb.S | 83 ++++++++++++++++++++++++++++++++ libavcodec/riscv/vc1dsp_init.c | 7 ++- 6 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 libavcodec/riscv/h264dsp_init.c create mode 100644 libavcodec/riscv/startcode_rvb.S diff --git a/libavcodec/h264dsp.c b/libavcodec/h264dsp.c index 4d2ee10bab..1ba936be1c 100644 --- a/libavcodec/h264dsp.c +++ b/libavcodec/h264dsp.c @@ -158,6 +158,8 @@ av_cold void ff_h264dsp_init(H264DSPContext *c, const int bit_depth, ff_h264dsp_init_arm(c, bit_depth, chroma_format_idc); #elif ARCH_PPC ff_h264dsp_init_ppc(c, bit_depth, chroma_format_idc); +#elif ARCH_RISCV + ff_h264dsp_init_riscv(c, bit_depth, chroma_format_idc); #elif ARCH_X86 ff_h264dsp_init_x86(c, bit_depth, chroma_format_idc); #elif ARCH_MIPS diff --git a/libavcodec/h264dsp.h b/libavcodec/h264dsp.h index e0880c4d88..4a9cb1568d 100644 --- a/libavcodec/h264dsp.h +++ b/libavcodec/h264dsp.h @@ -125,6 +125,8 @@ void ff_h264dsp_init_arm(H264DSPContext *c, const int bit_depth, const int chroma_format_idc); void ff_h264dsp_init_ppc(H264DSPContext *c, const int bit_depth, const int chroma_format_idc); +void ff_h264dsp_init_riscv(H264DSPContext *c, const int bit_depth, + const int chroma_format_idc); void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth, const int chroma_format_idc); void ff_h264dsp_init_mips(H264DSPContext *c, const int bit_depth, diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index 27b268ae39..e87a2a9f9f 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -28,6 +28,7 @@ OBJS-$(CONFIG_JPEG2000_DECODER) += riscv/jpeg2000dsp_init.o RVV-OBJS-$(CONFIG_JPEG2000_DECODER) += riscv/jpeg2000dsp_rvv.o OBJS-$(CONFIG_H264CHROMA) += riscv/h264_chroma_init_riscv.o RVV-OBJS-$(CONFIG_H264CHROMA) += riscv/h264_mc_chroma.o +OBJS-$(CONFIG_H264DSP) += riscv/h264dsp_init.o OBJS-$(CONFIG_HUFFYUV_DECODER) += riscv/huffyuvdsp_init.o RVV-OBJS-$(CONFIG_HUFFYUV_DECODER) += riscv/huffyuvdsp_rvv.o OBJS-$(CONFIG_IDCTDSP) += riscv/idctdsp_init.o @@ -51,6 +52,7 @@ OBJS-$(CONFIG_RV34DSP) += riscv/rv34dsp_init.o RVV-OBJS-$(CONFIG_RV34DSP) += riscv/rv34dsp_rvv.o OBJS-$(CONFIG_RV40_DECODER) += riscv/rv40dsp_init.o RVV-OBJS-$(CONFIG_RV40_DECODER) += riscv/rv40dsp_rvv.o +RV-OBJS-$(CONFIG_STARTCODE) += riscv/startcode_rvb.o OBJS-$(CONFIG_SVQ1_ENCODER) += riscv/svqenc_init.o RVV-OBJS-$(CONFIG_SVQ1_ENCODER) += riscv/svqenc_rvv.o OBJS-$(CONFIG_TAK_DECODER) += riscv/takdsp_init.o diff --git a/libavcodec/riscv/h264dsp_init.c b/libavcodec/riscv/h264dsp_init.c new file mode 100644 index 0000000000..60c84734cd --- /dev/null +++ b/libavcodec/riscv/h264dsp_init.c @@ -0,0 +1,40 @@ +/* + * Copyright © 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 + +#include "libavutil/attributes.h" +#include "libavutil/cpu.h" +#include "libavcodec/h264dsp.h" + +extern int ff_startcode_find_candidate_rvb(const uint8_t *, int); + +av_cold void ff_h264dsp_init_riscv(H264DSPContext *dsp, const int bit_depth, + const int chroma_format_idc) +{ +#if HAVE_RV + int flags = av_get_cpu_flags(); + + if (flags & AV_CPU_FLAG_RVB_BASIC) + dsp->startcode_find_candidate = ff_startcode_find_candidate_rvb; +#endif +} diff --git a/libavcodec/riscv/startcode_rvb.S b/libavcodec/riscv/startcode_rvb.S new file mode 100644 index 0000000000..c043d59809 --- /dev/null +++ b/libavcodec/riscv/startcode_rvb.S @@ -0,0 +1,83 @@ +/* + * Copyright © 2024 Rémi Denis-Courmont. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include "libavutil/riscv/asm.S" + + .macro lx rd, addr +#if (__riscv_xlen == 32) + lw \rd, \addr +#elif (__riscv_xlen == 64) + ld \rd, \addr +#else + lq \rd, \addr +#endif + .endm + +func ff_startcode_find_candidate_rvb, zbb + add a1, a0, a1 + + // Potentially unaligned head + andi t0, a0, -(__riscv_xlen / 8) + beq a0, a1, 2f + + andi t1, a0, (__riscv_xlen / 8) - 1 + lx t2, (t0) + li t3, __riscv_xlen + orc.b t2, t2 + slli t1, t1, 3 + not t2, t2 + sub t3, t3, t1 + srl t2, t2, t1 + addi t0, t0, __riscv_xlen / 8 + sll t2, t2, t1 + bnez t2, 4f + + // Main loop (including potentially short tail) + bge t0, a1, 2f + li t3, -1 +1: + lx t2, (t0) + addi t0, t0, __riscv_xlen / 8 + orc.b t2, t2 + bne t2, t3, 3f // t2 != -1 iff (at least one) zero byte + blt t0, a1, 1b + +2: // No zero byte found + sub a0, a1, a0 + ret + +3: // Zero byte found in main loop + not t2, t2 +4: // Zero byte found in head + ctz t2, t2 + addi t0, t0, -(__riscv_xlen / 8) // back-track + srl t2, t2, 3 + add t0, t0, t2 + // Uncomment the following line for exact POSIX C strnlen() semantics. + //minu t0, t0, a1 // ignore zero byte in tail + sub a0, t0, a0 + ret +endfunc diff --git a/libavcodec/riscv/vc1dsp_init.c b/libavcodec/riscv/vc1dsp_init.c index eea389a1a1..844f39b891 100644 --- a/libavcodec/riscv/vc1dsp_init.c +++ b/libavcodec/riscv/vc1dsp_init.c @@ -29,12 +29,16 @@ 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); +int ff_startcode_find_candidate_rvb(const uint8_t *, int); av_cold void ff_vc1dsp_init_riscv(VC1DSPContext *dsp) { -#if HAVE_RVV +#if HAVE_RV int flags = av_get_cpu_flags(); + if (flags & AV_CPU_FLAG_RVB_BASIC) + dsp->startcode_find_candidate = ff_startcode_find_candidate_rvb; +# if HAVE_RVV if (flags & AV_CPU_FLAG_RVV_I32 && ff_rv_vlen_least(128)) { 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; @@ -43,5 +47,6 @@ av_cold void ff_vc1dsp_init_riscv(VC1DSPContext *dsp) dsp->vc1_inv_trans_8x4_dc = ff_vc1_inv_trans_8x4_dc_rvv; } } +# endif #endif } From patchwork Wed May 15 17:10:49 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: 48902 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp1740833pzb; Wed, 15 May 2024 10:11:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVPQbwxOxRqwVVBIhAom2Sy/ePC5SIXlojLe+oQptf2MSOz+jRRFKgIPHHjGPgkORCietB8OVPjq73Vu3CpJFKHaLb6pbTq5io7PA== X-Google-Smtp-Source: AGHT+IHQkQ806bSgPer1QtvAypUcc7e6qPAPcdMin2qPtmSGuksaIwmxxwN01odrIHQLo9hfAMQR X-Received: by 2002:a50:d496:0:b0:572:3bcc:8370 with SMTP id 4fb4d7f45d1cf-5734d4417b4mr9905892a12.0.1715793073764; Wed, 15 May 2024 10:11:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715793073; cv=none; d=google.com; s=arc-20160816; b=YwcoPFgF1xIcsme488rRmhLBSSNYDt14kmvtUln4QNaWdzl7wCNN8bYBgkIDopgxiz /bV0Q0ZFWTXhR52q4ZMtnHRGJSXXPSgSnTNptdz0Rc8ltDOWuK/GjXVd3XktVoOwQ6fr 3Jd2xNC5sqxYNbZMkW4ei2XYZAGSYYunYGUQrTAbJTPXqWpRZGaUiG68Hnr8mGGNJ6+R fQ7ALAALht8uCLIaVyaLSIm6ZE6Hd/1rPjG4N7byJqwyI2JCrmXT+2oyetlZGVWBWmya R8P6EdgQyTb0yVepaH7j/BPLP76Zham/YBBqbUamyRmifhQWgoQuMDPfDW/BZtKjwaAw pkOQ== 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=4FoU9xSnh0xOvJK7EULhAqNYCaCxkb84C9yHfcWAiv4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=EFRcwsp5+SwMTbKrbfLUdWO9mbAMJ/0O6tO8bWCd2QvU64/FvvlKHWT029Ewq9omVN +1wBhNDLdMck91DCiH13UpOANhWHplkew6go5IGylsdczrzZ+WHHhzA0oFghOaLp6g6J Yn/7YaPntUT/dOWdYincb2PGNB/ENhw4Xcx6rfOAUZcHyFv3Y2cdIGO2x++LGGgIrL3l 1Tet1/j0FXFUdfrxuQqSVcl6qmXYcN7d/lWGQHMbDTShFJdXTlRIK7qejgrcId2dCIFc Cvjgxlonp62399WguOtqqHwJEK87Fm5V9osJu5C6M2vn31cpVEVrNfVijN/BJCZeDPxf dJWw==; 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-574cd64acbcsi3554417a12.246.2024.05.15.10.11.12; Wed, 15 May 2024 10:11:13 -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 8A8A568D690; Wed, 15 May 2024 20:10:58 +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 EE8D268D3E3 for ; Wed, 15 May 2024 20:10:50 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 42178C0099 for ; Wed, 15 May 2024 20:10:50 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 May 2024 20:10:49 +0300 Message-ID: <20240515171049.14567-2-remi@remlab.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240515171049.14567-1-remi@remlab.net> References: <20240515171049.14567-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCHv2 2/2] lavc/startcode: add R-V V startcode_find_candidate 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: zcJZSsoqMh4V --- libavcodec/riscv/Makefile | 1 + libavcodec/riscv/h264dsp_init.c | 5 ++++ libavcodec/riscv/startcode_rvv.S | 44 ++++++++++++++++++++++++++++++++ libavcodec/riscv/vc1dsp_init.c | 16 +++++++----- 4 files changed, 60 insertions(+), 6 deletions(-) create mode 100644 libavcodec/riscv/startcode_rvv.S diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index e87a2a9f9f..42665165f0 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -53,6 +53,7 @@ RVV-OBJS-$(CONFIG_RV34DSP) += riscv/rv34dsp_rvv.o OBJS-$(CONFIG_RV40_DECODER) += riscv/rv40dsp_init.o RVV-OBJS-$(CONFIG_RV40_DECODER) += riscv/rv40dsp_rvv.o RV-OBJS-$(CONFIG_STARTCODE) += riscv/startcode_rvb.o +RVV-OBJS-$(CONFIG_STARTCODE) += riscv/startcode_rvv.o OBJS-$(CONFIG_SVQ1_ENCODER) += riscv/svqenc_init.o RVV-OBJS-$(CONFIG_SVQ1_ENCODER) += riscv/svqenc_rvv.o OBJS-$(CONFIG_TAK_DECODER) += riscv/takdsp_init.o diff --git a/libavcodec/riscv/h264dsp_init.c b/libavcodec/riscv/h264dsp_init.c index 60c84734cd..dbbf3db400 100644 --- a/libavcodec/riscv/h264dsp_init.c +++ b/libavcodec/riscv/h264dsp_init.c @@ -27,6 +27,7 @@ #include "libavcodec/h264dsp.h" extern int ff_startcode_find_candidate_rvb(const uint8_t *, int); +extern int ff_startcode_find_candidate_rvv(const uint8_t *, int); av_cold void ff_h264dsp_init_riscv(H264DSPContext *dsp, const int bit_depth, const int chroma_format_idc) @@ -36,5 +37,9 @@ av_cold void ff_h264dsp_init_riscv(H264DSPContext *dsp, const int bit_depth, if (flags & AV_CPU_FLAG_RVB_BASIC) dsp->startcode_find_candidate = ff_startcode_find_candidate_rvb; +# if HAVE_RVV + if (flags & AV_CPU_FLAG_RVV_I32) + dsp->startcode_find_candidate = ff_startcode_find_candidate_rvv; +# endif #endif } diff --git a/libavcodec/riscv/startcode_rvv.S b/libavcodec/riscv/startcode_rvv.S new file mode 100644 index 0000000000..7c43b1d7f3 --- /dev/null +++ b/libavcodec/riscv/startcode_rvv.S @@ -0,0 +1,44 @@ +/* + * Copyright © 2024 Rémi Denis-Courmont. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include "libavutil/riscv/asm.S" + +func ff_startcode_find_candidate_rvv, zve32x + mv t0, a0 +1: + vsetvli t1, a1, e8, m8, ta, ma + vle8.v v8, (t0) + sub a1, a1, t1 + vmseq.vi v0, v8, 0 + vfirst.m t2, v0 + bgez t2, 2f + add t0, t0, t1 + bnez a1, 1b +2: + add t0, t0, t2 + sub a0, t0, a0 + ret +endfunc diff --git a/libavcodec/riscv/vc1dsp_init.c b/libavcodec/riscv/vc1dsp_init.c index 844f39b891..71237ae723 100644 --- a/libavcodec/riscv/vc1dsp_init.c +++ b/libavcodec/riscv/vc1dsp_init.c @@ -30,6 +30,7 @@ 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); int ff_startcode_find_candidate_rvb(const uint8_t *, int); +int ff_startcode_find_candidate_rvv(const uint8_t *, int); av_cold void ff_vc1dsp_init_riscv(VC1DSPContext *dsp) { @@ -39,13 +40,16 @@ av_cold void ff_vc1dsp_init_riscv(VC1DSPContext *dsp) if (flags & AV_CPU_FLAG_RVB_BASIC) dsp->startcode_find_candidate = ff_startcode_find_candidate_rvb; # if HAVE_RVV - if (flags & AV_CPU_FLAG_RVV_I32 && ff_rv_vlen_least(128)) { - 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; - 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; + if (flags & AV_CPU_FLAG_RVV_I32) { + if (ff_rv_vlen_least(128)) { + 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; + 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->startcode_find_candidate = ff_startcode_find_candidate_rvv; } # endif #endif