Re: [FFmpeg-devel] [PATCH 3/3] lavc/svq1enc: R-V V ssd_int8_vs_int16

[flow gg <hlefthleft@gmail.com>]

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

flow gg <hlefthleft@gmail.com> 于2023年12月30日周六 22:00写道：

> > At a quick glance, it won't work if the input length is not a multiple
> of the vector length.
>
> Why? I tried 1024, 32*3, 32*7 and all passed the test.
>
> > Also do you really need to extend accumulators to 32 bits?
>
> It won't overflow after the test is changed, so it's not needed anymore.
> I have modified it in this reply.
>
> Rémi Denis-Courmont <remi@remlab.net> 于2023年12月30日周六 20:15写道：
>
>>
>>
>> Le 29 décembre 2023 12:57:20 GMT+01:00, flow gg <hlefthleft@gmail.com> a
>> écrit :
>> >C908
>> >ssd_int8_vs_int16_c: 207.7
>> >ssd_int8_vs_int16_rvv_i32: 28.0
>>
>> At a quick glance, it won't work if the input length is not a multiple of
>> the vector length.
>>
>> Also do you really need to extend accumulators to 32 bits?
>> _______________________________________________
>> 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: 0003-lavc-svq1enc-R-V-V-ssd_int8_vs_int16.patch --]
[-- Type: text/x-patch, Size: 5534 bytes --]

From 7bb35b54a4e578848660b1437b96333dd740cbd3 Mon Sep 17 00:00:00 2001
From: sunyuechi <sunyuechi@iscas.ac.cn>
Date: Fri, 29 Dec 2023 13:27:31 +0800
Subject: [PATCH 3/3] lavc/svq1enc: R-V V ssd_int8_vs_int16

C908
ssd_int8_vs_int16_c: 207.7
ssd_int8_vs_int16_rvv_i32: 17.7
---
 libavcodec/riscv/Makefile      |  2 ++
 libavcodec/riscv/svqenc_init.c | 41 +++++++++++++++++++++++++++++++
 libavcodec/riscv/svqenc_rvv.S  | 44 ++++++++++++++++++++++++++++++++++
 libavcodec/svq1enc.c           |  2 ++
 libavcodec/svq1encdsp.h        |  1 +
 5 files changed, 90 insertions(+)
 create mode 100644 libavcodec/riscv/svqenc_init.c
 create mode 100644 libavcodec/riscv/svqenc_rvv.S

diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile
index 7f253bba12..4e14c3d094 100644
--- a/libavcodec/riscv/Makefile
+++ b/libavcodec/riscv/Makefile
@@ -46,6 +46,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
diff --git a/libavcodec/riscv/svqenc_init.c b/libavcodec/riscv/svqenc_init.c
new file mode 100644
index 0000000000..f4c398960c
--- /dev/null
+++ b/libavcodec/riscv/svqenc_init.c
@@ -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
+}
diff --git a/libavcodec/riscv/svqenc_rvv.S b/libavcodec/riscv/svqenc_rvv.S
new file mode 100644
index 0000000000..c52913c2e7
--- /dev/null
+++ b/libavcodec/riscv/svqenc_rvv.S
@@ -0,0 +1,44 @@
+/*
+ * 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, ta, ma
+        vle8.v       v0, (a0)
+        sub          a2, a2, t0
+        vsetvli      zero, t0, e16, m4, ta, ma
+        vle16.v      v8, (a1)
+        vsext.vf2    v16, v0
+        vsub.vv      v16, v16, v8
+        add          a0, a0, t0
+        vwmacc.vv    v24, v16, v16
+        sh1add       a1, t0, a1
+        bnez         a2, 1b
+        vsetvli      t0, zero, e32, m8, ta, ma
+        vmv.s.x      v0, zero
+        vredsum.vs   v0, v24, v0
+        vmv.x.s      a0, v0
+
+        ret
+endfunc
diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c
index 0dea405dec..6e7ea12aa7 100644
--- a/libavcodec/svq1enc.c
+++ b/libavcodec/svq1enc.c
@@ -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
diff --git a/libavcodec/svq1encdsp.h b/libavcodec/svq1encdsp.h
index 618bf8463b..5dfa35cc62 100644
--- a/libavcodec/svq1encdsp.h
+++ b/libavcodec/svq1encdsp.h
@@ -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 */
-- 
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".