From patchwork Sun Oct 2 11:55:00 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: 38516 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp745001pzh; Sun, 2 Oct 2022 04:55:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4+W26o7CZIUdDPTadh6w9Hx8cLTCS3RnJ+5+h/jmJPIOszjLGx3qRau6CdHTOtnapCWdBn X-Received: by 2002:a05:6402:2547:b0:450:668c:9d93 with SMTP id l7-20020a056402254700b00450668c9d93mr14976484edb.92.1664711727284; Sun, 02 Oct 2022 04:55:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664711727; cv=none; d=google.com; s=arc-20160816; b=Pv6fCHCdt5zca71kgax4wFVKe3eDxDkNiBvlQ/nzuzgdxh8PHtV3pEfY4VLoO5AN/H 31qF/1NF1L4e78E8QbE/wY1RAlDVQKFbwzOmQSYAlTrryKLfS1bn5/Itbnh6DRMwBfgo oy73Ahpx9OariqaoFGmgr+HgDKo3rzNXtU6TJ1diLPGJfzRsgo1H9zwokSr9kK0SrcRu gDCM25WbN2/2xeal1kVODCvpgPvWp0ChuY2q9bGG6vUyNhuLS30InhFere6mFHk/ni3I I+stbuLzS+KsyLvCOGpDHZ5/ElzCbR+1Lt5zg4eiIuN+aRJteSBu53x7jbe3gc5r8LIm QagA== 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=r8nEETVqsJsTIy8UudPrrBfgiqHTzhtYVR79+BHLB70=; b=MpW4DEm98Uo7/rHqrIHLIttZv/LhIfBc0n/v5orB/V9g7+izRzgYKIP/EqHdMFkdFN RK9dePaUX4feLekAHnWJrya/flbgPEDNYH5pHBjl2OtoAEcm6cuSQipnrkoretOcZYYw DBw5fncsoz/QAjOxlGsN4BiEtIWKHFLdmlk2l+U/Jfske81z+Vh+PAabnBcJnvRD553/ ITfHY5pdqW1bd12WDoW/Dp87wComzdjHh+JpteNW6gde/AbslGqx7QTtk+9r4xjbsnzK pSQvZ2kUfWUA7Bw13g3Q8szhXMRm0mErGMHtvaYBvlym6gDsq7HIMHVXNDxIBh0sxRTM esMg== 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 ec18-20020a170906b6d200b0077156c9124esi5677136ejb.1001.2022.10.02.04.55.26; Sun, 02 Oct 2022 04:55:27 -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 5A08068BB75; Sun, 2 Oct 2022 14:55:10 +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 65CCE68BB41 for ; Sun, 2 Oct 2022 14:55:02 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 1C6EDC00AF for ; Sun, 2 Oct 2022 14:55:02 +0300 (EEST) From: remi@remlab.net To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Oct 2022 14:55:00 +0300 Message-Id: <20221002115501.17996-3-remi@remlab.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <2650188.mvXUDI8C0e@basile.remlab.net> References: <2650188.mvXUDI8C0e@basile.remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] lavc/bswapdsp: RISC-V V bswap_buf 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: Uvj7m0T04Iuu From: Rémi Denis-Courmont --- libavcodec/riscv/Makefile | 1 + libavcodec/riscv/bswapdsp_init.c | 7 ++++- libavcodec/riscv/bswapdsp_rvv.S | 45 ++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 libavcodec/riscv/bswapdsp_rvv.S diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index db4384bca7..b94901ce8d 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -5,6 +5,7 @@ OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_init.o \ RVV-OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_rvv.o OBJS-$(CONFIG_BSWAPDSP) += riscv/bswapdsp_init.o \ riscv/bswapdsp_rvb.o +RVV-OBJS-$(CONFIG_BSWAPDSP) += riscv/bswapdsp_rvv.o OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_init.o RVV-OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_rvv.o OBJS-$(CONFIG_IDCTDSP) += riscv/idctdsp_init.o diff --git a/libavcodec/riscv/bswapdsp_init.c b/libavcodec/riscv/bswapdsp_init.c index 701dbeaaa6..c17b6b75bb 100644 --- a/libavcodec/riscv/bswapdsp_init.c +++ b/libavcodec/riscv/bswapdsp_init.c @@ -26,13 +26,18 @@ #include "libavcodec/bswapdsp.h" void ff_bswap32_buf_rvb(uint32_t *dst, const uint32_t *src, int len); +void ff_bswap32_buf_rvv(uint32_t *dst, const uint32_t *src, int len); av_cold void ff_bswapdsp_init_riscv(BswapDSPContext *c) { -#if (__riscv_xlen >= 64) int cpu_flags = av_get_cpu_flags(); +#if (__riscv_xlen >= 64) if (cpu_flags & AV_CPU_FLAG_RVB_BASIC) c->bswap_buf = ff_bswap32_buf_rvb; #endif +#if HAVE_RVV + if (cpu_flags & AV_CPU_FLAG_RVV_I32) + c->bswap_buf = ff_bswap32_buf_rvv; +#endif } diff --git a/libavcodec/riscv/bswapdsp_rvv.S b/libavcodec/riscv/bswapdsp_rvv.S new file mode 100644 index 0000000000..7ea747b3ce --- /dev/null +++ b/libavcodec/riscv/bswapdsp_rvv.S @@ -0,0 +1,45 @@ +/* + * Copyright © 2022 Rémi Denis-Courmont. + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" +#include "libavutil/riscv/asm.S" + +func ff_bswap32_buf_rvv, zve32x + li t4, 4 + addi t1, a0, 1 + addi t2, a0, 2 + addi t3, a0, 3 +1: + vsetvli t0, a2, e8, m1, ta, ma + vlseg4e8.v v8, (a1) + sub a2, a2, t0 + sh2add a1, t0, a1 + vsse8.v v8, (t3), t4 + sh2add t3, t0, t3 + vsse8.v v9, (t2), t4 + sh2add t2, t0, t2 + vsse8.v v10, (t1), t4 + sh2add t1, t0, t1 + vsse8.v v11, (a0), t4 + sh2add a0, t0, a0 + bnez a2, 1b + + ret +endfunc