From patchwork Sun Sep 4 13:54:58 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: 37644 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp2093189pzh; Sun, 4 Sep 2022 06:55:17 -0700 (PDT) X-Google-Smtp-Source: AA6agR4RUH2w64Hw4wF95OXeOaKUd6RhSzqvCi0qALglBlYGRgNJDcJ3LzpkcISEBmS4C4nminVF X-Received: by 2002:a17:907:968f:b0:742:1244:b02 with SMTP id hd15-20020a170907968f00b0074212440b02mr17898232ejc.496.1662299717518; Sun, 04 Sep 2022 06:55:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662299717; cv=none; d=google.com; s=arc-20160816; b=K/GHAwYycGBATpX/t5fz4OZPoEOlBmcKKELTDZb06wiDv3XUMqTrKCd4yT6GUrFX3O RwICtx+PL5IjWXcHJVad9CbZ1AaB/gtIjOUA00qhp5rze/PxZcqlh4L3FuwxmNpE+dEX hrmWXIWpJ5n+yN/I4y29mh7N5ouun4a4wAeBreStNVyx6IHFY5/hg8yev6PpHXLuaekL 6KhcNKFZwECeTHUUSX6l4wjhBZgbfLzE8niFQdUK8d3oh4J+DedTEPC1gW4uG+xVh+yb bPkUhbsKC3J9EWer6tpj0YtdmcN7Hb4XDa8CsI0939hrKnoKPcLP8JTnzgLFsQpJ+/cs Ozpg== 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=MnqgTZuOheLzdLn7T5fJBEYmdblzgM7FFqZiQOCZvcY=; b=ppUkYC21KSvDpJNjHUVICKRvsMNbbNxD7iR2IM4x8CK+GUc/VFDOk1UC73ATn0O7RQ 0iwf5jt5TFzA78YTxD0jQXPWAAuiKDo2XNcETj+X/kCNSFZCIxxfqOdedATJVg05ya1V aiOb7iuvB0OLj6NaFGiBkzTG6zfgUuLsqhf4IozdGQGjqj+wFjoBGgOdQrZ/9BdhD43I euNUBCnyOQ9T3uLyECQUuaKhHFM4g+jqyDMEScWHkMLsG6Gn3aN0DlmVA2JpZDQXJVDv EQ6vLYie/0Qp4U78i+bMZWHF+chSWwfuDqKyzT759ZZ3dXUhO8+56J7yW/9nmCeaqd6R iX0Q== 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 bj15-20020a170906b04f00b0073da846c2c1si4927461ejb.524.2022.09.04.06.55.17; Sun, 04 Sep 2022 06:55:17 -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 6FB1E68BAC8; Sun, 4 Sep 2022 16:55:06 +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 62CE868BAAA for ; Sun, 4 Sep 2022 16:55:04 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 1F895C00AE for ; Sun, 4 Sep 2022 16:55:04 +0300 (EEST) From: remi@remlab.net To: ffmpeg-devel@ffmpeg.org Date: Sun, 4 Sep 2022 16:54:58 +0300 Message-Id: <20220904135503.116704-5-remi@remlab.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <3372981.QJadu78ljV@basile.remlab.net> References: <3372981.QJadu78ljV@basile.remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/10] riscv: float vector multiply-accumulate 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: 3FHPhSwK+UW9 From: Rémi Denis-Courmont --- libavutil/riscv/float_dsp_init.c | 6 +++++ libavutil/riscv/float_dsp_rvv.S | 42 ++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/libavutil/riscv/float_dsp_init.c b/libavutil/riscv/float_dsp_init.c index 4135284c76..a1bb112ec7 100644 --- a/libavutil/riscv/float_dsp_init.c +++ b/libavutil/riscv/float_dsp_init.c @@ -24,11 +24,15 @@ void ff_vector_fmul_rvv(float *dst, const float *src0, const float *src1, int len); +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_dmul_rvv(double *dst, const double *src0, const double *src1, int len); +void ff_vector_dmac_scalar_rvv(double *dst, const double *src, double mul, + int len); void ff_vector_dmul_scalar_rvv(double *dst, const double *src, double mul, int len); @@ -38,10 +42,12 @@ av_cold void ff_float_dsp_init_riscv(AVFloatDSPContext *fdsp) if (flags & AV_CPU_FLAG_ZVE32F) { 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; if (flags & AV_CPU_FLAG_ZVE64D) { fdsp->vector_dmul = ff_vector_dmul_rvv; + fdsp->vector_dmac_scalar = ff_vector_dmac_scalar_rvv; fdsp->vector_dmul_scalar = ff_vector_dmul_scalar_rvv; } } diff --git a/libavutil/riscv/float_dsp_rvv.S b/libavutil/riscv/float_dsp_rvv.S index 15c875f9d2..8adfa6085c 100644 --- a/libavutil/riscv/float_dsp_rvv.S +++ b/libavutil/riscv/float_dsp_rvv.S @@ -38,6 +38,27 @@ func ff_vector_fmul_rvv ret endfunc +// (a0) += (a1) * fa0 [0..a2-1] +func ff_vector_fmac_scalar_rvv +#if defined (__riscv_float_abi_soft) + fmv.w.x fa0, a2 + mv a2, a3 +#endif + +1: vsetvli t0, a2, e32, m8, ta, ma + slli t1, t0, 2 + vle32.v v24, (a1) + add a1, a1, t1 + vle32.v v16, (a0) + vfmacc.vf v16, fa0, v24 + sub a2, a2, t0 + vse32.v v16, (a0) + add a0, a0, t1 + bnez a2, 1b + + ret +endfunc + // (a0) = (a1) * fa0 [0..a2-1] func ff_vector_fmul_scalar_rvv #if defined (__riscv_float_abi_soft) @@ -75,6 +96,27 @@ func ff_vector_dmul_rvv ret endfunc +// (a0) += (a1) * fa0 [0..a2-1] +func ff_vector_dmac_scalar_rvv +#if defined (__riscv_float_abi_soft) || defined (__riscv_float_abi_single) + fmv.d.x fa0, a2 + mv a2, a3 +#endif + +1: vsetvli t0, a2, e64, m8, ta, ma + slli t1, t0, 3 + vle64.v v24, (a1) + add a1, a1, t1 + vle64.v v16, (a0) + vfmacc.vf v16, fa0, v24 + sub a2, a2, t0 + vse64.v v16, (a0) + add a0, a0, t1 + bnez a2, 1b + + ret +endfunc + // (a0) = (a1) * fa0 [0..a2-1] func ff_vector_dmul_scalar_rvv #if defined (__riscv_float_abi_soft) || defined (__riscv_float_abi_single)