From patchwork Tue Sep 6 18:43:55 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: 37729 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp3444507pzh; Tue, 6 Sep 2022 11:45:45 -0700 (PDT) X-Google-Smtp-Source: AA6agR54VTbtBgvOKwSRajpuKKDicFndeNpgu6wPsxCsH/GQ1jp5URMJ/rVE8DAGCXoSupJhKAaK X-Received: by 2002:a17:907:2c4f:b0:741:5b68:e2d9 with SMTP id hf15-20020a1709072c4f00b007415b68e2d9mr31836555ejc.314.1662489945465; Tue, 06 Sep 2022 11:45:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662489945; cv=none; d=google.com; s=arc-20160816; b=VFwHng8p97bw56LVyWcIsGJ65AT18c+HBh8pGEKtcYs1gWJK1c/VcMLmIWTwvBD8R1 B2TlXGjk7cxwehUAIUL1wDujqT6LMpfHwxFjbVpsy4a6hrb0acchUC9I+KeA+Gvp+8d8 roA/hsJbwWB6DBO6+hyhbOP/6wuiP+X7CdLtYPUuaal/sFxS2/nZazavjmaZ/8Oc9dF2 w+ort4J5LneSD169/3HuJ49v/bH31GYkAopuzkKEPS443DGrsdTIeiGjCYx9aJ88gRmq RtVOWVuTT1tKOEaAai2XgyYv3MkuMAQH6hfusbMNauoeMrhtjrW4ZvurX+eO5MR9J0uT 4GVQ== 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=XrCnkFn0Cm2u9tx9/7/f04v7NAm0AsdHjU09h5EQE4w=; b=xVdzFcU8KLYT1orNtuIEQ2sKYVAK6mM2UFICmNJvvpRdNTN7oUkGv6oN96ibhnMLQo sl+0XtN5vEq8nmYLRK3iCGfi4Da9Z0gJEDTQ9oYKehJNEQAuoGdRiUs0EwNsX2Sn740M YiNdMZrYn6MoP5eIJi9RzHM7OpU+zShVHXBGz9Wfol8BSb+ip8q8Ggo91Q3YbF86Lk9q Yd3ZGGuhshGiESejNoLWlFjW0gLCA9HnxS2zCZD693Es6t/y+kaemh24tySW0lqZDMNw p0D1Qnt9GR7UW0RHVJ32Erkr3QPJWlTLEMeta/e4WHMsCsZw3CN9P9gevuwD9IJhYZGt koTw== 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 i6-20020a1709064fc600b00731868bc6e8si628451ejw.58.2022.09.06.11.45.44; Tue, 06 Sep 2022 11:45:45 -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 AB46B68BB6A; Tue, 6 Sep 2022 21:44:19 +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 4C2C968BB20 for ; Tue, 6 Sep 2022 21:44:03 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 0A33CC00B1 for ; Tue, 6 Sep 2022 21:44:03 +0300 (EEST) From: remi@remlab.net To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Sep 2022 21:43:55 +0300 Message-Id: <20220906184402.119826-5-remi@remlab.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <5753736.MhkbZ0Pkbq@basile.remlab.net> References: <5753736.MhkbZ0Pkbq@basile.remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/12] lavu/riscv: float vector-vector multiplication 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: Nk/Txhj9wzVm From: Rémi Denis-Courmont --- libavutil/riscv/float_dsp_init.c | 9 ++++++++- libavutil/riscv/float_dsp_rvv.S | 34 ++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/libavutil/riscv/float_dsp_init.c b/libavutil/riscv/float_dsp_init.c index 279412c036..4135284c76 100644 --- a/libavutil/riscv/float_dsp_init.c +++ b/libavutil/riscv/float_dsp_init.c @@ -22,9 +22,13 @@ #include "libavutil/cpu.h" #include "libavutil/float_dsp.h" +void ff_vector_fmul_rvv(float *dst, const float *src0, const float *src1, + 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_dmul_scalar_rvv(double *dst, const double *src, double mul, int len); @@ -33,9 +37,12 @@ av_cold void ff_float_dsp_init_riscv(AVFloatDSPContext *fdsp) int flags = av_get_cpu_flags(); if (flags & AV_CPU_FLAG_ZVE32F) { + fdsp->vector_fmul = ff_vector_fmul_rvv; fdsp->vector_fmul_scalar = ff_vector_fmul_scalar_rvv; - if (flags & AV_CPU_FLAG_ZVE64D) + if (flags & AV_CPU_FLAG_ZVE64D) { + fdsp->vector_dmul = ff_vector_dmul_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 365e00190c..65c3a77b01 100644 --- a/libavutil/riscv/float_dsp_rvv.S +++ b/libavutil/riscv/float_dsp_rvv.S @@ -19,6 +19,23 @@ #include "config.h" #include "asm.S" +// (a0) = (a1) * (a2) [0..a3-1] +func ff_vector_fmul_rvv, zve32f +1: vsetvli t0, a3, e32, m8, ta, ma + slli t1, t0, 2 + vle32.v v16, (a1) + add a1, a1, t1 + vle32.v v24, (a2) + add a2, a2, t1 + vfmul.vv v16, v16, v24 + sub a3, a3, t0 + vse32.v v16, (a0) + add a0, a0, t1 + bnez a3, 1b + + ret +endfunc + // (a0) = (a1) * fa0 [0..a2-1] func ff_vector_fmul_scalar_rvv, zve32f NOHWF fmv.w.x fa0, a2 @@ -37,6 +54,23 @@ NOHWF mv a2, a3 ret endfunc +// (a0) = (a1) * (a2) [0..a3-1] +func ff_vector_dmul_rvv, zve64d +1: vsetvli t0, a3, e64, m8, ta, ma + slli t1, t0, 3 + vle64.v v16, (a1) + add a1, a1, t1 + vle64.v v24, (a2) + add a2, a2, t1 + vfmul.vv v16, v16, v24 + sub a3, a3, t0 + vse64.v v16, (a0) + add a0, a0, t1 + bnez a3, 1b + + ret +endfunc + // (a0) = (a1) * fa0 [0..a2-1] func ff_vector_dmul_scalar_rvv, zve64d NOHWD fmv.d.x fa0, a2