From patchwork Tue Oct 3 20:12:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 44134 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f21:b0:15d:8365:d4b8 with SMTP id gi33csp87347pzb; Tue, 3 Oct 2023 13:12:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGQFsa0GQjDOqcbTKEkFqQbl1AMjW/3ynFNbfEn+CYZ8utCRQD4a2aoBVmjcR6oCxpJ1mka X-Received: by 2002:a17:906:1099:b0:9ae:5fe1:ef00 with SMTP id u25-20020a170906109900b009ae5fe1ef00mr166515eju.45.1696363944765; Tue, 03 Oct 2023 13:12:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696363944; cv=none; d=google.com; s=arc-20160816; b=qnF1LFVAnBm66iSQb1uZL7WggGqmTilFqVH1t9K8PLgwysgOomJ8O/QraKlYnI6G9C MppoJ9edEW5khT2bfBA03h0HxmIfIlCV6Aae+WNE9ruGXCWgj7XA7ykk+iTvdeHZGdnX xNM0F/1J7rUgvPbjRGrbgmGU6PgEcCxjttWlM8Iee6tSzSzyk8gkPpINYc6LfJzQLC/B o5c4bQDmRLtOU7mWOsBH1hkWlfccJkNuJj3e/g3Qz/nvaUu4yj0RRCTt6ZqA+Xcd/nG2 /4LsBpsFQH13x5Wr7V9YSCqLVTC0rnDAm03KHKCNy6fjbDTPEa8Q/O0fSFPK5QaRVcfd UnXg== 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=jDjS/XMym8mDNBolQ1q1aleE0zmDVzWbujCmWz4mHYs=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=FAr83KlfTmMcDAQ0YOCFFf2D94OjKsfbqG+qNmauJ4NGH5TFaZvdNkeq48GF7ACyT0 ZJI3zAhCW/imjiCQzUV/IfFYT2Bne5JkylgcUwAEGyMyG9qwx+gCuuzaAr6xT559E4RB 43dleVGhdfPp1RK39yfVPRx/0JxdXUJpFqfuTehDmXwux54yA7pVG4+4xY0VoAYLQBe6 NFxlzVo05zbF/XnUH5AXhcVPC1qCVknjU7WxSUKp7zEkCtT2kNqaHltx2TzaPvqZYTt3 aRJFbJm532Nk8NKnfcqcazLrmufd/cCKoH5WlZEYrZ/nHBrhK72TifmYk1mnK6yAOAAr /R0Q== 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 ha5-20020a170906a88500b009a0d5192b08si995830ejb.725.2023.10.03.13.12.24; Tue, 03 Oct 2023 13:12:24 -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 0F60168CB71; Tue, 3 Oct 2023 23:12:12 +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 CAC9D68CAA3 for ; Tue, 3 Oct 2023 23:12:03 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 41DD1C0173 for ; Tue, 3 Oct 2023 23:12:03 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Oct 2023 23:12:02 +0300 Message-ID: <20231003201202.121744-2-remi@remlab.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231003201202.121744-1-remi@remlab.net> References: <20231003201202.121744-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavu/fixed_dsp: R-V V vector_fmul_add 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: ztjF5pK3yctp vector_fmul_add_fixed_c: 2.7 vector_fmul_add_fixed_rvv_i64: 0.7 --- libavutil/riscv/fixed_dsp_init.c | 6 +++++- libavutil/riscv/fixed_dsp_rvv.S | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/libavutil/riscv/fixed_dsp_init.c b/libavutil/riscv/fixed_dsp_init.c index 409b6d7b55..42e2e69756 100644 --- a/libavutil/riscv/fixed_dsp_init.c +++ b/libavutil/riscv/fixed_dsp_init.c @@ -25,6 +25,8 @@ #include "libavutil/cpu.h" #include "libavutil/fixed_dsp.h" +void ff_vector_fmul_add_fixed_rvv(int *dst, const int *src0, const int *src1, + const int *src2, int len); int ff_scalarproduct_fixed_rvv(const int *v1, const int *v2, int len); void ff_butterflies_fixed_rvv(int *v1, int *v2, int len); @@ -34,8 +36,10 @@ av_cold void ff_fixed_dsp_init_riscv(AVFixedDSPContext *fdsp) int flags = av_get_cpu_flags(); if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR)) { - if (flags & AV_CPU_FLAG_RVV_I64) + if (flags & AV_CPU_FLAG_RVV_I64) { + fdsp->vector_fmul_add = ff_vector_fmul_add_fixed_rvv; fdsp->scalarproduct_fixed = ff_scalarproduct_fixed_rvv; + } fdsp->butterflies_fixed = ff_butterflies_fixed_rvv; } #endif diff --git a/libavutil/riscv/fixed_dsp_rvv.S b/libavutil/riscv/fixed_dsp_rvv.S index 83cad4bde3..ddff0636e5 100644 --- a/libavutil/riscv/fixed_dsp_rvv.S +++ b/libavutil/riscv/fixed_dsp_rvv.S @@ -20,6 +20,28 @@ #include "asm.S" +func ff_vector_fmul_add_fixed_rvv, zve64x + li t1, 1 << 30 +1: + vsetvli t0, a4, e32, m4, ta, ma + vle32.v v16, (a1) + sub a4, a4, t0 + vle32.v v20, (a2) + sh2add a1, t0, a1 + vwmul.vv v24, v16, v20 + vle32.v v12, (a3) + sh2add a2, t0, a2 + vwadd.wx v24, v24, t1 + vnsra.wi v8, v24, 31 + sh2add a3, t0, a3 + vadd.vv v8, v12, v8 + vse32.v v8, (a0) + sh2add a0, t0, a0 + bnez a4, 1b + + ret +endfunc + func ff_scalarproduct_fixed_rvv, zve64x li t1, 1 << 30 vsetvli t0, zero, e64, m8, ta, ma