From patchwork Fri Sep 9 15:48:57 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: 37796 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp998027pzh; Fri, 9 Sep 2022 08:50:01 -0700 (PDT) X-Google-Smtp-Source: AA6agR4izJ7/WXT9EJqbF53A9ooZeV9Dl6DiLPIAtyKBXGsH6psZfE4Bt4m+d5z43ZeNKxanXbAq X-Received: by 2002:a17:907:96a3:b0:740:a894:f with SMTP id hd35-20020a17090796a300b00740a894000fmr10320622ejc.460.1662738600934; Fri, 09 Sep 2022 08:50:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662738600; cv=none; d=google.com; s=arc-20160816; b=pcKp0oMSxlqb3WzhWlupbetzgIr1CYcFQPwBerWgI94n4tZcY8mij39S6/iFGyG+Bi jFz8CUbLpFGx6O6LVP303x27U8uYaW/yI+q3sfWaYJCKw5lEQUvHgHxruWI82hgPvx9Y UGjeuzhiO0yTPv+zRR/1cEojtHBa7ySEr/2nKNFXYFw9Lbter3ok84I5VaPwImKHmlq8 CIZzxLzHnzN5VB7KXqMVBDB+1Mh5pivAiMYhJFbU9dph+H8hpJ0rog+gtwNZLTPVEGkZ /4TczjIL+EVpvJZtB7Bj9vTOGwNpjP04yJXl1pRiZx59tRSUIDsX+peEZdRCOH9TOXWI 0VIQ== 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:message-id:date:to:from :delivered-to; bh=QxFu0j1Z3wLEGmBqFOrUCfZyJFYwBMOQoylv88D+eBU=; b=RcgjWA+7iozWGjOPAo63pNrzk+CquBr2VMZqYQPox3Gpyj8U8X0WIg1tt+HrONpqBJ XpRrkDSUxmAq6oZu2wSMjDI0IUOhLcIxdqOmWFcn2MenrfaNfcRQRjkOQKDwpDejZZsT 25/YOqQytpRvoEe/xerzAH0xwsYC1Dc9lRXr9yCUZyG2xVCuhtB7IuhSoDzOOVeKBfQo FIzVMIyAkRhOH29eeh2pPNNgRM/p2U6s3W/h+3LW4aGugD7LCzzQcaNd52bZH+L3SC2K 5OPAC0Qud1yFmIaDAs+utAetz9bVayIEeRNlnmPwU2ZGZJ2RnLaRql8z4KGzzNw5VRMS GmdQ== 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 q18-20020a170906361200b007788260dfdbsi542460ejb.862.2022.09.09.08.50.00; Fri, 09 Sep 2022 08:50: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 F3B3968BB5B; Fri, 9 Sep 2022 18:49:11 +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 8A54768BB25 for ; Fri, 9 Sep 2022 18:49:05 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id F1090C00BC for ; Fri, 9 Sep 2022 18:49:01 +0300 (EEST) From: remi@remlab.net To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Sep 2022 18:48:57 +0300 Message-Id: <20220909154859.68954-16-remi@remlab.net> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 16/18] lavu/riscv: float vector windowed overlap/add with RVV 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: yJy3tWjbO0O8 From: RĂ©mi Denis-Courmont --- libavutil/riscv/float_dsp_init.c | 3 +++ libavutil/riscv/float_dsp_rvv.S | 35 ++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/libavutil/riscv/float_dsp_init.c b/libavutil/riscv/float_dsp_init.c index e6a5efbf68..99cc8afd31 100644 --- a/libavutil/riscv/float_dsp_init.c +++ b/libavutil/riscv/float_dsp_init.c @@ -28,6 +28,8 @@ void ff_vector_fmac_scalar_rvv(float *dst, const float *src, float mul, int len); void ff_vector_fmul_scalar_rvv(float *dst, const float *src, float mul, int len); +void ff_vector_fmul_window_rvv(float *dst, const float *src0, + const float *src1, const float *win, int len); void ff_vector_fmul_add_rvv(float *dst, const float *src0, const float *src1, const float *src2, int len); void ff_vector_fmul_reverse_rvv(float *dst, const float *src0, @@ -50,6 +52,7 @@ av_cold void ff_float_dsp_init_riscv(AVFloatDSPContext *fdsp) fdsp->vector_fmul = ff_vector_fmul_rvv; fdsp->vector_fmac_scalar = ff_vector_fmac_scalar_rvv; fdsp->vector_fmul_scalar = ff_vector_fmul_scalar_rvv; + fdsp->vector_fmul_window = ff_vector_fmul_window_rvv; fdsp->vector_fmul_add = ff_vector_fmul_add_rvv; fdsp->vector_fmul_reverse = ff_vector_fmul_reverse_rvv; fdsp->butterflies_float = ff_butterflies_float_rvv; diff --git a/libavutil/riscv/float_dsp_rvv.S b/libavutil/riscv/float_dsp_rvv.S index b376392294..65daaa2d27 100644 --- a/libavutil/riscv/float_dsp_rvv.S +++ b/libavutil/riscv/float_dsp_rvv.S @@ -73,6 +73,41 @@ NOHWF mv a2, a3 ret endfunc +func ff_vector_fmul_window_rvv, zve32f + // a0: dst, a1: src0, a2: src1, a3: window, a4: length + addi t0, a4, -1 + add t1, t0, a4 + slli t0, t0, 2 + slli t1, t1, 2 + add a2, a2, t0 + add t0, a0, t1 + add t3, a3, t1 + li t1, -4 // byte stride + +1: vsetvli t2, a4, e32, m4, ta, ma + slli t4, t2, 2 + vle32.v v16, (a1) + add a1, a1, t4 + vlse32.v v20, (a2), t1 + sub a2, a2, t4 + vle32.v v24, (a3) + add a3, a3, t4 + vlse32.v v28, (t3), t1 + sub t3, t3, t4 + vfmul.vv v0, v16, v28 + sub a4, a4, t2 + vfmul.vv v8, v16, v24 + vfnmsac.vv v0, v20, v24 + vfmacc.vv v8, v20, v28 + vse32.v v0, (a0) + add a0, a0, t4 + vsse32.v v8, (t0), t1 + sub t0, t0, t4 + bnez a4, 1b + + ret +endfunc + // (a0) = (a1) * (a2) + (a3) [0..a4-1] func ff_vector_fmul_add_rvv, zve32f 1: vsetvli t0, a4, e32, m8, ta, ma