From patchwork Mon Sep 26 14:52:49 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: 38363 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2306487pzh; Mon, 26 Sep 2022 07:57:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM414HRk5JV5b7TQyHOuB4DkgTFQ9/kqqYqL27boCw+2aOk01fc7A0Puwpcm3tc+fAyepKkC X-Received: by 2002:a17:907:a088:b0:780:da07:9df3 with SMTP id hu8-20020a170907a08800b00780da079df3mr18626287ejc.252.1664204239889; Mon, 26 Sep 2022 07:57:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664204239; cv=none; d=google.com; s=arc-20160816; b=x+nblCp/Wm6d7DYu2X7/BHJcEc05w1iZskkoj2QRO9XQROs7P1uZ7PN8PplpZ5h+hP HGLpoqwJTeef3dbo58stDyfj56bIBT6c39zlQXFAGyc6T83+y1Buqr3IGJjn5GroY1r+ J5bX5/UkvBGsvB087j1LH+YbmUv9gax3R3WTngE93Ni0O0dLh6iXSbP0kn+b+RBN8Xhv o1g5c0B28z3sYn1Ya047XtNjuI7Ne0uuOpatB2iEghEt7EwEJlTxs8QUhmVD37v6ayxt QyG/MNkpskNsDK5oECQMF/H+7gWx9t4hyXq1lFOG+IEgDMBBS5iDHcifGgVKaooj1Yxg tk8A== 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=RYQ0IKRr5qQqw10yQ6BNEEB0mTazIO8Og9dU9X3irFg=; b=vsx9qzYnognRoke5ueutMfx7S74PpaG9zRZr6Y9fDKKruBPF3ZnpaOg0gPRpE7okii 8wATajVBzZ7LyPcTH+foEIwyG+ectvyIVFZkznfSSA8tCuDE+Abjf/xU4qZXNktxWZws xRhq5UMOhW3aZm5P5E808tyJShyjSFizVIiRRb2poIzOvIMg7LlVkR0RmG+vdKG/CMrB FjWq5AScYVlvQuocwkHhlxXH/hZ6hzaOG8ayDyF9IXGCe0ycFrpeiDDIIP/IB0nC/IaV 8i6SpCAh6Nsst5cAJ/Oy55Uv3RiovKV/sd36Pr9JesTEaDZPGcY/bMUuY0RuJpf1Amcd 09Dw== 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 q10-20020a1709060e4a00b007813594dc31si68282eji.523.2022.09.26.07.57.18; Mon, 26 Sep 2022 07:57:19 -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 6DB9568BBFD; Mon, 26 Sep 2022 17:53:25 +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 86FF368BB05 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 232BFC00C9 for ; Mon, 26 Sep 2022 17:52:56 +0300 (EEST) From: remi@remlab.net To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Sep 2022 17:52:49 +0300 Message-Id: <20220926145251.56351-29-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 29/31] lavc/aacpsdsp: RISC-V V hybrid_analysis_ileave 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: o8Gj1kBlnSux From: Rémi Denis-Courmont --- libavcodec/riscv/aacpsdsp_init.c | 5 +++++ libavcodec/riscv/aacpsdsp_rvv.S | 35 ++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/libavcodec/riscv/aacpsdsp_init.c b/libavcodec/riscv/aacpsdsp_init.c index 09f16f1041..1d36f89f6e 100644 --- a/libavcodec/riscv/aacpsdsp_init.c +++ b/libavcodec/riscv/aacpsdsp_init.c @@ -29,6 +29,8 @@ void ff_ps_mul_pair_single_rvv(float (*dst)[2], float (*src0)[2], float *src1, int n); void ff_ps_hybrid_analysis_rvv(float (*out)[2], float (*in)[2], const float (*filter)[8][2], ptrdiff_t, int n); +void ff_ps_hybrid_analysis_ileave_rvv(float (*out)[32][2], float L[2][38][64], + int i, int len); av_cold void ff_psdsp_init_riscv(PSDSPContext *c) { @@ -40,5 +42,8 @@ av_cold void ff_psdsp_init_riscv(PSDSPContext *c) c->mul_pair_single = ff_ps_mul_pair_single_rvv; c->hybrid_analysis = ff_ps_hybrid_analysis_rvv; } + + if (flags & AV_CPU_FLAG_RVV_I32) + c->hybrid_analysis_ileave = ff_ps_hybrid_analysis_ileave_rvv; #endif } diff --git a/libavcodec/riscv/aacpsdsp_rvv.S b/libavcodec/riscv/aacpsdsp_rvv.S index 65e5e0be4f..c9cc15e73d 100644 --- a/libavcodec/riscv/aacpsdsp_rvv.S +++ b/libavcodec/riscv/aacpsdsp_rvv.S @@ -149,3 +149,38 @@ func ff_ps_hybrid_analysis_rvv, zve32f .purgem input .purgem filter endfunc + +func ff_ps_hybrid_analysis_ileave_rvv, zve32x /* no needs for zve32f here */ + slli t0, a2, 5 + 1 + 2 // ctz(32 * 2 * 4) + sh2add a1, a2, a1 + add a0, a0, t0 + addi a2, a2, -64 + li t1, 38 * 64 * 4 + li t6, 64 * 4 // (uint8_t *)L[x][j+1][i] - L[x][j][i] + add a4, a1, t1 // &L[1] + beqz a2, 3f +1: + mv t0, a0 + mv t1, a1 + mv t3, a3 + mv t4, a4 + addi a2, a2, 1 +2: + vsetvli t5, t3, e32, m1, ta, ma + vlse32.v v16, (t1), t6 + sub t3, t3, t5 + vlse32.v v17, (t4), t6 + mul t2, t5, t6 + vsseg2e32.v v16, (t0) + sh3add t0, t5, t0 + add t1, t1, t2 + add t4, t4, t2 + bnez t3, 2b + + add a0, a0, 32 * 2 * 4 + add a1, a1, 4 + add a4, a4, 4 + bnez a2, 1b +3: + ret +endfunc