From patchwork Wed Oct 4 19:51:07 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: 44151 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f21:b0:15d:8365:d4b8 with SMTP id gi33csp749596pzb; Wed, 4 Oct 2023 12:51:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFsOLStE86fANWygsghFCcEDGCI1pOMGpBHOwMzo6vaz4bOxDiKqaEtlO7DktnsdSlS7glf X-Received: by 2002:aa7:c6c4:0:b0:532:ec54:bfff with SMTP id b4-20020aa7c6c4000000b00532ec54bfffmr2789751eds.16.1696449103823; Wed, 04 Oct 2023 12:51:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696449103; cv=none; d=google.com; s=arc-20160816; b=tjWc3gZtfvFRrG8lAkxpPp3JnYB/49ZeMk80qkMhOL2s4wNGf+SaTAfR4dI/vAtc7v 3O4cYrIKkXK6S+xzGmdGN7+wX+WObonKj7H02j9beAP4n/gkihhIE3C4YyT9aW+STmyC bb9i1WwSSTsHq5dYReMiGi3chYjaTMbCpTEbqox/cGmJ4ZK7iyVBNoyOH0jHFnCAhM1Q outenOG3fA/la+7iQzb711z1DVq1iJqFqmzcgx+bWkgBUDaVk4h6+MzE5mMHmsv0hN0K Vb2dhqEM2+R+3SB0AxiIiRudcHjGepbLUEvIY4RfiyISiVwHAIxnGSlE5z3XQn6Yj8Km 9F9w== 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=xloBxJIGW3ZeMcennh61HE8X4zWpJ4SmgQqpsBKlEow=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=C/E+zchVDeRWSnevRzt60IcFVwY6VtHLIfy7qahRsguecrigbM3OcQUgVEQt6esx1V vDW/ot4eWW4HHNiiy1MvgvieJ81lHkCf2bXSV7+dBWZCJDIz/4jd3uuBOOgF20PFqVLQ kdEmfR/HLqjZMdBmkYeELsjghq97yXHLFVMKeJerIwMar6VB+elnBT1UDgZ9nItcN4aA icZlYvBhul6Vbhw7J5KPgVD84y/BdSZvw9kgaycVPbAqoMGSiUHNs0RFv6Gvk0R4Ino2 Ifw41zmImHwk6n4w1zw25303SKoMnec7PmF4iGg7HApfZ0tCSaS4IsBtE36XXR33cND5 sXCA== 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 r23-20020aa7cfd7000000b005330d65e9c8si198916edy.339.2023.10.04.12.51.21; Wed, 04 Oct 2023 12:51:43 -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 BB14568C50A; Wed, 4 Oct 2023 22:51:17 +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 CBE9368CA02 for ; Wed, 4 Oct 2023 22:51:10 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 6758DC006A for ; Wed, 4 Oct 2023 22:51:10 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Oct 2023 22:51:07 +0300 Message-ID: <20231004195110.38615-1-remi@remlab.net> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] 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: HCWn9muTMu68 vector_fmul_add_fixed_c: 2.2 vector_fmul_add_fixed_rvv_i64: 0.5 --- libavutil/riscv/fixed_dsp_init.c | 5 +++++ libavutil/riscv/fixed_dsp_rvv.S | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/libavutil/riscv/fixed_dsp_init.c b/libavutil/riscv/fixed_dsp_init.c index 409b6d7b55..4b239829f5 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,11 @@ 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)) { + fdsp->vector_fmul_add = ff_vector_fmul_add_fixed_rvv; + if (flags & AV_CPU_FLAG_RVV_I64) 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..1022a401d3 100644 --- a/libavutil/riscv/fixed_dsp_rvv.S +++ b/libavutil/riscv/fixed_dsp_rvv.S @@ -20,6 +20,27 @@ #include "asm.S" + +func ff_vector_fmul_add_fixed_rvv, zve32x + csrwi vxrm, 0 +1: + vsetvli t0, a4, e32, m8, ta, ma + vle32.v v16, (a1) + sub a4, a4, t0 + vle32.v v24, (a2) + sh2add a1, t0, a1 + vsmul.vv v8, v16, v24 + sh2add a2, t0, a2 + vle32.v v0,(a3) + sh2add a3, t0, a3 + vadd.vv v8, v8, v0 + 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 From patchwork Wed Oct 4 19:51:08 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: 44152 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f21:b0:15d:8365:d4b8 with SMTP id gi33csp749598pzb; Wed, 4 Oct 2023 12:51:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE5rPGYN8Bep67BZ3MglgmRG5rZeWhvJR1grF1WPywWTBOMg4rCL61IWLWBG0c7u8KXUqQu X-Received: by 2002:aa7:cf92:0:b0:531:2116:c7dc with SMTP id z18-20020aa7cf92000000b005312116c7dcmr2757404edx.12.1696449103892; Wed, 04 Oct 2023 12:51:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696449103; cv=none; d=google.com; s=arc-20160816; b=M1JtQC7ntFvZAsYMZB8b2+WI9UlxTP3YrVuRPRD5ywIV5bOwuqksDB/UrTUJCuE4cO TRKDGFO+PTuOwn7DGy/RPc42jokm/pHl+1PETJRsO7vTwET/B9DA/imwGUVTnKn6RKt9 xs/9WB9VG69t+15VSamIOvQ7IomAhLCHAjbxiLgkKEYVpsFjnM7qD6Ge0bsnoBL/iw0V U+itLwlDf64DmXlfKnvi7BSX9AYgUU/wjfOciAN+omsevZfaJKemv2sStuotq+D8DhiX cLhffQoMcy9w8KCSqHg9Vs+HXt8PXt9jdER1DuQsGK74XcHImyuC6cHUmogoRWDsF4EE 3jMA== 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=cejdcXpsYNwQQUchdOIvI/pBOtyliLYb74KRCsowxT0=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=D6LtV3V8vB88MVP0L5Oqg7H58CrLWIJjdwdhqjAh7OaohqHHm62L5lSWVhxGCpV6nB /2zo80eoec7G6ouHpClLhWzE2xbVzIhqPfJgaOrEu7k3euZiofoHlQIhNj/KumjoKsNf Vl01Zu0XwqbcPy6XnmJJ2MiXAcjlOWzYSxp+8NqN0YgkUOnd8yWLZJra8mO0uPMlq3zS v2CIoAGJ0xOnU9oM6hg+h2Ze9Eu4r6MCogmFflJa2rrDaiTlKwz8bQs0CLhux1HVN5e3 EjkzCC80vubPfb0OBuspcOCMXxNqt0AoZSOqgzVJITyrnZbKqEPblboK/R18QxiIZj4E 300Q== 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 w11-20020aa7da4b000000b0053782c81517si204591eds.416.2023.10.04.12.51.31; Wed, 04 Oct 2023 12:51:43 -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 E2BA568CAF4; Wed, 4 Oct 2023 22:51:18 +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 0F89D68CA02 for ; Wed, 4 Oct 2023 22:51:11 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 9CBB9C0099 for ; Wed, 4 Oct 2023 22:51:10 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Oct 2023 22:51:08 +0300 Message-ID: <20231004195110.38615-2-remi@remlab.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231004195110.38615-1-remi@remlab.net> References: <20231004195110.38615-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] lavu/fixed_dsp: R-V V vector_fmul_reverse 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: 5NA6w0f1RRx1 --- libavutil/riscv/fixed_dsp_init.c | 3 +++ libavutil/riscv/fixed_dsp_rvv.S | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/libavutil/riscv/fixed_dsp_init.c b/libavutil/riscv/fixed_dsp_init.c index 4b239829f5..470b35fb63 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_reverse_fixed_rvv(int *dst, const int *src0, + const int *src1, int len); 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); @@ -36,6 +38,7 @@ 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)) { + fdsp->vector_fmul_reverse = ff_vector_fmul_reverse_fixed_rvv; fdsp->vector_fmul_add = ff_vector_fmul_add_fixed_rvv; if (flags & AV_CPU_FLAG_RVV_I64) diff --git a/libavutil/riscv/fixed_dsp_rvv.S b/libavutil/riscv/fixed_dsp_rvv.S index 1022a401d3..8a5d1853c5 100644 --- a/libavutil/riscv/fixed_dsp_rvv.S +++ b/libavutil/riscv/fixed_dsp_rvv.S @@ -20,6 +20,30 @@ #include "asm.S" +func ff_vector_fmul_reverse_fixed_rvv, zve32x + csrwi vxrm, 0 + vsetvli t0, zero, e16, m4, ta, ma + sh2add a2, a3, a2 + vid.v v0 + vadd.vi v0, v0, 1 +1: + vsetvli t0, a3, e16, m4, ta, ma + slli t1, t0, 2 + vrsub.vx v4, v0, t0 // v4[i] = [VL-1, VL-2... 1, 0] + sub a2, a2, t1 + vsetvli zero, zero, e32, m8, ta, ma + vle32.v v8, (a2) + sub a3, a3, t0 + vle32.v v16, (a1) + add a1, a1, t1 + vrgatherei16.vv v24, v8, v4 // v24 = reverse(v8) + vsmul.vv v16, v16, v24 + vse32.v v16, (a0) + add a0, a0, t1 + bnez a3, 1b + + ret +endfunc func ff_vector_fmul_add_fixed_rvv, zve32x csrwi vxrm, 0 From patchwork Wed Oct 4 19:51:09 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: 44153 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f21:b0:15d:8365:d4b8 with SMTP id gi33csp749616pzb; Wed, 4 Oct 2023 12:51:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IExqdOvulpPum0eXy7KuehazTo9r0XgR/vmkG8VLlOcjXy/oBrdtZm1++oIr3VtEQ7uyvML X-Received: by 2002:a17:906:7493:b0:9b2:7148:dd59 with SMTP id e19-20020a170906749300b009b27148dd59mr2523414ejl.37.1696449106786; Wed, 04 Oct 2023 12:51:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696449106; cv=none; d=google.com; s=arc-20160816; b=eiWISMcQuzxcyRNhG2ua3HNqG2RB3Ui503lOqEwtPZuGTnjjfxDBREMblCmoSy4Kib vLVEo24plx4/JVsadGOiQKJOb3+vpjDQmzo1KWvnXiFAp1A1Un5rmr/HuPSEys2CHoJ7 0Jx0lMf8c9RjlgujHF/luOYRS6Bfpje5k3rOD2IjdCmhoRQOxQPQS/Xunj+dvnRK0bpJ NldC9HPGXj5+n128v18h0rLUSdzSm3uhiGftAAAtAoe+L2KOIxSUVoAK/xS01pkiBJL7 pFZTanQGPa+GuRAeJIJrMAclGB0pnyhetvWgzpl8Fhn1Lmmz2CGB1bT//qL8HBf+ZUiC +FLQ== 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=tmsiYlLgXRie+Hwj0XnJyNe3wwCjl9ylsi1xco8CLLk=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=rUPHCGSvfy9WJeZINfTthcRnr8/yzw64fdEHeqfMfVoULDzA4Vwn10hO3vPkbgUDsx APq8XYA7Hod24BDIMl178sYdBFdgf8Y1fR/mvjrkR+/t8VmmjMoDNKnDNBwhJZDZesX4 XvL5HsKt+NQ0TSh1rD1lkol17aY68FzxPFmKijK6WL90zguopQrysj23rR68Feesujud TDGQd2yiccBfqeGggVoHG/lbNI3C+uTWAcKAgqgBcaWGAwEs7wPsfq8Iiwulb6maRnf0 gyG5AAdMhmD2r0Xe0Uf3xOCEcgszANqXxaiMTt/ZvMHEnfHMLL2zXeWoCwqEYyVFmM1n iiqQ== 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 lv25-20020a170906bc9900b009937e7c4e50si1868700ejb.546.2023.10.04.12.51.40; Wed, 04 Oct 2023 12:51:46 -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 02F4668CB23; Wed, 4 Oct 2023 22:51:20 +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 2F96668CA92 for ; Wed, 4 Oct 2023 22:51:11 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id D258BC018F for ; Wed, 4 Oct 2023 22:51:10 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Oct 2023 22:51:09 +0300 Message-ID: <20231004195110.38615-3-remi@remlab.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231004195110.38615-1-remi@remlab.net> References: <20231004195110.38615-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] lavu/fixed_dsp: R-V V vector_fmul 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: 9DhFCODKmGte vector_fmul_fixed_c: 4.0 vector_fmul_fixed_rvv_i64: 0.5 --- libavutil/riscv/fixed_dsp_init.c | 3 +++ libavutil/riscv/fixed_dsp_rvv.S | 17 +++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/libavutil/riscv/fixed_dsp_init.c b/libavutil/riscv/fixed_dsp_init.c index 470b35fb63..02883b31d4 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_fixed_rvv(int *dst, const int *src0, const int *src1, + int len); void ff_vector_fmul_reverse_fixed_rvv(int *dst, const int *src0, const int *src1, int len); void ff_vector_fmul_add_fixed_rvv(int *dst, const int *src0, const int *src1, @@ -38,6 +40,7 @@ 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)) { + fdsp->vector_fmul = ff_vector_fmul_fixed_rvv; fdsp->vector_fmul_reverse = ff_vector_fmul_reverse_fixed_rvv; fdsp->vector_fmul_add = ff_vector_fmul_add_fixed_rvv; diff --git a/libavutil/riscv/fixed_dsp_rvv.S b/libavutil/riscv/fixed_dsp_rvv.S index 8a5d1853c5..d5d538239f 100644 --- a/libavutil/riscv/fixed_dsp_rvv.S +++ b/libavutil/riscv/fixed_dsp_rvv.S @@ -20,6 +20,23 @@ #include "asm.S" +func ff_vector_fmul_fixed_rvv, zve32x + csrwi vxrm, 0 +1: + vsetvli t0, a3, e32, m4, ta, ma + vle32.v v16, (a1) + sub a3, a3, t0 + vle32.v v24, (a2) + sh2add a1, t0, a1 + vsmul.vv v8, v16, v24 + sh2add a2, t0, a2 + vse32.v v8, (a0) + sh2add a0, t0, a0 + bnez a3, 1b + + ret +endfunc + func ff_vector_fmul_reverse_fixed_rvv, zve32x csrwi vxrm, 0 vsetvli t0, zero, e16, m4, ta, ma From patchwork Wed Oct 4 19:51:10 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: 44154 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f21:b0:15d:8365:d4b8 with SMTP id gi33csp749696pzb; Wed, 4 Oct 2023 12:51:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEbBlpitAljNSfkd1MXSlZ/ScrW4cJsEKqBNpseGavKVThnI/IljS/ghOibXJoVS6ctMeon X-Received: by 2002:a05:6402:2037:b0:534:2e37:dfd4 with SMTP id ay23-20020a056402203700b005342e37dfd4mr604560edb.1.1696449116426; Wed, 04 Oct 2023 12:51:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696449116; cv=none; d=google.com; s=arc-20160816; b=BBxnJVnN/vUjbLBXnclRDdfoKazxbX7taBCC/G51UekzSSMsDtJNyIMaaQoF5CUBlS l2M75SByUIevE2fNRcJBaR/ISlv1mstPBFuJHNZRfMkj8PP+7RO1/6f9EOxHALTkdPa9 6gwLuPI/ez2lTKGMDFMJYMv2xIXxw+A+gt7tm9rBLdLBoXqCcTbrNHlZ+KFf87uS3G+F pGVHULsQkstiuLwC0Ub71d2Th+sZPWVMEgqAC5lXU3KfjzFW6Ri/yEo7HEP72kzj9uHb xI9g7jGt42LSWho5TDoNCtoKJ3V986C4LoUXqVpdlhWpZhabeTbSlZC7qmsEkVVSeo25 A3OQ== 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=1GAFj8AeeUtLVDt4I8yXYN/5RIeGgLuaVEqK5fh3DzY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Tzgq0tpom+eKgY+GCE80K7UyQk/Z/DYZPgc2GjifdWlV57QiSXsdMUw90Ieh8HWwJm 2lwhioBLPNz1iutY0Mo1E8nl/0LL/I2MbHgEBuwlJf7sM5BSr3rg8t8hek+MVlS5N9M9 rmigBahVKMJhle8zBFXSPdap0RJbPRQb7F4LC7i99EBQSG6jpJyx1bOZqlnDW3PSXYM5 Rn3lCVTu/V07UQqxPZ+Bj4mB+9uQCilVWKv0UpQiP4bf2UaC2zOtj0+YGiWNzRUiJ8eZ FbRxynv9poVgMIIPA/G/ZGDuQNiUnaNiikxpVuryQM4jt9KWoe+duAnsI4wa2wE82ZT6 B0Jw== 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 o26-20020aa7c51a000000b0053641d17dc9si206568edq.487.2023.10.04.12.51.49; Wed, 04 Oct 2023 12:51:56 -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 0F64C68CB3F; Wed, 4 Oct 2023 22:51:21 +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 65E3368CA92 for ; Wed, 4 Oct 2023 22:51:11 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 09B5EC0190 for ; Wed, 4 Oct 2023 22:51:10 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Oct 2023 22:51:10 +0300 Message-ID: <20231004195110.38615-4-remi@remlab.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231004195110.38615-1-remi@remlab.net> References: <20231004195110.38615-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] lavu/fixed_dsp: R-V V vector_fmul_window 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: ZkfRKXBRVBTB --- libavutil/riscv/fixed_dsp_init.c | 6 +++++ libavutil/riscv/fixed_dsp_rvv.S | 44 ++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/libavutil/riscv/fixed_dsp_init.c b/libavutil/riscv/fixed_dsp_init.c index 02883b31d4..6469b45374 100644 --- a/libavutil/riscv/fixed_dsp_init.c +++ b/libavutil/riscv/fixed_dsp_init.c @@ -25,6 +25,9 @@ #include "libavutil/cpu.h" #include "libavutil/fixed_dsp.h" +void ff_vector_fmul_window_fixed_rvv(int32_t *dst, const int32_t *src0, + const int32_t *src1, const int32_t *win, + int len); void ff_vector_fmul_fixed_rvv(int *dst, const int *src0, const int *src1, int len); void ff_vector_fmul_reverse_fixed_rvv(int *dst, const int *src0, @@ -40,6 +43,9 @@ 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) + fdsp->vector_fmul_window = ff_vector_fmul_window_fixed_rvv; + fdsp->vector_fmul = ff_vector_fmul_fixed_rvv; fdsp->vector_fmul_reverse = ff_vector_fmul_reverse_fixed_rvv; fdsp->vector_fmul_add = ff_vector_fmul_add_fixed_rvv; diff --git a/libavutil/riscv/fixed_dsp_rvv.S b/libavutil/riscv/fixed_dsp_rvv.S index d5d538239f..5b666016a0 100644 --- a/libavutil/riscv/fixed_dsp_rvv.S +++ b/libavutil/riscv/fixed_dsp_rvv.S @@ -20,6 +20,50 @@ #include "asm.S" +func ff_vector_fmul_window_fixed_rvv, zve64x + csrwi vxrm, 0 + vsetvli t0, zero, e16, m1, ta, ma + sh2add a2, a4, a2 + vid.v v0 + sh3add t3, a4, a3 + vadd.vi v0, v0, 1 + sh3add t0, a4, a0 +1: + vsetvli t2, a4, e16, m1, ta, ma + slli t4, t2, 2 + vrsub.vx v2, v0, t2 + sub t3, t3, t4 + vsetvli zero, zero, e32, m2, ta, ma + sub a2, a2, t4 + vle32.v v8, (t3) + sub t0, t0, t4 + vle32.v v4, (a2) + sub a4, a4, t2 + vrgatherei16.vv v28, v8, v2 + vle32.v v16, (a1) + add a1, a1, t4 + vrgatherei16.vv v20, v4, v2 + vle32.v v24, (a3) + add a3, a3, t4 + vwmul.vv v12, v16, v28 + vwmul.vv v8, v16, v24 + // vwnmsac.vv does _not_ exist so multiply & subtract separately + vwmul.vv v4, v20, v24 + vwmacc.vv v8, v20, v28 + vsetvli zero, zero, e64, m4, ta, ma + vsub.vv v12, v12, v4 + vsetvli zero, zero, e32, m2, ta, ma + vnclip.wi v16, v8, 31 + vnclip.wi v20, v12, 31 + vrgatherei16.vv v8, v16, v2 + vse32.v v20, (a0) + add a0, a0, t4 + vse32.v v8, (t0) + bnez a4, 1b + + ret +endfunc + func ff_vector_fmul_fixed_rvv, zve32x csrwi vxrm, 0 1: