From patchwork Mon Sep 26 14:52:50 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: 38337 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2306209pzh; Mon, 26 Sep 2022 07:56:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7rSpWfM/lNLYcD/AjrQ7ZDEJk5HXbG3uHNAV/DUe/4FD7D6i3KfZF7aRZK0YsSGVFnWfB+ X-Received: by 2002:aa7:db12:0:b0:457:2973:7e24 with SMTP id t18-20020aa7db12000000b0045729737e24mr8337983eds.264.1664204209384; Mon, 26 Sep 2022 07:56:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664204209; cv=none; d=google.com; s=arc-20160816; b=bQuuUD9IkgxA340WWMVYLSpxiEml33vFFNcbj5RY+VYreGxzvyHRTNyBSxbQpkv6DR IpsPfLb/rcAglxt4YkynioY7ojVYdcxvp75T+B95jIG563VA+giU7xHCik/1S1vedqDz 04lapO6+oH6uaoISvpJzdooLzC+N9k0rDwDAnelQeFWn/J9JQxUAoLz1UOSggRyPhBLx sVSNx9rNvkSvUmbcKbeeldqfby4EbSfE+g41qvH6Vo2QZrl6TM+Npp3/aIKNwIoSObd5 OvXoCE+PpLEN0Sip/wAxaJp9JAmsGnxA4MpSgodhkrlxCuGFQmKprYiT3sBg5CGdQPWs XYXA== 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=rJxJlDHJl7M81gUHprJ1XBjUHOwnIXqiu07P9Fc1Y1E=; b=vkXSYsETPR/P7Xx6BqougdVljliiU0Qf+K0jb0I5Es7Cr10iOL27wGXMfIVKXfwe8b 7sUOvpoC7Bn0KA2MufCSlCbNmXaNoYMnDzAaA6zXzDUE0ReVDJnjAypMQckuf6PKjBdB ToTByKl/HnEJs1BQAZSySw1cClAhLsx4nAIYSsnBge/wG6m/sFASsWtHALTfBhmrNwrp jureFj7ggnTEfaPCU/AmHz40Wsy63E3Vf9lFX3J4vTfcYdD+JRDhX8NEIneNBYD11HX3 0qlcMbCHzZ/8ThAQkRb6MbA1xECx7ihhb9QASF7uRCXCRIIcT0noKjbZ0fGpriPBBBiq Z6zg== 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 ey4-20020a0564022a0400b004513abe8f74si15897461edb.249.2022.09.26.07.56.48; Mon, 26 Sep 2022 07:56:49 -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 293AF68BBE6; Mon, 26 Sep 2022 17:53:22 +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 6B66468BAD2 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 4C869C00CA 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:50 +0300 Message-Id: <20220926145251.56351-30-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 30/31] lavc/aacpsdsp: RISC-V V hybrid_synthesis_deint 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: KxrW5a/25Rxb From: Rémi Denis-Courmont --- libavcodec/riscv/aacpsdsp_init.c | 6 +++++- libavcodec/riscv/aacpsdsp_rvv.S | 35 ++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/libavcodec/riscv/aacpsdsp_init.c b/libavcodec/riscv/aacpsdsp_init.c index 1d36f89f6e..c2201ffb6a 100644 --- a/libavcodec/riscv/aacpsdsp_init.c +++ b/libavcodec/riscv/aacpsdsp_init.c @@ -31,6 +31,8 @@ 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); +void ff_ps_hybrid_synthesis_deint_rvv(float out[2][38][64], float (*in)[32][2], + int i, int len); av_cold void ff_psdsp_init_riscv(PSDSPContext *c) { @@ -43,7 +45,9 @@ av_cold void ff_psdsp_init_riscv(PSDSPContext *c) c->hybrid_analysis = ff_ps_hybrid_analysis_rvv; } - if (flags & AV_CPU_FLAG_RVV_I32) + if (flags & AV_CPU_FLAG_RVV_I32) { c->hybrid_analysis_ileave = ff_ps_hybrid_analysis_ileave_rvv; + c->hybrid_synthesis_deint = ff_ps_hybrid_synthesis_deint_rvv; + } #endif } diff --git a/libavcodec/riscv/aacpsdsp_rvv.S b/libavcodec/riscv/aacpsdsp_rvv.S index c9cc15e73d..0cbe4c1d3c 100644 --- a/libavcodec/riscv/aacpsdsp_rvv.S +++ b/libavcodec/riscv/aacpsdsp_rvv.S @@ -184,3 +184,38 @@ func ff_ps_hybrid_analysis_ileave_rvv, zve32x /* no needs for zve32f here */ 3: ret endfunc + +func ff_ps_hybrid_synthesis_deint_rvv, zve32x + slli t1, a2, 5 + 1 + 2 + sh2add a0, a2, a0 + add a1, a1, t1 + addi a2, a2, -64 + li t1, 38 * 64 * 4 + li t6, 64 * 4 + add a4, a0, t1 + 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 + vlseg2e32.v v16, (t1) + sub t3, t3, t5 + vsse32.v v16, (t0), t6 + mul t2, t5, t6 + vsse32.v v17, (t4), t6 + sh3add t1, t5, t1 + add t0, t0, t2 + add t4, t4, t2 + bnez t3, 2b + + add a0, a0, 4 + add a1, a1, 32 * 2 * 4 + add a4, a4, 4 + bnez a2, 1b +3: + ret +endfunc