[FFmpeg-devel] [PATCH 1/2] lavc/utvideodsp: R-V V restore_rgb_planes

[Rémi Denis-Courmont]

restore_rgb_planes_c:      133065.7
restore_rgb_planes_rvv_i32: 33317.2
---
 libavcodec/riscv/Makefile          |  2 ++
 libavcodec/riscv/utvideodsp_init.c | 38 +++++++++++++++++++++
 libavcodec/riscv/utvideodsp_rvv.S  | 53 ++++++++++++++++++++++++++++++
 libavcodec/utvideodsp.c            |  4 ++-
 libavcodec/utvideodsp.h            |  1 +
 5 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 libavcodec/riscv/utvideodsp_init.c
 create mode 100644 libavcodec/riscv/utvideodsp_rvv.S

diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile
index 31ad493cd3..69d5980e65 100644
--- a/libavcodec/riscv/Makefile
+++ b/libavcodec/riscv/Makefile
@@ -25,5 +25,7 @@ RVV-OBJS-$(CONFIG_OPUS_DECODER) += riscv/opusdsp_rvv.o
 OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_init.o \
                               riscv/pixblockdsp_rvi.o
 RVV-OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_rvv.o
+OBJS-$(CONFIG_UTVIDEO_DECODER) += riscv/utvideodsp_init.o
+RVV-OBJS-$(CONFIG_UTVIDEO_DECODER) += riscv/utvideodsp_rvv.o
 OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_init.o
 RVV-OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_rvv.o
diff --git a/libavcodec/riscv/utvideodsp_init.c b/libavcodec/riscv/utvideodsp_init.c
new file mode 100644
index 0000000000..dfaa16692a
--- /dev/null
+++ b/libavcodec/riscv/utvideodsp_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 "config.h"
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavcodec/utvideodsp.h"
+
+void ff_restore_rgb_planes_rvv(uint8_t *r, uint8_t *g, uint8_t *b,
+                               ptrdiff_t linesize_r, ptrdiff_t linesize_g,
+                               ptrdiff_t linesize_b, int width, int height);
+
+av_cold void ff_utvideodsp_init_riscv(UTVideoDSPContext *c)
+{
+#if HAVE_RVV
+    int flags = av_get_cpu_flags();
+
+    if (flags & AV_CPU_FLAG_RVV_I32)
+        c->restore_rgb_planes = ff_restore_rgb_planes_rvv;
+#endif
+}
diff --git a/libavcodec/riscv/utvideodsp_rvv.S b/libavcodec/riscv/utvideodsp_rvv.S
new file mode 100644
index 0000000000..673e3442ce
--- /dev/null
+++ b/libavcodec/riscv/utvideodsp_rvv.S
@@ -0,0 +1,53 @@
+/*
+ * 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_restore_rgb_planes_rvv, zve32x
+        li      t1, -0x80
+        sub     a3, a3, a6
+        sub     a4, a4, a6
+        sub     a5, a5, a6
+1:
+        mv      t6, a6
+        addi    a7, a7, -1
+2:
+        vsetvli t0, t6, e8, m8, ta, ma
+        vle8.v  v16, (a1)
+        sub     t6, t6, t0
+        vle8.v  v8, (a0)
+        vadd.vx v16, v16, t1
+        add     a1, t0, a1
+        vle8.v  v24, (a2)
+        vadd.vv v8, v8, v16
+        vadd.vv v24, v24, v16
+        vse8.v  v8, (a0)
+        add     a0, t0, a0
+        vse8.v  v24, (a2)
+        add     a2, t0, a2
+        bnez    t6, 2b
+
+        add     a0, a3, a0
+        add     a1, a4, a1
+        add     a2, a5, a2
+        bnez    a7, 1b
+
+        ret
+endfunc
diff --git a/libavcodec/utvideodsp.c b/libavcodec/utvideodsp.c
index 6db0abf8da..b63dafbe17 100644
--- a/libavcodec/utvideodsp.c
+++ b/libavcodec/utvideodsp.c
@@ -77,7 +77,9 @@ av_cold void ff_utvideodsp_init(UTVideoDSPContext *c)
     c->restore_rgb_planes   = restore_rgb_planes_c;
     c->restore_rgb_planes10 = restore_rgb_planes10_c;
 
-#if ARCH_X86
+#if ARCH_RISCV
+    ff_utvideodsp_init_riscv(c);
+#elif ARCH_X86
     ff_utvideodsp_init_x86(c);
 #endif
 }
diff --git a/libavcodec/utvideodsp.h b/libavcodec/utvideodsp.h
index a3d2550dce..10961da6c4 100644
--- a/libavcodec/utvideodsp.h
+++ b/libavcodec/utvideodsp.h
@@ -34,6 +34,7 @@ typedef struct UTVideoDSPContext {
 } UTVideoDSPContext;
 
 void ff_utvideodsp_init(UTVideoDSPContext *c);
+void ff_utvideodsp_init_riscv(UTVideoDSPContext *c);
 void ff_utvideodsp_init_x86(UTVideoDSPContext *c);
 
 #endif /* AVCODEC_UTVIDEODSP_H */
-- 
2.42.0