[FFmpeg-devel] [PATCH v2 2/9] lavc/vp9dsp: R-V mc copy
uk7b at foxmail.com
uk7b at foxmail.com
Tue May 7 10:36:06 EEST 2024
From: sunyuechi <sunyuechi at iscas.ac.cn>
C908:
vp9_put4_8bpp_c: 0.7
vp9_put4_8bpp_rvi: 0.5
vp9_put8_8bpp_c: 2.5
vp9_put8_8bpp_rvi: 0.5
vp9_put16_8bpp_c: 16.7
vp9_put16_8bpp_rvi: 1.5
vp9_put32_8bpp_c: 37.2
vp9_put32_8bpp_rvi: 5.7
vp9_put64_8bpp_c: 107.5
vp9_put64_8bpp_rvi: 21.7
---
libavcodec/riscv/Makefile | 3 +-
libavcodec/riscv/vp9_mc_rvi.S | 105 +++++++++++++++++++++++++++++++++
libavcodec/riscv/vp9dsp.h | 3 +
libavcodec/riscv/vp9dsp_init.c | 25 ++++++++
4 files changed, 135 insertions(+), 1 deletion(-)
create mode 100644 libavcodec/riscv/vp9_mc_rvi.S
diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile
index 65dd0d656a..5846861bac 100644
--- a/libavcodec/riscv/Makefile
+++ b/libavcodec/riscv/Makefile
@@ -63,7 +63,8 @@ RVV-OBJS-$(CONFIG_VC1DSP) += riscv/vc1dsp_rvv.o
OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_init.o
RVV-OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_rvv.o
OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9dsp_init.o
-RV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvi.o
+RV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvi.o \
+ riscv/vp9_mc_rvi.o
RVV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvv.o
OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_init.o
RVV-OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_rvv.o
diff --git a/libavcodec/riscv/vp9_mc_rvi.S b/libavcodec/riscv/vp9_mc_rvi.S
new file mode 100644
index 0000000000..0db14e83c7
--- /dev/null
+++ b/libavcodec/riscv/vp9_mc_rvi.S
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2024 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"
+
+#if __riscv_xlen >= 64
+func ff_copy64_rvi
+1:
+ addi a4, a4, -1
+ ld t0, (a2)
+ ld t1, 8(a2)
+ ld t2, 16(a2)
+ ld t3, 24(a2)
+ ld t4, 32(a2)
+ ld t5, 40(a2)
+ ld t6, 48(a2)
+ ld a7, 56(a2)
+ sd t0, (a0)
+ sd t1, 8(a0)
+ sd t2, 16(a0)
+ sd t3, 24(a0)
+ sd t4, 32(a0)
+ sd t5, 40(a0)
+ sd t6, 48(a0)
+ sd a7, 56(a0)
+ add a2, a2, a3
+ add a0, a0, a1
+ bnez a4, 1b
+
+ ret
+endfunc
+
+func ff_copy32_rvi
+1:
+ addi a4, a4, -1
+ ld t0, (a2)
+ ld t1, 8(a2)
+ ld t2, 16(a2)
+ ld t3, 24(a2)
+ sd t0, (a0)
+ sd t1, 8(a0)
+ sd t2, 16(a0)
+ sd t3, 24(a0)
+ add a2, a2, a3
+ add a0, a0, a1
+ bnez a4, 1b
+
+ ret
+endfunc
+
+func ff_copy16_rvi
+1:
+ addi a4, a4, -1
+ ld t0, (a2)
+ ld t1, 8(a2)
+ sd t0, (a0)
+ sd t1, 8(a0)
+ add a2, a2, a3
+ add a0, a0, a1
+ bnez a4, 1b
+
+ ret
+endfunc
+
+func ff_copy8_rvi
+1:
+ addi a4, a4, -1
+ ld t0, (a2)
+ sd t0, (a0)
+ add a2, a2, a3
+ add a0, a0, a1
+ bnez a4, 1b
+
+ ret
+endfunc
+#endif
+
+func ff_copy4_rvi
+1:
+ addi a4, a4, -1
+ lw t0, (a2)
+ sw t0, (a0)
+ add a2, a2, a3
+ add a0, a0, a1
+ bnez a4, 1b
+
+ ret
+endfunc
diff --git a/libavcodec/riscv/vp9dsp.h b/libavcodec/riscv/vp9dsp.h
index f8bc6563a5..b8ff282f8a 100644
--- a/libavcodec/riscv/vp9dsp.h
+++ b/libavcodec/riscv/vp9dsp.h
@@ -167,6 +167,9 @@ void ff_copy##SIZE##_rvi(uint8_t *dst, ptrdiff_t dststride, \
const uint8_t *src, ptrdiff_t srcstride, \
int h, int mx, int my);
+VP9_COPY_RISCV_RVI_FUNC(64);
+VP9_COPY_RISCV_RVI_FUNC(32);
+VP9_COPY_RISCV_RVI_FUNC(16);
VP9_COPY_RISCV_RVI_FUNC(8);
VP9_COPY_RISCV_RVI_FUNC(4);
diff --git a/libavcodec/riscv/vp9dsp_init.c b/libavcodec/riscv/vp9dsp_init.c
index d249dd71b2..c10f8bbe41 100644
--- a/libavcodec/riscv/vp9dsp_init.c
+++ b/libavcodec/riscv/vp9dsp_init.c
@@ -64,7 +64,32 @@ static av_cold void vp9dsp_intrapred_init_riscv(VP9DSPContext *dsp, int bpp)
#endif
}
+static av_cold void vp9dsp_mc_init_riscv(VP9DSPContext *dsp, int bpp)
+{
+#if HAVE_RV
+ int flags = av_get_cpu_flags();
+
+ if (bpp == 8 && flags & AV_CPU_FLAG_RVI) {
+
+#define init_fpel(idx1, sz) \
+ dsp->mc[idx1][FILTER_8TAP_SMOOTH ][0][0][0] = ff_copy##sz##_rvi; \
+ dsp->mc[idx1][FILTER_8TAP_REGULAR][0][0][0] = ff_copy##sz##_rvi; \
+ dsp->mc[idx1][FILTER_8TAP_SHARP ][0][0][0] = ff_copy##sz##_rvi; \
+ dsp->mc[idx1][FILTER_BILINEAR ][0][0][0] = ff_copy##sz##_rvi
+
+ init_fpel(0, 64);
+ init_fpel(1, 32);
+ init_fpel(2, 16);
+ init_fpel(3, 8);
+ init_fpel(4, 4);
+
+#undef init_fpel
+ }
+#endif
+}
+
av_cold void ff_vp9dsp_init_riscv(VP9DSPContext *dsp, int bpp, int bitexact)
{
vp9dsp_intrapred_init_riscv(dsp, bpp);
+ vp9dsp_mc_init_riscv(dsp, bpp);
}
--
2.45.0
More information about the ffmpeg-devel
mailing list