From patchwork Sat Oct 28 19:04:53 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: 44418 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dd83:b0:15d:8365:d4b8 with SMTP id kw3csp603888pzb; Sat, 28 Oct 2023 12:05:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHb7kznw+5WpbvArqlK67kN6hRO3gIvJk7tV2L77eJ/lSER+jMkjogyEK2+H+kswq96pa7M X-Received: by 2002:aa7:cf8d:0:b0:53e:70f9:e625 with SMTP id z13-20020aa7cf8d000000b0053e70f9e625mr3691094edx.42.1698519915302; Sat, 28 Oct 2023 12:05:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698519915; cv=none; d=google.com; s=arc-20160816; b=BlBa1P2Y1WmZKQnqrKyjc/gPLXjU+kzWT2ct/qWdiXcjs9ZpsJvW5n/Uc+/9Lwdz+W o/QBN4+F4TeZgi1jUEO/Fa0YmjGcUIhF42nQBLbUkNEtP4nF92AnuxnioJWbgJ1dr2t5 J5JWJ15jW/3lTXzB9aUjob7/8ebmDnog2+RLU+HEne0lCQ6vM9KrcKNP0URt9Tubl7Zq lbPDGSg9bQCqaTZ1LglWxRL8dJY9o4XmfzEnT6HQmAeYM5lqbZWO/wZNTt45ckJNK0Ny 8o7uK6jdtRtIUHAqo9bfGPsEyasRA7eiO3Hdla4UKqAq+3/72Zza4sYnTF6Tw03Qy3uC ngCQ== 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=aMrz+5eMSi0lH8FjLkcp854D5qG2+aTj2lu3Rl8owas=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=flYlcBqTEjItY5Z8w2GoLt9HEBEUhdas6fW+ssSuIhzy1/es6uPeedrMRLigxhPvUo zpGoHqYfmW6T/i0tltBAL9Sc3MaFwLaKU7QanJ8tdOgiEA6D4ez1M7XZM1EgxAAnzmDn 0eGLC2IfDb/Xby8RqtK9cDX9s/JHmNij8c5lq3qVP45NTZH+UW28VTPpCLgEnoyfIfRy iL09MaFohHt9D9fx8XzEsHMLjGKGbc1DcFmjcvHwDb1oVhfRHyxgUjfzEz6M8fvOovwc IFSGppbVrwlXeJnWa7QijqYTTheFDfG7FylRknQLDB4H1x3Kdz6eHWyjmXyXRXyaYymh 0ZnQ== 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 ee53-20020a056402293500b0054101242ed7si1846529edb.61.2023.10.28.12.05.14; Sat, 28 Oct 2023 12:05:15 -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 DC3B068CB27; Sat, 28 Oct 2023 22:05:03 +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 5719668CB27 for ; Sat, 28 Oct 2023 22:04:56 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id E79E2C006C for ; Sat, 28 Oct 2023 22:04:55 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Oct 2023 22:04:53 +0300 Message-ID: <20231028190455.64807-2-remi@remlab.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231028190455.64807-1-remi@remlab.net> References: <20231028190455.64807-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavc/jpeg2000dsp: R-V V ict_float 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: kYOXsPRfHPBI jpeg2000_ict_float_c: 3112.2 jpeg2000_ict_float_rvv_f32: 1225.0 --- libavcodec/jpeg2000dsp.c | 4 ++- libavcodec/jpeg2000dsp.h | 1 + libavcodec/riscv/Makefile | 2 ++ libavcodec/riscv/jpeg2000dsp_init.c | 36 +++++++++++++++++++++ libavcodec/riscv/jpeg2000dsp_rvv.S | 49 +++++++++++++++++++++++++++++ 5 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 libavcodec/riscv/jpeg2000dsp_init.c create mode 100644 libavcodec/riscv/jpeg2000dsp_rvv.S diff --git a/libavcodec/jpeg2000dsp.c b/libavcodec/jpeg2000dsp.c index 50bc1ecee6..7840fdc357 100644 --- a/libavcodec/jpeg2000dsp.c +++ b/libavcodec/jpeg2000dsp.c @@ -96,7 +96,9 @@ av_cold void ff_jpeg2000dsp_init(Jpeg2000DSPContext *c) c->mct_decode[FF_DWT53] = rct_int; c->mct_decode[FF_DWT97_INT] = ict_int; -#if ARCH_X86 +#if ARCH_RISCV + ff_jpeg2000dsp_init_riscv(c); +#elif ARCH_X86 ff_jpeg2000dsp_init_x86(c); #endif } diff --git a/libavcodec/jpeg2000dsp.h b/libavcodec/jpeg2000dsp.h index 932dbb2102..6854c7762d 100644 --- a/libavcodec/jpeg2000dsp.h +++ b/libavcodec/jpeg2000dsp.h @@ -33,6 +33,7 @@ typedef struct Jpeg2000DSPContext { extern const float ff_jpeg2000_f_ict_params[4]; void ff_jpeg2000dsp_init(Jpeg2000DSPContext *c); +void ff_jpeg2000dsp_init_riscv(Jpeg2000DSPContext *c); void ff_jpeg2000dsp_init_x86(Jpeg2000DSPContext *c); #endif /* AVCODEC_JPEG2000DSP_H */ diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index 9c31c901cf..06815d3170 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -16,6 +16,8 @@ OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_init.o RVV-OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_rvv.o OBJS-$(CONFIG_G722DSP) += riscv/g722dsp_init.o RVV-OBJS-$(CONFIG_G722DSP) += riscv/g722dsp_rvv.o +OBJS-$(CONFIG_JPEG2000_DECODER) += riscv/jpeg2000dsp_init.o +RVV-OBJS-$(CONFIG_JPEG2000_DECODER) += riscv/jpeg2000dsp_rvv.o OBJS-$(CONFIG_H264CHROMA) += riscv/h264_chroma_init_riscv.o RVV-OBJS-$(CONFIG_H264CHROMA) += riscv/h264_mc_chroma.o OBJS-$(CONFIG_HUFFYUV_DECODER) += riscv/huffyuvdsp_init.o diff --git a/libavcodec/riscv/jpeg2000dsp_init.c b/libavcodec/riscv/jpeg2000dsp_init.c new file mode 100644 index 0000000000..9415a22f79 --- /dev/null +++ b/libavcodec/riscv/jpeg2000dsp_init.c @@ -0,0 +1,36 @@ +/* + * 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 "config.h" +#include "libavutil/attributes.h" +#include "libavutil/cpu.h" +#include "libavcodec/jpeg2000dsp.h" + +void ff_ict_float_rvv(void *src0, void *src1, void *src2, int csize); + +av_cold void ff_jpeg2000dsp_init_riscv(Jpeg2000DSPContext *c) +{ +#if HAVE_RVV + int flags = av_get_cpu_flags(); + + if ((flags & AV_CPU_FLAG_RVV_F32) && (flags & AV_CPU_FLAG_RVB_ADDR)) + c->mct_decode[FF_DWT97] = ff_ict_float_rvv; +#endif +} diff --git a/libavcodec/riscv/jpeg2000dsp_rvv.S b/libavcodec/riscv/jpeg2000dsp_rvv.S new file mode 100644 index 0000000000..d10ebd491f --- /dev/null +++ b/libavcodec/riscv/jpeg2000dsp_rvv.S @@ -0,0 +1,49 @@ +/* + * 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_ict_float_rvv, zve32f + lla t0, ff_jpeg2000_f_ict_params + flw ft0, 0(t0) + flw ft1, 4(t0) + flw ft2, 8(t0) + flw ft3, 12(t0) +1: + vsetvli t0, a3, e32, m8, ta, ma + vle32.v v8, (a0) + sub a3, a3, t0 + vle32.v v16, (a1) + vle32.v v24, (a2) + vfmul.vf v0, v16, ft1 + vfmadd.vf v16, ft3, v8 + vfsub.vv v0, v8, v0 + vfmacc.vf v8, ft0, v24 + vfnmsac.vf v0, ft2, v24 + vse32.v v8, (a0) + sh2add a0, t0, a0 + vse32.v v0, (a1) + sh2add a1, t0, a1 + vse32.v v16, (a2) + sh2add a2, t0, a2 + bnez a3, 1b + + ret +endfunc