From patchwork Thu Sep 22 18:37:26 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: 38184 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp516847pzh; Thu, 22 Sep 2022 11:41:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6YdTC2ho+DVYSRyD8+8ZC1h0JoeerJxDmsBDwMSMxvj8uPSJfOh9v5f9z7r5ffiyXMkPAr X-Received: by 2002:a17:907:d27:b0:782:cc3:8e87 with SMTP id gn39-20020a1709070d2700b007820cc38e87mr3815183ejc.94.1663872097339; Thu, 22 Sep 2022 11:41:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663872097; cv=none; d=google.com; s=arc-20160816; b=hn4yyT7kheoLws1d7pXXYRpAUKq8WCIXSDy+okeLM+GwbqHZrevhEAcqlLmZZzZVP1 hq4wZwumGHKhh+AFa5PjDCZ3WaQl5qe9jENpPhC9MciheLkk9O5vV/+3/Gw/gzhje0TK 5tcAtuLpltVcoH77Q2AIwVZ5x/PLHlZYBen627mG9PGLdidl8dEbO7UyIiG6Nb5kooA3 AQ5WJkXLKz2KX9yjQq//+dg/8kOYEn3/eiUlfqTQ6BSmktW8kgahiKuuZyHBrU56AUFI hIftknDaPN5vWalH4SfwZ3ktSYgRDnAxk42VWpQ6lM/SVKKP2WE9RaUldzOKdOBb+SiL HMBg== 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=70iOXyEb7MZQLjIidtWvVI/U7OdWjC/DHcGb+pgyGzY=; b=OJbDPXs5WbwzeEfWd/WgsG+qmJfKb3A1+h1pKkemCdf41q7smz7Y8S5SzjeqFrZMbJ 2Iww8hGL+OKfTeE2AEg6QyWMlJysK609NjZ15VqQTV9nw7KDtIVs4rsjzivciFeccmBk hxK0UNgAQOXT3taAPwlFwYWNyLVbQGkMoB6b1h/NHl4M1Q3cojkF0SeyLi3MmdJeHAO6 sQPQxuI1rwKSO3WsZEl2a8d7cznyXLWZpeiQ+kkwTKQqfIutR7FTwJYu7SrAzDVyMRzL nmLRe6gIYN2k7M4Kc9TtMf7zlhZaZ2hnAAhqBvqrS5CUns/y5mtSd0bIenYnr4QCscII 5VKQ== 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 qw20-20020a170906fcb400b0072f38ecf74asi4923199ejb.794.2022.09.22.11.41.36; Thu, 22 Sep 2022 11:41:37 -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 BAD1168BBBC; Thu, 22 Sep 2022 21:38:01 +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 6F82668B89E for ; Thu, 22 Sep 2022 21:37:32 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 77067C00C9 for ; Thu, 22 Sep 2022 21:37:31 +0300 (EEST) From: remi@remlab.net To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Sep 2022 21:37:26 +0300 Message-Id: <20220922183726.38624-29-remi@remlab.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <12078904.O9o76ZdvQC@basile.remlab.net> References: <12078904.O9o76ZdvQC@basile.remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 29/29] 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: xFjFTJeXtNR0 From: Rémi Denis-Courmont --- libavcodec/riscv/aacpsdsp_init.c | 3 +++ libavcodec/riscv/aacpsdsp_rvv.S | 37 ++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/libavcodec/riscv/aacpsdsp_init.c b/libavcodec/riscv/aacpsdsp_init.c index 76f55502ee..20b1a12741 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) { @@ -39,6 +41,7 @@ av_cold void ff_psdsp_init_riscv(PSDSPContext *c) if (flags & AV_CPU_FLAG_RV_ZVE32X) { c->hybrid_analysis_ileave = ff_ps_hybrid_analysis_ileave_rvv; + c->hybrid_synthesis_deint = ff_ps_hybrid_synthesis_deint_rvv; if (flags & AV_CPU_FLAG_RV_ZVE32F) { c->add_squares = ff_ps_add_squares_rvv; diff --git a/libavcodec/riscv/aacpsdsp_rvv.S b/libavcodec/riscv/aacpsdsp_rvv.S index 9c7bda1098..1b410ce5d8 100644 --- a/libavcodec/riscv/aacpsdsp_rvv.S +++ b/libavcodec/riscv/aacpsdsp_rvv.S @@ -190,3 +190,40 @@ 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 t0, a2, 2 + slli t1, a2, 5 + 1 + 2 + add a0, a0, t0 + 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 + slli t2, t5, 1 + 2 + vsse32.v v17, (t4), t6 + add t1, t1, t2 + mul t2, t5, t6 + 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