From patchwork Thu Oct 5 16:48:57 2023 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: 44160 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a24:b0:15d:8365:d4b8 with SMTP id t36csp159248pzh; Thu, 5 Oct 2023 09:49:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGSRT5RpIch5wm4vyrM3nV2FP6dmzuprHwpENiI2U0isbEmi26ZzRT/HM10KlFgAcU1GEhU X-Received: by 2002:a17:906:76d2:b0:9a9:f14a:22fa with SMTP id q18-20020a17090676d200b009a9f14a22famr5205746ejn.16.1696524551398; Thu, 05 Oct 2023 09:49:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696524551; cv=none; d=google.com; s=arc-20160816; b=IJS8wbdRYXZqO/Q0q+plzphWL/0hV11ej9xIyY2CzMvamNuZdXglKkF48obWjr35As bSqge+MY2LEfS9Qo7E2TyoY+bxodsKTNRfpiE98QvjCccbrPMNOV7yj4DKBkPdNY5r3H s32LpuYp+M0EcePjL/4xyyQ11R4vJFLqlOcdKJdPLTgQez3gu7FERqMbxEjxs/NbbCXv NBwxiUiBI32aNpdU/nvZy9ZX6XgZKcF1/90LV5OPT4yDFvlrElYulgEotFN83O6bPlZd gueEVkpvsswPZxDOx6kY4yaDELVv2+QUpwZbCDzXm7dQvOo28/7xOu+pIxTiFhJcgWkg jRuw== 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=JBLF4kYs2nWTalithNPbkQ19pmRH819JG+3cBJHFKGo=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=sK6B7dQfrglX83W4pYX/zatq/+MTOxFfV32zPTDVrrRnIeYQD0yUKbOXvhcB41W8eX TZ46yoWPO9Xl1Hv+TsZ5d2ocAdY7Lwow8HoP/PHrjWCcO3tTjA0zUT/8Wm3011uypx72 TdPNIo4xt5bOnipC7ExWAS7CT9FbKgsy1uY8+PFgJegzzDNwzGTybuZEBogYcp2M7qtC vbauxLjJUg3G0+YWbfaEhYmblKSz96TO49hzKBOpWy0zn3kqmUTJEDkfzTiC93ZVgPVy U3WRxw9uu/owFpPkCJqdLNEVFmMxcxPwP3RcOLNqdesYQ4MV2f8MrHdwkbX0l7527NlQ +j2g== 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 u10-20020a17090657ca00b0099319803901si852415ejr.844.2023.10.05.09.49.10; Thu, 05 Oct 2023 09:49:11 -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 984D668CAD8; Thu, 5 Oct 2023 19:49: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 5359368C6DC for ; Thu, 5 Oct 2023 19:48:59 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 9832DC0186 for ; Thu, 5 Oct 2023 19:48:58 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Oct 2023 19:48:57 +0300 Message-ID: <20231005164858.54963-1-remi@remlab.net> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/exrdsp: R-V V reoder_pixels 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: aqy/pQv3IoJI --- libavcodec/exrdsp.c | 4 +++- libavcodec/exrdsp.h | 1 + libavcodec/riscv/Makefile | 2 ++ libavcodec/riscv/exrdsp_init.c | 38 ++++++++++++++++++++++++++++++++++ libavcodec/riscv/exrdsp_rvv.S | 38 ++++++++++++++++++++++++++++++++++ 5 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 libavcodec/riscv/exrdsp_init.c create mode 100644 libavcodec/riscv/exrdsp_rvv.S diff --git a/libavcodec/exrdsp.c b/libavcodec/exrdsp.c index 8259da4841..752e1eb553 100644 --- a/libavcodec/exrdsp.c +++ b/libavcodec/exrdsp.c @@ -51,7 +51,9 @@ av_cold void ff_exrdsp_init(ExrDSPContext *c) c->reorder_pixels = reorder_pixels_scalar; c->predictor = predictor_scalar; -#if ARCH_X86 +#if ARCH_RISCV + ff_exrdsp_init_riscv(c); +#elif ARCH_X86 ff_exrdsp_init_x86(c); #endif } diff --git a/libavcodec/exrdsp.h b/libavcodec/exrdsp.h index aba3d3cf51..ea37c8b08e 100644 --- a/libavcodec/exrdsp.h +++ b/libavcodec/exrdsp.h @@ -28,6 +28,7 @@ typedef struct ExrDSPContext { } ExrDSPContext; void ff_exrdsp_init(ExrDSPContext *c); +void ff_exrdsp_init_riscv(ExrDSPContext *c); void ff_exrdsp_init_x86(ExrDSPContext *c); #endif /* AVCODEC_EXRDSP_H */ diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index cc9c13e6b6..31ad493cd3 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -10,6 +10,8 @@ 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_EXR_DECODER) += riscv/exrdsp_init.o +RVV-OBJS-$(CONFIG_EXR_DECODER) += riscv/exrdsp_rvv.o OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_init.o RVV-OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_rvv.o OBJS-$(CONFIG_G722DSP) += riscv/g722dsp_init.o diff --git a/libavcodec/riscv/exrdsp_init.c b/libavcodec/riscv/exrdsp_init.c new file mode 100644 index 0000000000..690a2231c5 --- /dev/null +++ b/libavcodec/riscv/exrdsp_init.c @@ -0,0 +1,38 @@ +/* + * Copyright © 2023 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 + +#include "libavutil/cpu.h" +#include "libavcodec/avcodec.h" +#include "libavcodec/exrdsp.h" + +void ff_reorder_pixels_rvv(uint8_t *dst, const uint8_t *src, ptrdiff_t size); + +av_cold void ff_exrdsp_init_riscv(ExrDSPContext *c) +{ +#if HAVE_RVV + int flags = av_get_cpu_flags(); + + if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR)) { + c->reorder_pixels = ff_reorder_pixels_rvv; + } +#endif +} diff --git a/libavcodec/riscv/exrdsp_rvv.S b/libavcodec/riscv/exrdsp_rvv.S new file mode 100644 index 0000000000..f4a35f58ff --- /dev/null +++ b/libavcodec/riscv/exrdsp_rvv.S @@ -0,0 +1,38 @@ +/* + * Copyright © 2023 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 "libavutil/riscv/asm.S" + +func ff_reorder_pixels_rvv, zve32x + srai a2, a2, 1 + add t1, a1, a2 +1: + vsetvli t0, a2, e8, m4, ta, ma + vle8.v v0, (a1) + sub a2, a2, t0 + vle8.v v4, (t1) + add a1, t0, a1 + vsseg2e8.v v0, (a0) + add t1, t0, t1 + sh1add a0, t0, a0 + bnez a2, 1b + + ret +endfunc