From patchwork Mon Sep 26 14:52:42 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: 38356 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2305665pzh; Mon, 26 Sep 2022 07:56:00 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6kXtMpYUAGumgwnHccA5pl1sBTBwcKftNd7VgBNRSiShRLNmM8thddPMzZeWxInhROYhTc X-Received: by 2002:a05:6402:5507:b0:452:183f:16d1 with SMTP id fi7-20020a056402550700b00452183f16d1mr23203455edb.96.1664204160834; Mon, 26 Sep 2022 07:56:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664204160; cv=none; d=google.com; s=arc-20160816; b=nimvLIH883kA8nD/SPwyels4GqjGUMnUvrD9sTWFM51sU+HvFaRsaRZoZ1CkmxXJfg kRzKK0pl6TtAcYKgQ60TZrL9Dv2256ptY9eO0NdIaKVWzWo//kBPOuUzeZIF1u6Q2ztE lUMiG/9TpsZ/oTHlZu1P7vgfnWvO5qSmxR458TBDB147WWt8bjaMrGTVp63QbQMe7h3f iUH3Dr3SNCwjWcyZy02KGVdHTx2+IflH4NhD72m8ORCuvdJOK3FLgxC2caJGnBNP2W+Q NlxxpaM0ierRxWEM11wIe2tadWUS8KDfwkgNxBiK4Q9h98bQ9WnCA1g7Iy8F6QR/3kID DbEQ== 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=uOOrARZ57KKS0DIeFykShX9HUUeEFsBz/9NIeV/loXw=; b=QT44ZomfCO0+6NEiGO2lt/iG020VJtM1c6hHZuRNcvKJve8OEA7CuQ41Raziyfdlpk Qd/kjR6+SHxkMxOkMhQ/1DdAGbSt3NBx7Au2mjCS+U+s/9s5aRgKh1L8iRwKj0l9F1vX te+Ibaeo4YdMhkpxj3Zjc0yGVgAP7yFOn2tDJ5rKVr2aPvuP2iBidR/M4cC4VY5KKIaX h9p92fx6b5Ug7aUhYHogN1SVf80Pk2dgIoKZrAxgGZJ5eQjBmDHsYlvlVU3bDvjZe+ze VyJpXls1/T6QjRVFFpDVc8UVwwQgQYJyydsJNQQ5v3eKMLHlmky2cBwZaGfXCFfrx2i9 Goww== 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 fx17-20020a170906b75100b0076c593c2d58si72935ejb.479.2022.09.26.07.56.00; Mon, 26 Sep 2022 07:56:00 -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 384DD68BBCC; Mon, 26 Sep 2022 17:53:17 +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 6421768BA85 for ; Mon, 26 Sep 2022 17:52:57 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id E6B02C00C2 for ; Mon, 26 Sep 2022 17:52:54 +0300 (EEST) From: remi@remlab.net To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Sep 2022 17:52:42 +0300 Message-Id: <20220926145251.56351-22-remi@remlab.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <5862173.lOV4Wx5bFT@basile.remlab.net> References: <5862173.lOV4Wx5bFT@basile.remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 22/31] lavc/audiodsp: RISC-V V scalarproduct_int16 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: NCVrfCk46Z09 From: Rémi Denis-Courmont --- libavcodec/riscv/audiodsp_init.c | 5 ++++- libavcodec/riscv/audiodsp_rvv.S | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/libavcodec/riscv/audiodsp_init.c b/libavcodec/riscv/audiodsp_init.c index 9c9265531d..32c3c6794d 100644 --- a/libavcodec/riscv/audiodsp_init.c +++ b/libavcodec/riscv/audiodsp_init.c @@ -26,6 +26,7 @@ void ff_vector_clipf_rvf(float *dst, const float *src, int len, float min, float max); +int32_t ff_scalarproduct_int16_rvv(const int16_t *v1, const int16_t *v2, int len); void ff_vector_clip_int32_rvv(int32_t *dst, const int32_t *src, int32_t min, int32_t max, unsigned int len); void ff_vector_clipf_rvv(float *dst, const float *src, int len, float min, float max); @@ -37,8 +38,10 @@ av_cold void ff_audiodsp_init_riscv(AudioDSPContext *c) if (flags & AV_CPU_FLAG_RVF) c->vector_clipf = ff_vector_clipf_rvf; #if HAVE_RVV - if (flags & AV_CPU_FLAG_RVV_I32) + if (flags & AV_CPU_FLAG_RVV_I32) { + c->scalarproduct_int16 = ff_scalarproduct_int16_rvv; c->vector_clip_int32 = ff_vector_clip_int32_rvv; + } if (flags & AV_CPU_FLAG_RVV_F32) c->vector_clipf = ff_vector_clipf_rvv; #endif diff --git a/libavcodec/riscv/audiodsp_rvv.S b/libavcodec/riscv/audiodsp_rvv.S index 427b424cb9..f4308f27c5 100644 --- a/libavcodec/riscv/audiodsp_rvv.S +++ b/libavcodec/riscv/audiodsp_rvv.S @@ -20,6 +20,25 @@ #include "libavutil/riscv/asm.S" +func ff_scalarproduct_int16_rvv, zve32x + vsetvli zero, zero, e16, m1, ta, ma + vmv.s.x v8, zero +1: + vsetvli t0, a2, e16, m1, ta, ma + vle16.v v16, (a0) + sub a2, a2, t0 + vle16.v v24, (a1) + sh1add a0, t0, a0 + vwmul.vv v0, v16, v24 + sh1add a1, t0, a1 + vsetvli zero, t0, e32, m2, ta, ma + vredsum.vs v8, v0, v8 + bnez a2, 1b + + vmv.x.s a0, v8 + ret +endfunc + func ff_vector_clip_int32_rvv, zve32x 1: vsetvli t0, a4, e32, m1, ta, ma