Skip to content

Commit

Permalink
lavc/svq1enc: R-V V ssd_int8_vs_int16
Browse files Browse the repository at this point in the history
C908
ssd_int8_vs_int16_c: 207.7
ssd_int8_vs_int16_rvv_i32: 14.2

Signed-off-by: Rémi Denis-Courmont <[email protected]>
  • Loading branch information
sunyuechi authored and Rémi Denis-Courmont committed Jan 17, 2024
1 parent d595e0a commit 8e23ebe
Show file tree
Hide file tree
Showing 5 changed files with 89 additions and 0 deletions.
2 changes: 2 additions & 0 deletions libavcodec/riscv/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ RVV-OBJS-$(CONFIG_OPUS_DECODER) += riscv/opusdsp_rvv.o
OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_init.o
RV-OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_rvi.o
RVV-OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_rvv.o
OBJS-$(CONFIG_SVQ1_ENCODER) += riscv/svqenc_init.o
RVV-OBJS-$(CONFIG_SVQ1_ENCODER) += riscv/svqenc_rvv.o
OBJS-$(CONFIG_TAK_DECODER) += riscv/takdsp_init.o
RVV-OBJS-$(CONFIG_TAK_DECODER) += riscv/takdsp_rvv.o
OBJS-$(CONFIG_UTVIDEO_DECODER) += riscv/utvideodsp_init.o
Expand Down
41 changes: 41 additions & 0 deletions libavcodec/riscv/svqenc_init.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/*
* Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS).
*
* 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/svq1encdsp.h"

int ff_ssd_int8_vs_int16_rvv(const int8_t *pix1, const int16_t *pix2,
intptr_t size);

av_cold void ff_svq1enc_init_riscv(SVQ1EncDSPContext *c)
{
#if HAVE_RVV
int flags = av_get_cpu_flags();

if (flags & AV_CPU_FLAG_RVV_I32) {
if (flags & AV_CPU_FLAG_RVB_ADDR) {
c->ssd_int8_vs_int16 = ff_ssd_int8_vs_int16_rvv;
}
}
#endif
}
43 changes: 43 additions & 0 deletions libavcodec/riscv/svqenc_rvv.S
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
* Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS).
*
* 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_ssd_int8_vs_int16_rvv, zve32x
vsetvli t0, zero, e32, m8, ta, ma
vmv.v.x v24, zero
1:
vsetvli t0, a2, e8, m2, tu, ma
vle16.v v8, (a1)
sub a2, a2, t0
vle8.v v0, (a0)
vwsub.wv v16, v8, v0
vsetvli zero, zero, e16, m4, tu, ma
add a0, a0, t0
vwmacc.vv v24, v16, v16
sh1add a1, t0, a1
bnez a2, 1b
vsetvli zero, zero, e32, m8, ta, ma
vmv.s.x v0, zero
vredsum.vs v0, v24, v0
vmv.x.s a0, v0

ret
endfunc
2 changes: 2 additions & 0 deletions libavcodec/svq1enc.c
Original file line number Diff line number Diff line change
Expand Up @@ -766,6 +766,8 @@ void ff_svq1enc_init(SVQ1EncDSPContext *c)

#if ARCH_PPC
ff_svq1enc_init_ppc(c);
#elif ARCH_RISCV
ff_svq1enc_init_riscv(c);
#elif ARCH_X86
ff_svq1enc_init_x86(c);
#endif
Expand Down
1 change: 1 addition & 0 deletions libavcodec/svq1encdsp.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ typedef struct SVQ1EncDSPContext {

void ff_svq1enc_init(SVQ1EncDSPContext *c);
void ff_svq1enc_init_ppc(SVQ1EncDSPContext *c);
void ff_svq1enc_init_riscv(SVQ1EncDSPContext *c);
void ff_svq1enc_init_x86(SVQ1EncDSPContext *c);

#endif /* AVCODEC_SVQ1ENCDSP_H */

0 comments on commit 8e23ebe

Please sign in to comment.