LAV
/
FFmpeg
1
0
Fork 0
Code

lavc/jpeg2000dsp: R-V V ict_float 

jpeg2000_ict_float_c:       3112.2
jpeg2000_ict_float_rvv_f32: 1225.0
This commit is contained in:
Rémi Denis-Courmont 2023-10-28 19:29:12 +03:00
parent b2a441a3be
commit 73dea2bb91
5 changed files with 91 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/jpeg2000dsp.c
View File

@ -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
}

1
libavcodec/jpeg2000dsp.h
View File

@ -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 */

2
libavcodec/riscv/Makefile
View File

@ -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

36
libavcodec/riscv/jpeg2000dsp_init.c Normal file
View File

@ -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
}

49
libavcodec/riscv/jpeg2000dsp_rvv.S Normal file
View File

@ -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