From patchwork Thu Sep 29 19:51:59 2022 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: 38466 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1220774pzh; Thu, 29 Sep 2022 12:52:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7pw83g/oGHo1gnKsCTzXGo8YHXPpwB1E9w/YZdgwvaYBrzdU6z2apS1sdOeFrRj1i3ssxh X-Received: by 2002:a17:907:a079:b0:77d:a363:64b6 with SMTP id ia25-20020a170907a07900b0077da36364b6mr3806948ejc.451.1664481131670; Thu, 29 Sep 2022 12:52:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664481131; cv=none; d=google.com; s=arc-20160816; b=02GKE+YwBCINpC/wna41nA/82HdXe+saXLaCqfcp4SiAMAK7Yvlc6qRhHbNEF74BzD Z7vO3w6VsftOjKIRLpKH2i1hl4Wb6Ogs6y++kEq8AVtT1tJL0YiBs1mVcxz6IhXCwXDv AdIwHe4UqpdYOCrJ/EOAvq5atFtWt4EoARGtNWhAjEA88MQh0/uANuScBIGInkhYKEua /qpEX2cRYF/qitw04jz6LROkln8oClh96mAgbdQ6hbPerOho2JTWxdQFzTyMijQRaQT6 rk+0JrVHVkHX/59Md4OJqBuYcOkrBjtLASRuYB6Gzc0iXnGwk8qYaOMvcyjIXrIgOn8k jhqg== 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=e+XRlOc8VSqVQ9ZWOn3Pz7WsRKEfTXbFdNF+mZK06GU=; b=r1Pk1f64BSHd3npSYOUyvhwJAibFid3E3aXIQtL3f8Z/N0ULlBdPwBh1BhxSEqIOMM u6TO/bWWsr/T1E9+m7/Y89Tl6usN1HDLzGb5GqA7eRn5bd6k4DZ8R524RVchRKQi0xKY 4/0r7ZyV+zQoWlGSh0bRSauhMmfMqV7jmyVViscBcCB1Jvc4zDT0jFNxmN+8vuC95Sn9 +Ok1TByGxxdD8mW05imzoaBX2W9HVY8MLvo05m8K/PkL6TfP8HdlkV63nWoIgIdt//RE D1hJzP5cM6ScDCLgtH5N71nY8RMp0yu56dW7Eb56ajfck1+UDGM924D291vAUQ0YCV71 Ifiw== 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 z1-20020a05640235c100b00450cd1eb7e2si445447edc.22.2022.09.29.12.52.10; Thu, 29 Sep 2022 12:52: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 55F1468BAB2; Thu, 29 Sep 2022 22:52:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ursule.remlab.net (unknown [51.75.19.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1847968B8F9 for ; Thu, 29 Sep 2022 22:52:00 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 1BF5AC0001 for ; Thu, 29 Sep 2022 22:52:00 +0300 (EEST) From: remi@remlab.net To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Sep 2022 22:51:59 +0300 Message-Id: <20220929195159.22376-1-remi@remlab.net> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/opusdsp: RISC-V F deemphasis 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: PeDjyDV6FQDz From: Rémi Denis-Courmont This saves almost exactly 25% on SiFive U74. deemphasis_c: 11536.2 deemphasis_rvf: 8654.2 --- libavcodec/opusdsp.c | 2 ++ libavcodec/opusdsp.h | 1 + libavcodec/riscv/Makefile | 2 ++ libavcodec/riscv/opusdsp_init.c | 36 +++++++++++++++++++++++++++++ libavcodec/riscv/opusdsp_rvf.S | 41 +++++++++++++++++++++++++++++++++ 5 files changed, 82 insertions(+) create mode 100644 libavcodec/riscv/opusdsp_init.c create mode 100644 libavcodec/riscv/opusdsp_rvf.S diff --git a/libavcodec/opusdsp.c b/libavcodec/opusdsp.c index badcfcc884..0764d712e4 100644 --- a/libavcodec/opusdsp.c +++ b/libavcodec/opusdsp.c @@ -58,6 +58,8 @@ av_cold void ff_opus_dsp_init(OpusDSP *ctx) #if ARCH_AARCH64 ff_opus_dsp_init_aarch64(ctx); +#elif ARCH_RISCV + ff_opus_dsp_init_riscv(ctx); #elif ARCH_X86 ff_opus_dsp_init_x86(ctx); #endif diff --git a/libavcodec/opusdsp.h b/libavcodec/opusdsp.h index 3ea3d14bf0..c2a301e832 100644 --- a/libavcodec/opusdsp.h +++ b/libavcodec/opusdsp.h @@ -30,5 +30,6 @@ void ff_opus_dsp_init(OpusDSP *ctx); void ff_opus_dsp_init_x86(OpusDSP *ctx); void ff_opus_dsp_init_aarch64(OpusDSP *ctx); +void ff_opus_dsp_init_riscv(OpusDSP *ctx); #endif /* AVCODEC_OPUSDSP_H */ diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index 0fb2c81c75..ef7d1169fe 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -7,6 +7,8 @@ OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_init.o RVV-OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_rvv.o OBJS-$(CONFIG_IDCTDSP) += riscv/idctdsp_init.o RVV-OBJS-$(CONFIG_IDCTDSP) += riscv/idctdsp_rvv.o +OBJS-$(CONFIG_OPUS_DECODER) += riscv/opusdsp_init.o \ + riscv/opusdsp_rvf.o OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_init.o \ riscv/pixblockdsp_rvi.o RVV-OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_rvv.o diff --git a/libavcodec/riscv/opusdsp_init.c b/libavcodec/riscv/opusdsp_init.c new file mode 100644 index 0000000000..dddf27affb --- /dev/null +++ b/libavcodec/riscv/opusdsp_init.c @@ -0,0 +1,36 @@ +/* + * Copyright © 2022 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 "libavutil/riscv/cpu.h" +#include "libavcodec/opusdsp.h" + +float ff_opus_deemphasis_rvf(float *out, float *in, float c, int len); + +av_cold void ff_opus_dsp_init_riscv(OpusDSP *d) +{ + int flags = av_get_cpu_flags(); + + if (flags & AV_CPU_FLAG_RVF) + d->deemphasis = ff_opus_deemphasis_rvf; +} diff --git a/libavcodec/riscv/opusdsp_rvf.S b/libavcodec/riscv/opusdsp_rvf.S new file mode 100644 index 0000000000..b1eaa35d92 --- /dev/null +++ b/libavcodec/riscv/opusdsp_rvf.S @@ -0,0 +1,41 @@ +/* + * Copyright © 2022 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/riscv/asm.S" + +func ff_opus_deemphasis_rvf, f +NOHWF fmv.w.x fa0, a2 +NOHWF mv a2, a3 + slli a2, a2, 2 + li t0, 0x3f599a00 // 0.85 + add a2, a1, a2 + fmv.w.x ft0, t0 +1: + flw ft1, (a1) + addi a0, a0, 4 + fmadd.s fa0, fa0, ft0, ft1 + addi a1, a1, 4 + fsw fa0, -4(a0) + bne a1, a2, 1b + +NOHWF fmv.x.w a0, fa0 + ret +endfunc