From patchwork Thu Jun 6 16:04:52 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: 49622 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp479328vqo; Thu, 6 Jun 2024 09:05:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVFtLYxhTfcLdgmfmHymbOC48NWMzkgZIu7GFZBtgeIdrIj2/jcCPMdSF6RPKiJ6YIQ40Q1qu9mxooN43UDjnjAXWgzAU8k9GCrYw== X-Google-Smtp-Source: AGHT+IFqAz+4dKzb+69rpgMZG9AiLHbdpiOv0aq2KThwUWPNICnqoCJuR4HDF7CI17JV++4nEdE9 X-Received: by 2002:a50:cd4e:0:b0:579:73b7:b4cc with SMTP id 4fb4d7f45d1cf-57a8b696d20mr4745914a12.2.1717689904724; Thu, 06 Jun 2024 09:05:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717689904; cv=none; d=google.com; s=arc-20160816; b=gUHJb6RpxHGAKQL4ozYFfFR88AK5JdWiBzYRLfhRzxpoUxnDOIHQXvg+iiKOOJEr/U u2n+2U+viBLWHdXnJtTAffRPFElWpx+wxHFQ0E4lsbzoHoHz0I3kAXsZhwGAE9NBbM+H JmGsqhpP6HFCJtHAa6NHPLjFognmHvd703f/SyMQqxvF4T+RJISHnNwISITfmoaOh+v7 deJzNISCh+9cX7iXbb32NmjOZgLicD2vdTUu7BQ9cpJVq5fVaPUCvDoN72GliUJdRy46 9OrmrQeN8Km4iNgq/d31AcaMqtI+GwpozcwFhYudz3jDkel03aD6j3lrfHpzJgw4qZg0 7GYA== 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=kXKl5yXZlekkHEvtOOG6MNc1NToDlmDXWKzp4Yz/Zjg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=W7h1Qi4kbYK35VKjWiza65EFeTHfprvRes+jd1JMBCcUXY3TGSEphNiMgUfhh/Jqr5 4d7uYzNz25L/Gg5+Us7Ku2lSi1So0sFJX/jleClnwGlL8KctcLDejBgpbPWCQw5PaW9c iKnCTTe8/VEpzu5IawLqOIo/ykmqsb+j2VEhDrhAvTq1iGOiRxmXzjnWQzi9fUQYh3un dl3+c5Iw1BckFnIDzfGsRPXQtmg/+pLaV4ECU0h4muCnmbVwS3p6o2ZJ3TOfPAuisyTM o0f32BW7wqooti5V4JonXyb+/5kLK/vEQrYvPdHJ5k0YzMA+2JK9J4aMgyhG2MpF3LM9 wd9A==; 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-57aae1fa77dsi822808a12.328.2024.06.06.09.05.03; Thu, 06 Jun 2024 09:05:04 -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 1489D68D702; Thu, 6 Jun 2024 19:05:01 +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 2257168D180 for ; Thu, 6 Jun 2024 19:04:54 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 25CD3C0090 for ; Thu, 6 Jun 2024 19:04:53 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jun 2024 19:04:52 +0300 Message-ID: <20240606160452.33450-1-remi@remlab.net> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/flacdsp: R-V Zvbb wasted33 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: 7+rDPn0ZoalD --- libavcodec/riscv/Makefile | 1 + libavcodec/riscv/flacdsp_init.c | 8 +++++++- libavcodec/riscv/flacdsp_rvvb.S | 35 +++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 libavcodec/riscv/flacdsp_rvvb.S diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index 590655f829..6c302b1a54 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -20,6 +20,7 @@ OBJS-$(CONFIG_EXR_DECODER) += riscv/exrdsp_init.o RVV-OBJS-$(CONFIG_EXR_DECODER) += riscv/exrdsp_rvv.o OBJS-$(CONFIG_FLAC_DECODER) += riscv/flacdsp_init.o RVV-OBJS-$(CONFIG_FLAC_DECODER) += riscv/flacdsp_rvv.o +RVVB-OBJS-$(CONFIG_FLAC_DECODER) += riscv/flacdsp_rvvb.o OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_init.o RVV-OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_rvv.o OBJS-$(CONFIG_G722DSP) += riscv/g722dsp_init.o diff --git a/libavcodec/riscv/flacdsp_init.c b/libavcodec/riscv/flacdsp_init.c index 861276be28..49884b7d9f 100644 --- a/libavcodec/riscv/flacdsp_init.c +++ b/libavcodec/riscv/flacdsp_init.c @@ -35,6 +35,7 @@ void ff_flac_lpc33_rvv(int64_t *, const int32_t *, const int coeffs[32], int pred_order, int qlevel, int len); void ff_flac_wasted32_rvv(int32_t *, int shift, int len); void ff_flac_wasted33_rvv(int64_t *, const int32_t *, int shift, int len); +void ff_flac_wasted33_rvvb(int64_t *, const int32_t *, int shift, int len); void ff_flac_decorrelate_indep2_16_rvv(uint8_t **out, int32_t **in, int channels, int len, int shift); void ff_flac_decorrelate_indep4_16_rvv(uint8_t **out, int32_t **in, @@ -89,8 +90,13 @@ av_cold void ff_flacdsp_init_riscv(FLACDSPContext *c, enum AVSampleFormat fmt, c->wasted32 = ff_flac_wasted32_rvv; - if (flags & AV_CPU_FLAG_RVV_I64) + if (flags & AV_CPU_FLAG_RVV_I64) { c->wasted33 = ff_flac_wasted33_rvv; +# if HAVE_RV_ZVBB + if (flags & AV_CPU_FLAG_RV_ZVBB) + c->wasted33 = ff_flac_wasted33_rvvb; +# endif + } # if (__riscv_xlen >= 64) switch (fmt) { diff --git a/libavcodec/riscv/flacdsp_rvvb.S b/libavcodec/riscv/flacdsp_rvvb.S new file mode 100644 index 0000000000..09c37d8936 --- /dev/null +++ b/libavcodec/riscv/flacdsp_rvvb.S @@ -0,0 +1,35 @@ +/* + * 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 "libavutil/riscv/asm.S" + +func ff_flac_wasted33_rvvb, zve64x, zvbb +1: + vsetvli t0, a3, e32, m4, ta, ma + vle32.v v8, (a1) + sub a3, a3, t0 + vwsll.vx v16, v8, a2 + sh2add a1, t0, a1 + vse64.v v16, (a0) + sh3add a0, t0, a0 + bnez a3, 1b + + ret +endfunc