From patchwork Thu Sep 22 18:37:25 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: 38180 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp516479pzh; Thu, 22 Sep 2022 11:41:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5RVJRHOcVfsE+VWWeBsugEUpeo2xXRKdKHNs9LH0ZoIDMDgaDLEgohu02X2CMFQjER6eZv X-Received: by 2002:a05:6402:3211:b0:453:ba03:9dee with SMTP id g17-20020a056402321100b00453ba039deemr4780040eda.351.1663872064407; Thu, 22 Sep 2022 11:41:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663872064; cv=none; d=google.com; s=arc-20160816; b=DTyYSmR3/yX8XG8nwDSKOHMV2hrRkra3W6Xdd3jJo0qC5TRFs8whJ9NPrqmNKrMQdB 14gVsP++pyGQdAroQ6OHRtokMr1ADgiOq3Q6Zd8JAComIMmVpEq2TMDgMfFN0Zf4pCUl y2OBmZj1DK/Oo2oAtrPlmg5/1Oa/X8ao28RWL79aqNcRxhaM5lxPFeX/XjLVuDyMMlN/ YiAb0yLoY4Ir2arhq94Zp78VmbepVeiW9gA9oSrftKcp4t68QWPuT/Ck5pOhnupx1yt2 aFwoCVHktgI9TQ1bBpDwjTHY2uMDNBSpVzpK6XqgHlh25NEg1/EzKTWJHj0c5Q3OywzA tvUw== 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=wsFAluOYe+7WthxiTu8Pcrlldz+WlDurmWC9DZutTOU=; b=llIN63xtUZ3D2+KG1ESK3piwuihXuaPNfKhWcp/6oeVGLz2/wlhybc/kFcQnGa0nuI ++sqrr312mqTZiVc46spL11KKHivJhDPAO7hLGND9mxvJ6OEDSn6vycF7mJjZPR90BTg OVDI183iJyBE9wpK3wRr9xtSo5lhnEw+YnKe84/0HwEQJp/Ush5Q7Up9XcaPVP4aYUeV Wf0MJZu/ewazD+gLOiNPrUC+SjLcOAWAl1utuHYFWJ35UzA0NEjReZnxPY9MuBm00F48 RAgvOIv6m22bX856fSiMVZKoUtj7YciskYGOKd7bT/scbbvCzVesnp8/TLPwbgf6DQZT MkUg== 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 sh13-20020a1709076e8d00b0073dced7204bsi5553453ejc.767.2022.09.22.11.41.02; Thu, 22 Sep 2022 11:41:04 -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 CF6B568BB56; Thu, 22 Sep 2022 21:37:57 +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 59A7068BB6F 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 4A620C00C8 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:25 +0300 Message-Id: <20220922183726.38624-28-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 28/29] 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: b+KqSoxYrfcn From: Rémi Denis-Courmont --- libavcodec/riscv/aacpsdsp_init.c | 14 ++++++++---- libavcodec/riscv/aacpsdsp_rvv.S | 37 ++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/libavcodec/riscv/aacpsdsp_init.c b/libavcodec/riscv/aacpsdsp_init.c index 6222d6f787..76f55502ee 100644 --- a/libavcodec/riscv/aacpsdsp_init.c +++ b/libavcodec/riscv/aacpsdsp_init.c @@ -29,16 +29,22 @@ 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) { #if HAVE_RVV int flags = av_get_cpu_flags(); - if (flags & AV_CPU_FLAG_RV_ZVE32F) { - c->add_squares = ff_ps_add_squares_rvv; - c->mul_pair_single = ff_ps_mul_pair_single_rvv; - c->hybrid_analysis = ff_ps_hybrid_analysis_rvv; + if (flags & AV_CPU_FLAG_RV_ZVE32X) { + c->hybrid_analysis_ileave = ff_ps_hybrid_analysis_ileave_rvv; + + if (flags & AV_CPU_FLAG_RV_ZVE32F) { + c->add_squares = ff_ps_add_squares_rvv; + c->mul_pair_single = ff_ps_mul_pair_single_rvv; + c->hybrid_analysis = ff_ps_hybrid_analysis_rvv; + } } #endif } diff --git a/libavcodec/riscv/aacpsdsp_rvv.S b/libavcodec/riscv/aacpsdsp_rvv.S index 993462de29..9c7bda1098 100644 --- a/libavcodec/riscv/aacpsdsp_rvv.S +++ b/libavcodec/riscv/aacpsdsp_rvv.S @@ -153,3 +153,40 @@ 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) + slli t1, a2, 2 + add a0, a0, t0 + add a1, a1, t1 + 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) + add t1, t1, t2 + add t4, t4, t2 + slli t2, t5, 1 + 2 + add t0, t0, t2 + bnez t3, 2b + + add a0, a0, 32 * 2 * 4 + add a1, a1, 4 + add a4, a4, 4 + bnez a2, 1b +3: + ret +endfunc