From patchwork Sun Oct 29 20:25:57 2023 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: 44430 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dd83:b0:15d:8365:d4b8 with SMTP id kw3csp1077763pzb; Sun, 29 Oct 2023 13:26:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHTNUM3+hm18Gjs5NfonAbsDNvcQ/wf2TtH/U70p+7xOPl5tI+T8f4JDy8KLV6kMGIDX3zc X-Received: by 2002:a17:906:c10c:b0:9c4:950:92b5 with SMTP id do12-20020a170906c10c00b009c4095092b5mr5675085ejc.6.1698611171732; Sun, 29 Oct 2023 13:26:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698611171; cv=none; d=google.com; s=arc-20160816; b=RX8s+c9z6Bus/yFfZjVP5wmFSd+3BuMbtK765TRMuDjZ0lGoAbH4u9xt9p3Ks2QIM7 jZ2rPEzoWeSLv+HWmtnKrjnxYsnarErAxwtfFjkx66U4jFaYE5kZxPqkVKlZ/7GsGILW swl3l++viPb8cV/VaP37G+tm4glc9PuSHE2nVbEK3t6mqh118m/SsdPx8b7QyhbHUKGW v/gCef8L3JtiJsAPWT6SHtaJWrI6E7hZizX/don06b4WSd2Xnie2i7uAAjd+JyYW/12a GMHjbjEYCpeUAS3GmGZ/0qt+X5BRtnKPG9du1tGh5u2T31/AjJfmtFZWUYElgXKU7t+N uspA== 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=GXWVkVMHbqfm3/oQ6Mg10EbeOhp2jnqkZOiD3QERRug=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=fq2aO3SU7RVq/fQqrCgFQUfGPDj1rdpJK8I8HeZLLQZz6eCFYEoR8LAjzlwCTHoPA2 O9w9yLM0TlMrso9wrqz6H+t1Vu1MUq/8WetWDZBm8r4KqZjA2AgEWFgbC+X8h+Z7tobH YDcqWN1J6PFl1d6zZnzHuqtQICkTENJ/JkR2kc/oFkNBe9hUsYMNoQ130SOe7d4px/ys Kr51qJJnZqPHWWJoLJXQYDfb0d65VNYTwcHlbuaXq7v/8RJh8Iz2LebozTPcFUhmMXVb 4dmyRx5LhtAkyGBhulDSMLpd2UpzOlwHacNGgsHUX4SMACg/y2QDz5C1vzZMZDwxydFc YdoQ== 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 j29-20020a170906105d00b009adf712770bsi2998422ejj.432.2023.10.29.13.26.10; Sun, 29 Oct 2023 13:26:11 -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 1559D68CC68; Sun, 29 Oct 2023 22:26:07 +0200 (EET) 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 47DD568CC64 for ; Sun, 29 Oct 2023 22:26:00 +0200 (EET) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id DB008C006F for ; Sun, 29 Oct 2023 22:25:59 +0200 (EET) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Oct 2023 22:25:57 +0200 Message-ID: <20231029202559.95350-1-remi@remlab.net> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavc/sbrdsp: R-V V sum64x5 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: htDnSPE1a94U sum64x5_c: 385.0 sum64x5_rvv_f32: 116.0 --- libavcodec/riscv/Makefile | 4 +-- libavcodec/riscv/sbrdsp_init.c | 37 +++++++++++++++++++++++++ libavcodec/riscv/sbrdsp_rvv.S | 50 ++++++++++++++++++++++++++++++++++ libavcodec/sbrdsp.h | 1 + libavcodec/sbrdsp_template.c | 2 ++ 5 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 libavcodec/riscv/sbrdsp_init.c create mode 100644 libavcodec/riscv/sbrdsp_rvv.S diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index 06815d3170..2c9af16782 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -1,5 +1,5 @@ -OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_init.o -RVV-OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_rvv.o +OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_init.o riscv/sbrdsp_init.o +RVV-OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_rvv.o riscv/sbrdsp_rvv.o OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_init.o \ riscv/ac3dsp_rvb.o OBJS-$(CONFIG_ALAC_DECODER) += riscv/alacdsp_init.o diff --git a/libavcodec/riscv/sbrdsp_init.c b/libavcodec/riscv/sbrdsp_init.c new file mode 100644 index 0000000000..837f24e1e0 --- /dev/null +++ b/libavcodec/riscv/sbrdsp_init.c @@ -0,0 +1,37 @@ +/* + * Copyright © 2023 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 "libavutil/attributes.h" +#include "libavutil/cpu.h" +#include "libavcodec/sbrdsp.h" + +void ff_sbr_sum64x5_rvv(float *z); + +av_cold void ff_sbrdsp_init_riscv(SBRDSPContext *c) +{ +#if HAVE_RVV + int flags = av_get_cpu_flags(); + + if ((flags & AV_CPU_FLAG_RVV_F32) && (flags & AV_CPU_FLAG_RVB_ADDR)) { + c->sum64x5 = ff_sbr_sum64x5_rvv; + } +#endif +} diff --git a/libavcodec/riscv/sbrdsp_rvv.S b/libavcodec/riscv/sbrdsp_rvv.S new file mode 100644 index 0000000000..e1d548b41b --- /dev/null +++ b/libavcodec/riscv/sbrdsp_rvv.S @@ -0,0 +1,50 @@ +/* + * Copyright © 2023 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_sbr_sum64x5_rvv, zve32f + li a5, 64 + addi a1, a0, 64 * 4 + addi a2, a0, 128 * 4 + addi a3, a0, 192 * 4 + addi a4, a0, 256 * 4 +1: + vsetvli t0, a5, e32, m8, ta, ma + sub a5, a5, t0 + vle32.v v0, (a0) + vle32.v v8, (a1) + sh2add a1, t0, a1 + vle32.v v16, (a2) + vfadd.vv v0, v0, v8 + sh2add a2, t0, a2 + vle32.v v24, (a3) + vfadd.vv v0, v0, v16 + sh2add a3, t0, a3 + vle32.v v8, (a4) + vfadd.vv v0, v0, v24 + sh2add a4, t0, a4 + vfadd.vv v0, v0, v8 + vse32.v v0, (a0) + sh2add a0, t0, a0 + bnez a5, 1b + + ret +endfunc diff --git a/libavcodec/sbrdsp.h b/libavcodec/sbrdsp.h index 8513c423af..49782202a7 100644 --- a/libavcodec/sbrdsp.h +++ b/libavcodec/sbrdsp.h @@ -48,6 +48,7 @@ extern const INTFLOAT AAC_RENAME(ff_sbr_noise_table)[][2]; void AAC_RENAME(ff_sbrdsp_init)(SBRDSPContext *s); void ff_sbrdsp_init_arm(SBRDSPContext *s); void ff_sbrdsp_init_aarch64(SBRDSPContext *s); +void ff_sbrdsp_init_riscv(SBRDSPContext *s); void ff_sbrdsp_init_x86(SBRDSPContext *s); void ff_sbrdsp_init_mips(SBRDSPContext *s); diff --git a/libavcodec/sbrdsp_template.c b/libavcodec/sbrdsp_template.c index 89e389d9a0..79cd2156d9 100644 --- a/libavcodec/sbrdsp_template.c +++ b/libavcodec/sbrdsp_template.c @@ -98,6 +98,8 @@ av_cold void AAC_RENAME(ff_sbrdsp_init)(SBRDSPContext *s) ff_sbrdsp_init_arm(s); #elif ARCH_AARCH64 ff_sbrdsp_init_aarch64(s); +#elif ARCH_RISCV + ff_sbrdsp_init_riscv(s); #elif ARCH_X86 ff_sbrdsp_init_x86(s); #elif ARCH_MIPS