Re: [FFmpeg-devel] [PATCH 4/6] lavc/takdsp: R-V V decorrelate_ls

[flow gg <hlefthleft@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 797 bytes --]

Okay, updated in the reply.

Rémi Denis-Courmont <remi@remlab.net> 于2023年12月19日周二 00:25写道：

> Le maanantaina 18. joulukuuta 2023, 17.26.58 EET flow gg a écrit :
> > A 'shnadd' should be moved to the front, updated in this reply.
>
> Indeed, but please try to interleave scalar and vector instructions. The
> C908
> IP does not really care, but apparently, in-order vector processor are
> going
> to be happening next year.
>
> --
> Rémi Denis-Courmont
> http://www.remlab.net/
>
>
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>

[-- Attachment #2: 0004-lavc-takdsp-R-V-V-decorrelate_ls.patch --]
[-- Type: text/x-patch, Size: 5121 bytes --]

From 0b29172cfa684906868ef9d185ae2f96ab4ed598 Mon Sep 17 00:00:00 2001
From: sunyuechi <sunyuechi@iscas.ac.cn>
Date: Mon, 18 Dec 2023 22:49:21 +0800
Subject: [PATCH 4/6] lavc/takdsp: R-V V decorrelate_ls

C908:
decorrelate_ls_c: 69.7
decorrelate_ls_rvv_i32: 27.2
---
 libavcodec/riscv/Makefile      |  2 ++
 libavcodec/riscv/takdsp_init.c | 39 ++++++++++++++++++++++++++++++++++
 libavcodec/riscv/takdsp_rvv.S  | 35 ++++++++++++++++++++++++++++++
 libavcodec/takdsp.c            |  4 +++-
 libavcodec/takdsp.h            |  1 +
 5 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 libavcodec/riscv/takdsp_init.c
 create mode 100644 libavcodec/riscv/takdsp_rvv.S

diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile
index 6f7cb8791f..aa758eba1c 100644
--- a/libavcodec/riscv/Makefile
+++ b/libavcodec/riscv/Makefile
@@ -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_TAK_DECODER) += riscv/takdsp_init.o
+RVV-OBJS-$(CONFIG_TAK_DECODER) += riscv/takdsp_rvv.o
 OBJS-$(CONFIG_UTVIDEO_DECODER) += riscv/utvideodsp_init.o
 RVV-OBJS-$(CONFIG_UTVIDEO_DECODER) += riscv/utvideodsp_rvv.o
 OBJS-$(CONFIG_VC1DSP) += riscv/vc1dsp_init.o
diff --git a/libavcodec/riscv/takdsp_init.c b/libavcodec/riscv/takdsp_init.c
new file mode 100644
index 0000000000..fcf0c5f37b
--- /dev/null
+++ b/libavcodec/riscv/takdsp_init.c
@@ -0,0 +1,39 @@
+/*
+ * 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 <stdint.h>
+
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavutil/riscv/cpu.h"
+#include "libavcodec/takdsp.h"
+
+void ff_decorrelate_ls_rvv(int32_t *p1, int32_t *p2, int length);
+
+av_cold void ff_takdsp_init_riscv(TAKDSPContext *dsp)
+{
+#if HAVE_RVV
+    int flags = av_get_cpu_flags();
+
+    if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR)) {
+        dsp->decorrelate_ls = ff_decorrelate_ls_rvv;
+    }
+#endif
+}
diff --git a/libavcodec/riscv/takdsp_rvv.S b/libavcodec/riscv/takdsp_rvv.S
new file mode 100644
index 0000000000..c662049f3d
--- /dev/null
+++ b/libavcodec/riscv/takdsp_rvv.S
@@ -0,0 +1,35 @@
+/*
+ * 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_decorrelate_ls_rvv, zve32x
+1:
+        vsetvli  t0, a2, e32, m8, ta, ma
+        sub      a2, a2, t0
+        vle32.v  v0, (a0)
+        sh2add   a0, t0, a0
+        vle32.v  v8, (a1)
+        vadd.vv  v16, v0, v8
+        vse32.v  v16, (a1)
+        sh2add   a1, t0, a1
+        bnez a2, 1b
+        ret
+endfunc
diff --git a/libavcodec/takdsp.c b/libavcodec/takdsp.c
index b646a063db..25cac558ce 100644
--- a/libavcodec/takdsp.c
+++ b/libavcodec/takdsp.c
@@ -77,7 +77,9 @@ av_cold void ff_takdsp_init(TAKDSPContext *c)
     c->decorrelate_sm = decorrelate_sm;
     c->decorrelate_sf = decorrelate_sf;
 
-#if ARCH_X86
+#if ARCH_RISCV
+    ff_takdsp_init_riscv(c);
+#elif ARCH_X86
     ff_takdsp_init_x86(c);
 #endif
 }
diff --git a/libavcodec/takdsp.h b/libavcodec/takdsp.h
index c05b5741a4..55f1a10cd3 100644
--- a/libavcodec/takdsp.h
+++ b/libavcodec/takdsp.h
@@ -29,6 +29,7 @@ typedef struct TAKDSPContext {
 } TAKDSPContext;
 
 void ff_takdsp_init(TAKDSPContext *c);
+void ff_takdsp_init_riscv(TAKDSPContext *c);
 void ff_takdsp_init_x86(TAKDSPContext *c);
 
 #endif /* AVCODEC_TAKDSP_H */
-- 
2.43.0


[-- Attachment #3: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".