[FFmpeg-cvslog] lavu/cpu: detect RISC-V base extensions
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:21 2022 +0300| [b95e2fbd85e93b58d019ad0e3da64a72ee7cc3d5] | committer:
Lynne
lavu/cpu: detect RISC-V base extensions
This introduces compile-time and run-time CPU detection on RISC-V. In
practice, I doubt that FFmpeg will ever see a RISC-V CPU without all of
I, F and D extensions, and if it does, it probably won't have run-time
detection. So the flags are essentially always set.
But as things stand, checkasm wants them that way. Compare the ARMV8
flag on AArch64. We are nowhere near running short on CPU flag bits.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b95e2fbd85e93b58d019ad0e3da64a72ee7cc3d5
---
libavutil/cpu.c | 6 +
libavutil/cpu.h | 5 +
libavutil/cpu_internal.h | 1 +
libavutil/riscv/Makefile | 1 +
libavutil/riscv/cpu.c | 56 +++
tests/checkasm/checkasm.c | 4
6 files changed, 73 insertions(+)
diff --git a/libavutil/cpu.c b/libavutil/cpu.c
index 0035e927a5..8b6eef9873 100644
--- a/libavutil/cpu.c
+++ b/libavutil/cpu.c
@@ -62,6 +62,8 @@ static int get_cpu_flags(void)
return ff_get_cpu_flags_arm();
#elif ARCH_PPC
return ff_get_cpu_flags_ppc();
+#elif ARCH_RISCV
+return ff_get_cpu_flags_riscv();
#elif ARCH_X86
return ff_get_cpu_flags_x86();
#elif ARCH_LOONGARCH
@@ -178,6 +180,10 @@ int av_parse_cpu_caps(unsigned *flags, const char *s)
#elif ARCH_LOONGARCH
{ "lsx", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_LSX
},.unit = "flags" },
{ "lasx", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_LASX
},.unit = "flags" },
+#elif ARCH_RISCV
+{ "rvi", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVI
},.unit = "flags" },
+{ "rvf", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVF
},.unit = "flags" },
+{ "rvd", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVD
},.unit = "flags" },
#endif
{ NULL },
};
diff --git a/libavutil/cpu.h b/libavutil/cpu.h
index 9711e574c5..9aae2ccc7a 100644
--- a/libavutil/cpu.h
+++ b/libavutil/cpu.h
@@ -78,6 +78,11 @@
#define AV_CPU_FLAG_LSX (1 << 0)
#define AV_CPU_FLAG_LASX (1 << 1)
+// RISC-V extensions
+#define AV_CPU_FLAG_RVI (1 << 0) ///< I (full GPR bank)
+#define AV_CPU_FLAG_RVF (1 << 1) ///< F (single precision FP)
+#define AV_CPU_FLAG_RVD (1 << 2) ///< D (double precision FP)
+
/**
* Return the flags which specify extensions supported by the CPU.
* The returned value is affected by av_force_cpu_flags() if that was used
diff --git a/libavutil/cpu_internal.h b/libavutil/cpu_internal.h
index 650d47fc96..634f28bac4 100644
--- a/libavutil/cpu_internal.h
+++ b/libavutil/cpu_internal.h
@@ -48,6 +48,7 @@ int ff_get_cpu_flags_mips(void);
int ff_get_cpu_flags_aarch64(void);
int ff_get_cpu_flags_arm(void);
int ff_get_cpu_flags_ppc(void);
+int ff_get_cpu_flags_riscv(void);
int ff_get_cpu_flags_x86(void);
int ff_get_cpu_flags_loongarch(void);
diff --git a/libavutil/riscv/Makefile b/libavutil/riscv/Makefile
new file mode 100644
index 00..1f818043dc
--- /dev/null
+++ b/libavutil/riscv/Makefile
@@ -0,0 +1 @@
+OBJS += riscv/cpu.o
diff --git a/libavutil/riscv/cpu.c b/libavutil/riscv/cpu.c
new file mode 100644
index 00..6803f035e5
--- /dev/null
+++ b/libavutil/riscv/cpu.c
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2022 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/cpu.h"
+#include "libavutil/cpu_internal.h"
+#include "libavutil/log.h"
+#include "config.h"
+
+#if HAVE_GETAUXVAL
+#include
+#define HWCAP_RV(letter) (1ul << ((letter) - 'A'))
+#endif
+
+int ff_get_cpu_flags_riscv(void)
+{
+int ret = 0;
+#if HAVE_GETAUXVAL
+const unsigned long hwcap = getauxval(AT_HWCAP);
+
+if (hwcap & HWCAP_RV('I'))
+ret |= AV_CPU_FLAG_RVI;
+if (hwcap & HWCAP_RV('F'))
+ret |= AV_CPU_FLAG_RVF;
+if (hwcap & HWCAP_RV('D'))
+ret |= AV_CPU_FLAG_RVD;
+#endif
+
+#ifdef __riscv_i
+ret |= AV_CPU_FLAG_RVI;
+#endif
+#if defined (__riscv_flen) && (__riscv_flen >= 32)
+ret |= AV_CPU_FLAG_RVF;
+#if (__ri
[FFmpeg-cvslog] lavu/riscv: initial common header for assembler macros
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26 17:52:22 2022 +0300| [746f1ff36ac0d232687820fbde4e4efc79093af7] | committer: Lynne lavu/riscv: initial common header for assembler macros > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=746f1ff36ac0d232687820fbde4e4efc79093af7 --- libavutil/riscv/asm.S | 77 +++ 1 file changed, 77 insertions(+) diff --git a/libavutil/riscv/asm.S b/libavutil/riscv/asm.S new file mode 100644 index 00..dbd97f40a4 --- /dev/null +++ b/libavutil/riscv/asm.S @@ -0,0 +1,77 @@ +/* + * Copyright © 2022 Rémi Denis-Courmont. + * Loosely based on earlier work copyrighted by Måns Rullgård, 2008. + * + * 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" + +#if defined (__riscv_float_abi_soft) +#define NOHWF +#define NOHWD +#define HWF # +#define HWD # +#elif defined (__riscv_float_abi_single) +#define NOHWF # +#define NOHWD +#define HWF +#define HWD # +#else +#define NOHWF # +#define NOHWD # +#define HWF +#define HWD +#endif + +.macro func sym, ext= +.text +.align 2 + +.option push +.ifnb \ext +.option arch, +\ext +.endif + +.global \sym +.hidden \sym +.type \sym, %function +\sym: + +.macro endfunc +.size \sym, . - \sym +.option pop +.previous +.purgem endfunc +.endm +.endm + +.macro const sym, align=3, relocate=0 +.if \relocate +.pushsection .data.rel.ro +.else +.pushsection .rodata +.endif +.align \align +\sym: + +.macro endconst +.size \sym, . - \sym +.popsection +.purgem endconst +.endm +.endm ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavc/audiodsp: RISC-V F vector_clipf
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:23 2022 +0300| [04d092e7d5204f1aebb7e61f92bb263873e0f735] | committer:
Lynne
lavc/audiodsp: RISC-V F vector_clipf
RV64G supports MIN & MAX instructions natively only on floating point
registers, not general purpose ones. The later would require the Zbb
extension. Due to that, it is actually faster to perform the clipping
"properly" in FPU.
Benchmarks on SiFive U74-MC (courtesy of Shanghai StarFive Tech):
audiodsp.vector_clipf_c: 29551.5
audiodsp.vector_clipf_rvf: 17871.0
Also tried unrolling with 2 or 8 elements but it gets worse either way.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=04d092e7d5204f1aebb7e61f92bb263873e0f735
---
libavcodec/audiodsp.c| 2 ++
libavcodec/audiodsp.h| 1 +
libavcodec/riscv/Makefile| 2 ++
libavcodec/riscv/audiodsp_init.c | 33 +++
libavcodec/riscv/audiodsp_rvf.S | 49
5 files changed, 87 insertions(+)
diff --git a/libavcodec/audiodsp.c b/libavcodec/audiodsp.c
index ff43e87dce..eba6e809fd 100644
--- a/libavcodec/audiodsp.c
+++ b/libavcodec/audiodsp.c
@@ -113,6 +113,8 @@ av_cold void ff_audiodsp_init(AudioDSPContext *c)
ff_audiodsp_init_arm(c);
#elif ARCH_PPC
ff_audiodsp_init_ppc(c);
+#elif ARCH_RISCV
+ff_audiodsp_init_riscv(c);
#elif ARCH_X86
ff_audiodsp_init_x86(c);
#endif
diff --git a/libavcodec/audiodsp.h b/libavcodec/audiodsp.h
index aa6fa7898b..485b512839 100644
--- a/libavcodec/audiodsp.h
+++ b/libavcodec/audiodsp.h
@@ -55,6 +55,7 @@ typedef struct AudioDSPContext {
void ff_audiodsp_init(AudioDSPContext *c);
void ff_audiodsp_init_arm(AudioDSPContext *c);
void ff_audiodsp_init_ppc(AudioDSPContext *c);
+void ff_audiodsp_init_riscv(AudioDSPContext *c);
void ff_audiodsp_init_x86(AudioDSPContext *c);
#endif /* AVCODEC_AUDIODSP_H */
diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile
new file mode 100644
index 00..414a9e9bd8
--- /dev/null
+++ b/libavcodec/riscv/Makefile
@@ -0,0 +1,2 @@
+OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_init.o \
+ riscv/audiodsp_rvf.o
diff --git a/libavcodec/riscv/audiodsp_init.c b/libavcodec/riscv/audiodsp_init.c
new file mode 100644
index 00..c5842815d6
--- /dev/null
+++ b/libavcodec/riscv/audiodsp_init.c
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2022 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/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavcodec/audiodsp.h"
+
+void ff_vector_clipf_rvf(float *dst, const float *src, int len, float min,
float max);
+
+av_cold void ff_audiodsp_init_riscv(AudioDSPContext *c)
+{
+int flags = av_get_cpu_flags();
+
+if (flags & AV_CPU_FLAG_RVF)
+c->vector_clipf = ff_vector_clipf_rvf;
+}
diff --git a/libavcodec/riscv/audiodsp_rvf.S b/libavcodec/riscv/audiodsp_rvf.S
new file mode 100644
index 00..2ec8a11691
--- /dev/null
+++ b/libavcodec/riscv/audiodsp_rvf.S
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2022 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_vector_clipf_rvf, f
+NOHWF fmv.w.x fa0, a3
+NOHWF fmv.w.x fa1, a4
+1:
+flw ft0, (a1)
+flw ft1, 4(a1)
+fmax.s ft0, ft0, fa0
+flw ft2, 8(a1)
+fmax.s ft1, ft1, fa0
+flw ft3, 12(a1)
+fmax.s ft2, ft2, fa0
+addia2, a2, -4
+fmax.s ft3, f
[FFmpeg-cvslog] lavu/riscv: fallback macros for SH{1, 2, 3}ADD
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:27 2022 +0300| [39357cad37e865b723c7a97adc27d4a6b4388008] | committer:
Lynne
lavu/riscv: fallback macros for SH{1, 2, 3}ADD
Those mnemonics require the very latest binutils release at the time of
writing. These macros provide seamless backward compatibility.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=39357cad37e865b723c7a97adc27d4a6b4388008
---
libavutil/riscv/asm.S | 19 +++
1 file changed, 19 insertions(+)
diff --git a/libavutil/riscv/asm.S b/libavutil/riscv/asm.S
index dbd97f40a4..de5e1ad0a6 100644
--- a/libavutil/riscv/asm.S
+++ b/libavutil/riscv/asm.S
@@ -75,3 +75,22 @@
.purgem endconst
.endm
.endm
+
+#if !defined (__riscv_zba)
+/* SH{1,2,3}ADD definitions for pre-Zba assemblers */
+.macro shnadd n, rd, rs1, rs2
+.insn r OP, 2 * \n, 16, \rd, \rs1, \rs2
+.endm
+
+.macro sh1add rd, rs1, rs2
+shnadd 1, \rd, \rs1, \rs2
+.endm
+
+.macro sh2add rd, rs1, rs2
+shnadd 2, \rd, \rs1, \rs2
+.endm
+
+.macro sh3add rd, rs1, rs2
+shnadd 3, \rd, \rs1, \rs2
+.endm
+#endif
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavu/floatdsp: RISC-V V vector_fmul_scalar
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:28 2022 +0300| [a6c10d05fe26dcfb5920fa4ce8ea8f74bf5f82dc] | committer:
Lynne
lavu/floatdsp: RISC-V V vector_fmul_scalar
This is based on existing code from the VLC git tree with two minor
changes to account for the different function prototypes.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a6c10d05fe26dcfb5920fa4ce8ea8f74bf5f82dc
---
libavutil/float_dsp.c| 2 ++
libavutil/float_dsp.h| 1 +
libavutil/riscv/Makefile | 4 +++-
libavutil/riscv/float_dsp_init.c | 39 +++
libavutil/riscv/float_dsp_rvv.S | 39 +++
5 files changed, 84 insertions(+), 1 deletion(-)
diff --git a/libavutil/float_dsp.c b/libavutil/float_dsp.c
index 8676c8b0f8..742dd679d2 100644
--- a/libavutil/float_dsp.c
+++ b/libavutil/float_dsp.c
@@ -156,6 +156,8 @@ av_cold AVFloatDSPContext *avpriv_float_dsp_alloc(int
bit_exact)
ff_float_dsp_init_arm(fdsp);
#elif ARCH_PPC
ff_float_dsp_init_ppc(fdsp, bit_exact);
+#elif ARCH_RISCV
+ff_float_dsp_init_riscv(fdsp);
#elif ARCH_X86
ff_float_dsp_init_x86(fdsp);
#elif ARCH_MIPS
diff --git a/libavutil/float_dsp.h b/libavutil/float_dsp.h
index 9c664592bd..7cad9fc622 100644
--- a/libavutil/float_dsp.h
+++ b/libavutil/float_dsp.h
@@ -205,6 +205,7 @@ float avpriv_scalarproduct_float_c(const float *v1, const
float *v2, int len);
void ff_float_dsp_init_aarch64(AVFloatDSPContext *fdsp);
void ff_float_dsp_init_arm(AVFloatDSPContext *fdsp);
void ff_float_dsp_init_ppc(AVFloatDSPContext *fdsp, int strict);
+void ff_float_dsp_init_riscv(AVFloatDSPContext *fdsp);
void ff_float_dsp_init_x86(AVFloatDSPContext *fdsp);
void ff_float_dsp_init_mips(AVFloatDSPContext *fdsp);
diff --git a/libavutil/riscv/Makefile b/libavutil/riscv/Makefile
index 1f818043dc..89a8d0d990 100644
--- a/libavutil/riscv/Makefile
+++ b/libavutil/riscv/Makefile
@@ -1 +1,3 @@
-OBJS += riscv/cpu.o
+OBJS += riscv/float_dsp_init.o \
+riscv/cpu.o
+RVV-OBJS += riscv/float_dsp_rvv.o
diff --git a/libavutil/riscv/float_dsp_init.c b/libavutil/riscv/float_dsp_init.c
new file mode 100644
index 00..f4299049b0
--- /dev/null
+++ b/libavutil/riscv/float_dsp_init.c
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2022 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
+
+#include "config.h"
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavutil/float_dsp.h"
+
+void ff_vector_fmul_scalar_rvv(float *dst, const float *src, float mul,
+int len);
+
+av_cold void ff_float_dsp_init_riscv(AVFloatDSPContext *fdsp)
+{
+#if HAVE_RVV
+int flags = av_get_cpu_flags();
+
+if (flags & AV_CPU_FLAG_RVV_F32)
+fdsp->vector_fmul_scalar = ff_vector_fmul_scalar_rvv;
+#endif
+}
diff --git a/libavutil/riscv/float_dsp_rvv.S b/libavutil/riscv/float_dsp_rvv.S
new file mode 100644
index 00..50cb1fa90f
--- /dev/null
+++ b/libavutil/riscv/float_dsp_rvv.S
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2022 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 "asm.S"
+
+// (a0) = (a1) * fa0 [0..a2-1]
+func ff_vector_fmul_scalar_rvv, zve32f
+NOHWF fmv.w.x fa0, a2
+NOHWF mv a2, a3
+1:
+vsetvli t0, a2, e32, m1, ta, ma
+vle32.v v16, (a1)
+sub a2, a2, t0
+vfmul.vf v16, v16, fa0
+sh2add a1, t0, a1
+vse32.v v16, (a0)
+
[FFmpeg-cvslog] configure: probe RISC-V Vector extension
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:26 2022 +0300| [1b6aee52a5634976c6fd212a28175512eb7865f8] | committer:
Lynne
configure: probe RISC-V Vector extension
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1b6aee52a5634976c6fd212a28175512eb7865f8
---
Makefile | 2 +-
configure| 15 +++
ffbuild/arch.mak | 2 ++
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 61f79e27ae..1fb742f390 100644
--- a/Makefile
+++ b/Makefile
@@ -91,7 +91,7 @@ ffbuild/.config: $(CONFIGURABLE_COMPONENTS)
SUBDIR_VARS := CLEANFILES FFLIBS HOSTPROGS TESTPROGS TOOLS \
HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS\
ARMV5TE-OBJS ARMV6-OBJS ARMV8-OBJS VFP-OBJS NEON-OBJS \
- ALTIVEC-OBJS VSX-OBJS MMX-OBJS X86ASM-OBJS\
+ ALTIVEC-OBJS VSX-OBJS RVV-OBJS MMX-OBJS X86ASM-OBJS \
MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSP-OBJS MSA-OBJS \
MMI-OBJS LSX-OBJS LASX-OBJS OBJS SLIBOBJS SHLIBOBJS \
STLIBOBJS HOSTOBJS TESTOBJS
diff --git a/configure b/configure
index c157338b1f..a41ebda6d4 100755
--- a/configure
+++ b/configure
@@ -462,6 +462,7 @@ Optimization options (experts only):
--disable-mmidisable Loongson MMI optimizations
--disable-lsxdisable Loongson LSX optimizations
--disable-lasx disable Loongson LASX optimizations
+ --disable-rvvdisable RISC-V Vector optimizations
--disable-fast-unaligned consider unaligned accesses slow
Developer options (useful when working on FFmpeg itself):
@@ -2126,6 +2127,10 @@ ARCH_EXT_LIST_PPC="
vsx
"
+ARCH_EXT_LIST_RISCV="
+rvv
+"
+
ARCH_EXT_LIST_X86="
$ARCH_EXT_LIST_X86_SIMD
cpunop
@@ -2135,6 +2140,7 @@ ARCH_EXT_LIST_X86="
ARCH_EXT_LIST="
$ARCH_EXT_LIST_ARM
$ARCH_EXT_LIST_PPC
+$ARCH_EXT_LIST_RISCV
$ARCH_EXT_LIST_X86
$ARCH_EXT_LIST_MIPS
$ARCH_EXT_LIST_LOONGSON
@@ -2642,6 +2648,8 @@ ppc4xx_deps="ppc"
vsx_deps="altivec"
power8_deps="vsx"
+rvv_deps="riscv"
+
loongson2_deps="mips"
loongson3_deps="mips"
mmi_deps_any="loongson2 loongson3"
@@ -6110,6 +6118,10 @@ elif enabled ppc; then
check_cpp_condition power8 "altivec.h" "defined(_ARCH_PWR8)"
fi
+elif enabled riscv; then
+
+enabled rvv && check_inline_asm rvv '".option arch, +v\nvsetivli zero, 0,
e8, m1, ta, ma"'
+
elif enabled x86; then
check_builtin rdtscintrin.h "__rdtsc()"
@@ -7596,6 +7608,9 @@ if enabled loongarch; then
echo "LSX enabled ${lsx-no}"
echo "LASX enabled ${lasx-no}"
fi
+if enabled riscv; then
+echo "RISC-V Vector enabled ${rvv-no}"
+fi
echo "debug symbols ${debug-no}"
echo "strip symbols ${stripping-no}"
echo "optimize for size ${small-no}"
diff --git a/ffbuild/arch.mak b/ffbuild/arch.mak
index 997e31e85e..39d76ee152 100644
--- a/ffbuild/arch.mak
+++ b/ffbuild/arch.mak
@@ -15,5 +15,7 @@ OBJS-$(HAVE_LASX) += $(LASX-OBJS) $(LASX-OBJS-yes)
OBJS-$(HAVE_ALTIVEC) += $(ALTIVEC-OBJS) $(ALTIVEC-OBJS-yes)
OBJS-$(HAVE_VSX) += $(VSX-OBJS) $(VSX-OBJS-yes)
+OBJS-$(HAVE_RVV) += $(RVV-OBJS) $(RVV-OBJS-yes)
+
OBJS-$(HAVE_MMX) += $(MMX-OBJS) $(MMX-OBJS-yes)
OBJS-$(HAVE_X86ASM) += $(X86ASM-OBJS) $(X86ASM-OBJS-yes)
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavc/pixblockdsp: RISC-V I get_pixels
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:24 2022 +0300| [1edac8eb468cb9a769ded6197dbce515b71b137e] | committer:
Lynne
lavc/pixblockdsp: RISC-V I get_pixels
Benchmarks on SiFive U74-MC (courtesy of Shanghai StarFive Tech):
get_pixels_c: 180.0
get_pixels_rvi: 136.7
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1edac8eb468cb9a769ded6197dbce515b71b137e
---
libavcodec/pixblockdsp.c| 2 ++
libavcodec/pixblockdsp.h| 2 ++
libavcodec/riscv/Makefile | 2 ++
libavcodec/riscv/pixblockdsp_init.c | 45
libavcodec/riscv/pixblockdsp_rvi.S | 59 +
5 files changed, 110 insertions(+)
diff --git a/libavcodec/pixblockdsp.c b/libavcodec/pixblockdsp.c
index 17c487da1e..4294075cee 100644
--- a/libavcodec/pixblockdsp.c
+++ b/libavcodec/pixblockdsp.c
@@ -109,6 +109,8 @@ av_cold void ff_pixblockdsp_init(PixblockDSPContext *c,
AVCodecContext *avctx)
ff_pixblockdsp_init_arm(c, avctx, high_bit_depth);
#elif ARCH_PPC
ff_pixblockdsp_init_ppc(c, avctx, high_bit_depth);
+#elif ARCH_RISCV
+ff_pixblockdsp_init_riscv(c, avctx, high_bit_depth);
#elif ARCH_X86
ff_pixblockdsp_init_x86(c, avctx, high_bit_depth);
#elif ARCH_MIPS
diff --git a/libavcodec/pixblockdsp.h b/libavcodec/pixblockdsp.h
index 07c2ec4f40..9b002aa3d6 100644
--- a/libavcodec/pixblockdsp.h
+++ b/libavcodec/pixblockdsp.h
@@ -52,6 +52,8 @@ void ff_pixblockdsp_init_arm(PixblockDSPContext *c,
AVCodecContext *avctx,
unsigned high_bit_depth);
void ff_pixblockdsp_init_ppc(PixblockDSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth);
+void ff_pixblockdsp_init_riscv(PixblockDSPContext *c, AVCodecContext *avctx,
+ unsigned high_bit_depth);
void ff_pixblockdsp_init_x86(PixblockDSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth);
void ff_pixblockdsp_init_mips(PixblockDSPContext *c, AVCodecContext *avctx,
diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile
index 414a9e9bd8..da07f1fe96 100644
--- a/libavcodec/riscv/Makefile
+++ b/libavcodec/riscv/Makefile
@@ -1,2 +1,4 @@
OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_init.o \
riscv/audiodsp_rvf.o
+OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_init.o \
+ riscv/pixblockdsp_rvi.o
diff --git a/libavcodec/riscv/pixblockdsp_init.c
b/libavcodec/riscv/pixblockdsp_init.c
new file mode 100644
index 00..04bf52649f
--- /dev/null
+++ b/libavcodec/riscv/pixblockdsp_init.c
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2022 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
+
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/pixblockdsp.h"
+
+void ff_get_pixels_8_rvi(int16_t *block, const uint8_t *pixels,
+ ptrdiff_t stride);
+void ff_get_pixels_16_rvi(int16_t *block, const uint8_t *pixels,
+ ptrdiff_t stride);
+
+av_cold void ff_pixblockdsp_init_riscv(PixblockDSPContext *c,
+ AVCodecContext *avctx,
+ unsigned high_bit_depth)
+{
+int cpu_flags = av_get_cpu_flags();
+
+if (cpu_flags & AV_CPU_FLAG_RVI) {
+if (high_bit_depth)
+c->get_pixels = ff_get_pixels_16_rvi;
+else
+c->get_pixels = ff_get_pixels_8_rvi;
+}
+}
diff --git a/libavcodec/riscv/pixblockdsp_rvi.S
b/libavcodec/riscv/pixblockdsp_rvi.S
new file mode 100644
index 00..93ece4405e
--- /dev/null
+++ b/libavcodec/riscv/pixblockdsp_rvi.S
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2022 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
+ *
[FFmpeg-cvslog] lavu/cpu: CPU flags for the RISC-V Vector extension
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:25 2022 +0300| [0c0a3deb1826638915775daa7cefb891a300060b] | committer:
Lynne
lavu/cpu: CPU flags for the RISC-V Vector extension
RVV defines a total of 12 different extensions, including:
- 5 different instruction subsets:
- Zve32x: 8-, 16- and 32-bit integers,
- Zve32f: Zve32x plus single precision floats,
- Zve64x: Zve32x plus 64-bit integers,
- Zve64f: Zve32f plus Zve64x,
- Zve64d: Zve64f plus double precision floats.
- 6 different vector lengths:
- Zvl32b (embedded only),
- Zvl64b (embedded only),
- Zvl128b,
- Zvl256b,
- Zvl512b,
- Zvl1024b,
- and the V extension proper: equivalent to Zve64f and Zvl128b.
In total, there are 6 different possible sets of supported instructions
(including the empty set), but for convenience we allocate one bit for
each type sets: up-to-32-bit ints (RVV_I32), floats (RVV_F32),
64-bit ints (RVV_I64) and doubles (RVV_F64).
Whence the vector size is needed, it can be retrieved by reading the
unprivileged read-only vlenb CSR. This should probably be a separate
helper macro if needed at a later point.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0c0a3deb1826638915775daa7cefb891a300060b
---
libavutil/cpu.c | 4
libavutil/cpu.h | 4
libavutil/riscv/cpu.c | 19 +++
tests/checkasm/checkasm.c | 4
4 files changed, 31 insertions(+)
diff --git a/libavutil/cpu.c b/libavutil/cpu.c
index 8b6eef9873..5818fd9c1c 100644
--- a/libavutil/cpu.c
+++ b/libavutil/cpu.c
@@ -184,6 +184,10 @@ int av_parse_cpu_caps(unsigned *flags, const char *s)
{ "rvi", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVI
},.unit = "flags" },
{ "rvf", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVF
},.unit = "flags" },
{ "rvd", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVD
},.unit = "flags" },
+{ "rvv-i32", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVV_I32
}, .unit = "flags" },
+{ "rvv-f32", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVV_F32
}, .unit = "flags" },
+{ "rvv-i64", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVV_I64
}, .unit = "flags" },
+{ "rvv", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVV_F64
}, .unit = "flags" },
#endif
{ NULL },
};
diff --git a/libavutil/cpu.h b/libavutil/cpu.h
index 9aae2ccc7a..18f42af015 100644
--- a/libavutil/cpu.h
+++ b/libavutil/cpu.h
@@ -82,6 +82,10 @@
#define AV_CPU_FLAG_RVI (1 << 0) ///< I (full GPR bank)
#define AV_CPU_FLAG_RVF (1 << 1) ///< F (single precision FP)
#define AV_CPU_FLAG_RVD (1 << 2) ///< D (double precision FP)
+#define AV_CPU_FLAG_RVV_I32 (1 << 3) ///< Vectors of 8/16/32-bit int's */
+#define AV_CPU_FLAG_RVV_F32 (1 << 4) ///< Vectors of float's */
+#define AV_CPU_FLAG_RVV_I64 (1 << 5) ///< Vectors of 64-bit int's */
+#define AV_CPU_FLAG_RVV_F64 (1 << 6) ///< Vectors of double's
/**
* Return the flags which specify extensions supported by the CPU.
diff --git a/libavutil/riscv/cpu.c b/libavutil/riscv/cpu.c
index 6803f035e5..e234201395 100644
--- a/libavutil/riscv/cpu.c
+++ b/libavutil/riscv/cpu.c
@@ -40,6 +40,11 @@ int ff_get_cpu_flags_riscv(void)
ret |= AV_CPU_FLAG_RVF;
if (hwcap & HWCAP_RV('D'))
ret |= AV_CPU_FLAG_RVD;
+
+/* The V extension implies all Zve* functional subsets */
+if (hwcap & HWCAP_RV('V'))
+ret |= AV_CPU_FLAG_RVV_I32 | AV_CPU_FLAG_RVV_I64
+ | AV_CPU_FLAG_RVV_F32 | AV_CPU_FLAG_RVV_F64;
#endif
#ifdef __riscv_i
@@ -50,6 +55,20 @@ int ff_get_cpu_flags_riscv(void)
#if (__riscv_flen >= 64)
ret |= AV_CPU_FLAG_RVD;
#endif
+#endif
+
+/* If RV-V is enabled statically at compile-time, check the details. */
+#ifdef __riscv_vectors
+ret |= AV_CPU_FLAG_RVV_I32;
+#if __riscv_v_elen >= 64
+ret |= AV_CPU_FLAG_RVV_I64;
+#endif
+#if __riscv_v_elen_fp >= 32
+ret |= AV_CPU_FLAG_RVV_F32;
+#if __riscv_v_elen_fp >= 64
+ret |= AV_CPU_FLAG_RVV_F64;
+#endif
+#endif
#endif
return ret;
diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c
index e1135a84ac..90dd7e4634 100644
--- a/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@ -236,6 +236,10 @@ static const struct {
{ "RVI", "rvi", AV_CPU_FLAG_RVI },
{ "RVF", "rvf", AV_CPU_FLAG_RVF },
{ "RVD", "rvd", AV_CPU_FLAG_RVD },
+{ "RVVi32", "rvv_i32", AV_CPU_FLAG_RVV_I32 },
+{ "RVVf32", "rvv_f32", AV_CPU_FLAG_RVV_F32 },
+{ "RVVi64", "rvv_i64", AV_CPU_FLAG_RVV_I64 },
+{ "RVVf64", "rvv_f64", AV_CPU_FLAG_RVV_F64 },
#elif ARCH_MIPS
{ "MMI", "mmi", AV_CPU_FLAG_MMI },
{ "MSA", "msa", AV_CPU_FLAG_MSA },
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ff
[FFmpeg-cvslog] lavu/floatdsp: RISC-V V vector_dmul
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:31 2022 +0300| [da169a210dbd33d5d34baaf3d188ca5388b1b267] | committer:
Lynne
lavu/floatdsp: RISC-V V vector_dmul
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=da169a210dbd33d5d34baaf3d188ca5388b1b267
---
libavutil/riscv/float_dsp_init.c | 6 +-
libavutil/riscv/float_dsp_rvv.S | 17 +
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/libavutil/riscv/float_dsp_init.c b/libavutil/riscv/float_dsp_init.c
index 2482094ab4..29114dfb82 100644
--- a/libavutil/riscv/float_dsp_init.c
+++ b/libavutil/riscv/float_dsp_init.c
@@ -30,6 +30,8 @@ void ff_vector_fmul_rvv(float *dst, const float *src0, const
float *src1,
void ff_vector_fmul_scalar_rvv(float *dst, const float *src, float mul,
int len);
+void ff_vector_dmul_rvv(double *dst, const double *src0, const double *src1,
+ int len);
void ff_vector_dmul_scalar_rvv(double *dst, const double *src, double mul,
int len);
@@ -43,7 +45,9 @@ av_cold void ff_float_dsp_init_riscv(AVFloatDSPContext *fdsp)
fdsp->vector_fmul_scalar = ff_vector_fmul_scalar_rvv;
}
-if (flags & AV_CPU_FLAG_RVV_F64)
+if (flags & AV_CPU_FLAG_RVV_F64) {
+fdsp->vector_dmul = ff_vector_dmul_rvv;
fdsp->vector_dmul_scalar = ff_vector_dmul_scalar_rvv;
+}
#endif
}
diff --git a/libavutil/riscv/float_dsp_rvv.S b/libavutil/riscv/float_dsp_rvv.S
index 00fb7354bb..710e122444 100644
--- a/libavutil/riscv/float_dsp_rvv.S
+++ b/libavutil/riscv/float_dsp_rvv.S
@@ -55,6 +55,23 @@ NOHWF mv a2, a3
ret
endfunc
+// (a0) = (a1) * (a2) [0..a3-1]
+func ff_vector_dmul_rvv, zve64d
+1:
+vsetvli t0, a3, e64, m1, ta, ma
+vle64.v v16, (a1)
+sub a3, a3, t0
+vle64.v v24, (a2)
+sh3add a1, t0, a1
+vfmul.vv v16, v16, v24
+sh3add a2, t0, a2
+vse64.v v16, (a0)
+sh3add a0, t0, a0
+bnez a3, 1b
+
+ret
+endfunc
+
// (a0) = (a1) * fa0 [0..a2-1]
func ff_vector_dmul_scalar_rvv, zve64d
NOHWD fmv.d.x fa0, a2
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavu/floatdsp: RISC-V V vector_dmul_scalar
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:29 2022 +0300| [89b7ec65a8c50a88ca730c666410f5743f600634] | committer:
Lynne
lavu/floatdsp: RISC-V V vector_dmul_scalar
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89b7ec65a8c50a88ca730c666410f5743f600634
---
libavutil/riscv/float_dsp_init.c | 6 ++
libavutil/riscv/float_dsp_rvv.S | 17 +
2 files changed, 23 insertions(+)
diff --git a/libavutil/riscv/float_dsp_init.c b/libavutil/riscv/float_dsp_init.c
index f4299049b0..3386139d49 100644
--- a/libavutil/riscv/float_dsp_init.c
+++ b/libavutil/riscv/float_dsp_init.c
@@ -28,6 +28,9 @@
void ff_vector_fmul_scalar_rvv(float *dst, const float *src, float mul,
int len);
+void ff_vector_dmul_scalar_rvv(double *dst, const double *src, double mul,
+int len);
+
av_cold void ff_float_dsp_init_riscv(AVFloatDSPContext *fdsp)
{
#if HAVE_RVV
@@ -35,5 +38,8 @@ av_cold void ff_float_dsp_init_riscv(AVFloatDSPContext *fdsp)
if (flags & AV_CPU_FLAG_RVV_F32)
fdsp->vector_fmul_scalar = ff_vector_fmul_scalar_rvv;
+
+if (flags & AV_CPU_FLAG_RVV_F64)
+fdsp->vector_dmul_scalar = ff_vector_dmul_scalar_rvv;
#endif
}
diff --git a/libavutil/riscv/float_dsp_rvv.S b/libavutil/riscv/float_dsp_rvv.S
index 50cb1fa90f..17dda471b4 100644
--- a/libavutil/riscv/float_dsp_rvv.S
+++ b/libavutil/riscv/float_dsp_rvv.S
@@ -37,3 +37,20 @@ NOHWF mv a2, a3
ret
endfunc
+
+// (a0) = (a1) * fa0 [0..a2-1]
+func ff_vector_dmul_scalar_rvv, zve64d
+NOHWD fmv.d.x fa0, a2
+NOHWD mv a2, a3
+1:
+vsetvli t0, a2, e64, m1, ta, ma
+vle64.v v16, (a1)
+sub a2, a2, t0
+vfmul.vf v16, v16, fa0
+sh3add a1, t0, a1
+vse64.v v16, (a0)
+sh3add a0, t0, a0
+bnez a2, 1b
+
+ret
+endfunc
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavu/floatdsp: RISC-V V vector_fmul
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:30 2022 +0300| [7058af9969b737adbb1cd302cf8fa5feb7bc9e2b] | committer:
Lynne
lavu/floatdsp: RISC-V V vector_fmul
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7058af9969b737adbb1cd302cf8fa5feb7bc9e2b
---
libavutil/riscv/float_dsp_init.c | 6 +-
libavutil/riscv/float_dsp_rvv.S | 17 +
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/libavutil/riscv/float_dsp_init.c b/libavutil/riscv/float_dsp_init.c
index 3386139d49..2482094ab4 100644
--- a/libavutil/riscv/float_dsp_init.c
+++ b/libavutil/riscv/float_dsp_init.c
@@ -25,6 +25,8 @@
#include "libavutil/cpu.h"
#include "libavutil/float_dsp.h"
+void ff_vector_fmul_rvv(float *dst, const float *src0, const float *src1,
+ int len);
void ff_vector_fmul_scalar_rvv(float *dst, const float *src, float mul,
int len);
@@ -36,8 +38,10 @@ av_cold void ff_float_dsp_init_riscv(AVFloatDSPContext *fdsp)
#if HAVE_RVV
int flags = av_get_cpu_flags();
-if (flags & AV_CPU_FLAG_RVV_F32)
+if (flags & AV_CPU_FLAG_RVV_F32) {
+fdsp->vector_fmul = ff_vector_fmul_rvv;
fdsp->vector_fmul_scalar = ff_vector_fmul_scalar_rvv;
+}
if (flags & AV_CPU_FLAG_RVV_F64)
fdsp->vector_dmul_scalar = ff_vector_dmul_scalar_rvv;
diff --git a/libavutil/riscv/float_dsp_rvv.S b/libavutil/riscv/float_dsp_rvv.S
index 17dda471b4..00fb7354bb 100644
--- a/libavutil/riscv/float_dsp_rvv.S
+++ b/libavutil/riscv/float_dsp_rvv.S
@@ -21,6 +21,23 @@
#include "config.h"
#include "asm.S"
+// (a0) = (a1) * (a2) [0..a3-1]
+func ff_vector_fmul_rvv, zve32f
+1:
+vsetvli t0, a3, e32, m1, ta, ma
+vle32.v v16, (a1)
+sub a3, a3, t0
+vle32.v v24, (a2)
+sh2add a1, t0, a1
+vfmul.vv v16, v16, v24
+sh2add a2, t0, a2
+vse32.v v16, (a0)
+sh2add a0, t0, a0
+bnez a3, 1b
+
+ret
+endfunc
+
// (a0) = (a1) * fa0 [0..a2-1]
func ff_vector_fmul_scalar_rvv, zve32f
NOHWF fmv.w.x fa0, a2
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavu/floatdsp: RISC-V V vector_fmul_add
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:34 2022 +0300| [f4ea45040f4c0d896fce66a6f52deb53249ed77f] | committer:
Lynne
lavu/floatdsp: RISC-V V vector_fmul_add
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f4ea45040f4c0d896fce66a6f52deb53249ed77f
---
libavutil/riscv/float_dsp_init.c | 3 +++
libavutil/riscv/float_dsp_rvv.S | 19 +++
2 files changed, 22 insertions(+)
diff --git a/libavutil/riscv/float_dsp_init.c b/libavutil/riscv/float_dsp_init.c
index a559bbb32b..8982436647 100644
--- a/libavutil/riscv/float_dsp_init.c
+++ b/libavutil/riscv/float_dsp_init.c
@@ -31,6 +31,8 @@ void ff_vector_fmac_scalar_rvv(float *dst, const float *src,
float mul,
int len);
void ff_vector_fmul_scalar_rvv(float *dst, const float *src, float mul,
int len);
+void ff_vector_fmul_add_rvv(float *dst, const float *src0, const float *src1,
+ const float *src2, int len);
void ff_vector_dmul_rvv(double *dst, const double *src0, const double *src1,
int len);
@@ -48,6 +50,7 @@ av_cold void ff_float_dsp_init_riscv(AVFloatDSPContext *fdsp)
fdsp->vector_fmul = ff_vector_fmul_rvv;
fdsp->vector_fmac_scalar = ff_vector_fmac_scalar_rvv;
fdsp->vector_fmul_scalar = ff_vector_fmul_scalar_rvv;
+fdsp->vector_fmul_add = ff_vector_fmul_add_rvv;
}
if (flags & AV_CPU_FLAG_RVV_F64) {
diff --git a/libavutil/riscv/float_dsp_rvv.S b/libavutil/riscv/float_dsp_rvv.S
index 048ec0bc40..db62402878 100644
--- a/libavutil/riscv/float_dsp_rvv.S
+++ b/libavutil/riscv/float_dsp_rvv.S
@@ -74,6 +74,25 @@ NOHWF mv a2, a3
ret
endfunc
+// (a0) = (a1) * (a2) + (a3) [0..a4-1]
+func ff_vector_fmul_add_rvv, zve32f
+1:
+vsetvli t0, a4, e32, m1, ta, ma
+vle32.v v8, (a1)
+sub a4, a4, t0
+vle32.v v16, (a2)
+sh2adda1, t0, a1
+vle32.v v24, (a3)
+sh2adda2, t0, a2
+vfmadd.vv v8, v16, v24
+sh2adda3, t0, a3
+vse32.v v8, (a0)
+sh2adda0, t0, a0
+bnez a4, 1b
+
+ret
+endfunc
+
// (a0) = (a1) * (a2) [0..a3-1]
func ff_vector_dmul_rvv, zve64d
1:
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavu/floatdsp: RISC-V V vector_fmac_scalar
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:32 2022 +0300| [c3db27ba9552fc3cb764bf9eb717840d981c5779] | committer:
Lynne
lavu/floatdsp: RISC-V V vector_fmac_scalar
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c3db27ba9552fc3cb764bf9eb717840d981c5779
---
libavutil/riscv/float_dsp_init.c | 3 +++
libavutil/riscv/float_dsp_rvv.S | 19 +++
2 files changed, 22 insertions(+)
diff --git a/libavutil/riscv/float_dsp_init.c b/libavutil/riscv/float_dsp_init.c
index 29114dfb82..9e19413d5d 100644
--- a/libavutil/riscv/float_dsp_init.c
+++ b/libavutil/riscv/float_dsp_init.c
@@ -27,6 +27,8 @@
void ff_vector_fmul_rvv(float *dst, const float *src0, const float *src1,
int len);
+void ff_vector_fmac_scalar_rvv(float *dst, const float *src, float mul,
+int len);
void ff_vector_fmul_scalar_rvv(float *dst, const float *src, float mul,
int len);
@@ -42,6 +44,7 @@ av_cold void ff_float_dsp_init_riscv(AVFloatDSPContext *fdsp)
if (flags & AV_CPU_FLAG_RVV_F32) {
fdsp->vector_fmul = ff_vector_fmul_rvv;
+fdsp->vector_fmac_scalar = ff_vector_fmac_scalar_rvv;
fdsp->vector_fmul_scalar = ff_vector_fmul_scalar_rvv;
}
diff --git a/libavutil/riscv/float_dsp_rvv.S b/libavutil/riscv/float_dsp_rvv.S
index 710e122444..4c325db9fd 100644
--- a/libavutil/riscv/float_dsp_rvv.S
+++ b/libavutil/riscv/float_dsp_rvv.S
@@ -38,6 +38,25 @@ func ff_vector_fmul_rvv, zve32f
ret
endfunc
+// (a0) += (a1) * fa0 [0..a2-1]
+func ff_vector_fmac_scalar_rvv, zve32f
+NOHWF fmv.w.x fa0, a2
+NOHWF mva2, a3
+1:
+vsetvli t0, a2, e32, m1, ta, ma
+slli t1, t0, 2
+vle32.v v24, (a1)
+sub a2, a2, t0
+vle32.v v16, (a0)
+sh2adda1, t0, a1
+vfmacc.vf v16, fa0, v24
+vse32.v v16, (a0)
+sh2adda0, t0, a0
+bnez a2, 1b
+
+ret
+endfunc
+
// (a0) = (a1) * fa0 [0..a2-1]
func ff_vector_fmul_scalar_rvv, zve32f
NOHWF fmv.w.x fa0, a2
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavu/floatdsp: RISC-V V butterflies_float
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:35 2022 +0300| [47ce9735cc8362ea6b3a508dd660233af28d77ba] | committer:
Lynne
lavu/floatdsp: RISC-V V butterflies_float
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47ce9735cc8362ea6b3a508dd660233af28d77ba
---
libavutil/riscv/float_dsp_init.c | 2 ++
libavutil/riscv/float_dsp_rvv.S | 18 ++
2 files changed, 20 insertions(+)
diff --git a/libavutil/riscv/float_dsp_init.c b/libavutil/riscv/float_dsp_init.c
index 8982436647..a1cd180cdc 100644
--- a/libavutil/riscv/float_dsp_init.c
+++ b/libavutil/riscv/float_dsp_init.c
@@ -33,6 +33,7 @@ void ff_vector_fmul_scalar_rvv(float *dst, const float *src,
float mul,
int len);
void ff_vector_fmul_add_rvv(float *dst, const float *src0, const float *src1,
const float *src2, int len);
+void ff_butterflies_float_rvv(float *v1, float *v2, int len);
void ff_vector_dmul_rvv(double *dst, const double *src0, const double *src1,
int len);
@@ -51,6 +52,7 @@ av_cold void ff_float_dsp_init_riscv(AVFloatDSPContext *fdsp)
fdsp->vector_fmac_scalar = ff_vector_fmac_scalar_rvv;
fdsp->vector_fmul_scalar = ff_vector_fmul_scalar_rvv;
fdsp->vector_fmul_add = ff_vector_fmul_add_rvv;
+fdsp->butterflies_float = ff_butterflies_float_rvv;
}
if (flags & AV_CPU_FLAG_RVV_F64) {
diff --git a/libavutil/riscv/float_dsp_rvv.S b/libavutil/riscv/float_dsp_rvv.S
index db62402878..a721c44667 100644
--- a/libavutil/riscv/float_dsp_rvv.S
+++ b/libavutil/riscv/float_dsp_rvv.S
@@ -93,6 +93,24 @@ func ff_vector_fmul_add_rvv, zve32f
ret
endfunc
+// (a0) = (a0) + (a1), (a1) = (a0) - (a1) [0..a2-1]
+func ff_butterflies_float_rvv, zve32f
+1:
+vsetvli t0, a2, e32, m1, ta, ma
+vle32.v v16, (a0)
+sub a2, a2, t0
+vle32.v v24, (a1)
+vfadd.vv v0, v16, v24
+vfsub.vv v8, v16, v24
+vse32.v v0, (a0)
+sh2add a0, t0, a0
+vse32.v v8, (a1)
+sh2add a1, t0, a1
+bnez a2, 1b
+
+ret
+endfunc
+
// (a0) = (a1) * (a2) [0..a3-1]
func ff_vector_dmul_rvv, zve64d
1:
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavu/floatdsp: RISC-V V vector_dmac_scalar
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:33 2022 +0300| [d120ab5b915fb422247f9e4dd5b823d1b47d6adf] | committer:
Lynne
lavu/floatdsp: RISC-V V vector_dmac_scalar
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d120ab5b915fb422247f9e4dd5b823d1b47d6adf
---
libavutil/riscv/float_dsp_init.c | 3 +++
libavutil/riscv/float_dsp_rvv.S | 18 ++
2 files changed, 21 insertions(+)
diff --git a/libavutil/riscv/float_dsp_init.c b/libavutil/riscv/float_dsp_init.c
index 9e19413d5d..a559bbb32b 100644
--- a/libavutil/riscv/float_dsp_init.c
+++ b/libavutil/riscv/float_dsp_init.c
@@ -34,6 +34,8 @@ void ff_vector_fmul_scalar_rvv(float *dst, const float *src,
float mul,
void ff_vector_dmul_rvv(double *dst, const double *src0, const double *src1,
int len);
+void ff_vector_dmac_scalar_rvv(double *dst, const double *src, double mul,
+int len);
void ff_vector_dmul_scalar_rvv(double *dst, const double *src, double mul,
int len);
@@ -50,6 +52,7 @@ av_cold void ff_float_dsp_init_riscv(AVFloatDSPContext *fdsp)
if (flags & AV_CPU_FLAG_RVV_F64) {
fdsp->vector_dmul = ff_vector_dmul_rvv;
+fdsp->vector_dmac_scalar = ff_vector_dmac_scalar_rvv;
fdsp->vector_dmul_scalar = ff_vector_dmul_scalar_rvv;
}
#endif
diff --git a/libavutil/riscv/float_dsp_rvv.S b/libavutil/riscv/float_dsp_rvv.S
index 4c325db9fd..048ec0bc40 100644
--- a/libavutil/riscv/float_dsp_rvv.S
+++ b/libavutil/riscv/float_dsp_rvv.S
@@ -91,6 +91,24 @@ func ff_vector_dmul_rvv, zve64d
ret
endfunc
+// (a0) += (a1) * fa0 [0..a2-1]
+func ff_vector_dmac_scalar_rvv, zve64d
+NOHWD fmv.d.x fa0, a2
+NOHWD mva2, a3
+1:
+vsetvli t0, a2, e64, m1, ta, ma
+vle64.v v24, (a1)
+sub a2, a2, t0
+vle64.v v16, (a0)
+sh3adda1, t0, a1
+vfmacc.vf v16, fa0, v24
+vse64.v v16, (a0)
+sh3adda0, t0, a0
+bnez a2, 1b
+
+ret
+endfunc
+
// (a0) = (a1) * fa0 [0..a2-1]
func ff_vector_dmul_scalar_rvv, zve64d
NOHWD fmv.d.x fa0, a2
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavu/floatdsp: RISC-V V vector_fmul_reverse
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26 17:52:36 2022 +0300| [9aeb6aca3a9fa8caf8db263de4fa9f8077ba6634] | committer: Lynne lavu/floatdsp: RISC-V V vector_fmul_reverse > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9aeb6aca3a9fa8caf8db263de4fa9f8077ba6634 --- libavutil/riscv/float_dsp_init.c | 3 +++ libavutil/riscv/float_dsp_rvv.S | 21 + 2 files changed, 24 insertions(+) diff --git a/libavutil/riscv/float_dsp_init.c b/libavutil/riscv/float_dsp_init.c index a1cd180cdc..b99e3080c9 100644 --- a/libavutil/riscv/float_dsp_init.c +++ b/libavutil/riscv/float_dsp_init.c @@ -33,6 +33,8 @@ void ff_vector_fmul_scalar_rvv(float *dst, const float *src, float mul, int len); void ff_vector_fmul_add_rvv(float *dst, const float *src0, const float *src1, const float *src2, int len); +void ff_vector_fmul_reverse_rvv(float *dst, const float *src0, + const float *src1, int len); void ff_butterflies_float_rvv(float *v1, float *v2, int len); void ff_vector_dmul_rvv(double *dst, const double *src0, const double *src1, @@ -52,6 +54,7 @@ av_cold void ff_float_dsp_init_riscv(AVFloatDSPContext *fdsp) fdsp->vector_fmac_scalar = ff_vector_fmac_scalar_rvv; fdsp->vector_fmul_scalar = ff_vector_fmul_scalar_rvv; fdsp->vector_fmul_add = ff_vector_fmul_add_rvv; +fdsp->vector_fmul_reverse = ff_vector_fmul_reverse_rvv; fdsp->butterflies_float = ff_butterflies_float_rvv; } diff --git a/libavutil/riscv/float_dsp_rvv.S b/libavutil/riscv/float_dsp_rvv.S index a721c44667..fbd2777463 100644 --- a/libavutil/riscv/float_dsp_rvv.S +++ b/libavutil/riscv/float_dsp_rvv.S @@ -93,6 +93,27 @@ func ff_vector_fmul_add_rvv, zve32f ret endfunc +// (a0) = (a1) * reverse(a2) [0..a3-1] +func ff_vector_fmul_reverse_rvv, zve32f +sh2add a2, a3, a2 +li t2, -4 // byte stride +addi a2, a2, -4 +1: +vsetvli t0, a3, e32, m1, ta, ma +slli t1, t0, 2 +vle32.v v16, (a1) +sub a3, a3, t0 +vlse32.v v24, (a2), t2 +add a1, a1, t1 +vfmul.vv v16, v16, v24 +sub a2, a2, t1 +vse32.v v16, (a0) +add a0, a0, t1 +bnez a3, 1b + +ret +endfunc + // (a0) = (a0) + (a1), (a1) = (a0) - (a1) [0..a2-1] func ff_butterflies_float_rvv, zve32f 1: ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavu/floatdsp: RISC-V V vector_fmul_window
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26 17:52:37 2022 +0300| [b493370662eaa87f84450e876b8b61b34d91f23d] | committer: Lynne lavu/floatdsp: RISC-V V vector_fmul_window > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b493370662eaa87f84450e876b8b61b34d91f23d --- libavutil/riscv/float_dsp_init.c | 3 +++ libavutil/riscv/float_dsp_rvv.S | 33 + 2 files changed, 36 insertions(+) diff --git a/libavutil/riscv/float_dsp_init.c b/libavutil/riscv/float_dsp_init.c index b99e3080c9..44a505308d 100644 --- a/libavutil/riscv/float_dsp_init.c +++ b/libavutil/riscv/float_dsp_init.c @@ -31,6 +31,8 @@ void ff_vector_fmac_scalar_rvv(float *dst, const float *src, float mul, int len); void ff_vector_fmul_scalar_rvv(float *dst, const float *src, float mul, int len); +void ff_vector_fmul_window_rvv(float *dst, const float *src0, +const float *src1, const float *win, int len); void ff_vector_fmul_add_rvv(float *dst, const float *src0, const float *src1, const float *src2, int len); void ff_vector_fmul_reverse_rvv(float *dst, const float *src0, @@ -53,6 +55,7 @@ av_cold void ff_float_dsp_init_riscv(AVFloatDSPContext *fdsp) fdsp->vector_fmul = ff_vector_fmul_rvv; fdsp->vector_fmac_scalar = ff_vector_fmac_scalar_rvv; fdsp->vector_fmul_scalar = ff_vector_fmul_scalar_rvv; +fdsp->vector_fmul_window = ff_vector_fmul_window_rvv; fdsp->vector_fmul_add = ff_vector_fmul_add_rvv; fdsp->vector_fmul_reverse = ff_vector_fmul_reverse_rvv; fdsp->butterflies_float = ff_butterflies_float_rvv; diff --git a/libavutil/riscv/float_dsp_rvv.S b/libavutil/riscv/float_dsp_rvv.S index fbd2777463..ce530f6108 100644 --- a/libavutil/riscv/float_dsp_rvv.S +++ b/libavutil/riscv/float_dsp_rvv.S @@ -74,6 +74,39 @@ NOHWF mv a2, a3 ret endfunc +func ff_vector_fmul_window_rvv, zve32f +// a0: dst, a1: src0, a2: src1, a3: window, a4: length +addi t0, a4, -1 +addt1, t0, a4 +sh2add a2, t0, a2 +sh2add t0, t1, a0 +sh2add t3, t1, a3 +li t1, -4 // byte stride +1: +vsetvlit2, a4, e32, m1, ta, ma +vle32.vv16, (a1) +slli t4, t2, 2 +vlse32.v v20, (a2), t1 +suba4, a4, t2 +vle32.vv24, (a3) +adda1, a1, t4 +vlse32.v v28, (t3), t1 +suba2, a2, t4 +vfmul.vv v0, v16, v28 +adda3, a3, t4 +vfmul.vv v8, v16, v24 +subt3, t3, t4 +vfnmsac.vv v0, v20, v24 +vfmacc.vv v8, v20, v28 +vse32.vv0, (a0) +adda0, a0, t4 +vsse32.v v8, (t0), t1 +subt0, t0, t4 +bnez a4, 1b + +ret +endfunc + // (a0) = (a1) * (a2) + (a3) [0..a4-1] func ff_vector_fmul_add_rvv, zve32f 1: ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavu/floatdsp: RISC-V V scalarproduct_float
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:38 2022 +0300| [cd77662953942cf166f0115b21cb8619e2e8f630] | committer:
Lynne
lavu/floatdsp: RISC-V V scalarproduct_float
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd77662953942cf166f0115b21cb8619e2e8f630
---
libavutil/riscv/float_dsp_init.c | 2 ++
libavutil/riscv/float_dsp_rvv.S | 20
2 files changed, 22 insertions(+)
diff --git a/libavutil/riscv/float_dsp_init.c b/libavutil/riscv/float_dsp_init.c
index 44a505308d..e61f887862 100644
--- a/libavutil/riscv/float_dsp_init.c
+++ b/libavutil/riscv/float_dsp_init.c
@@ -38,6 +38,7 @@ void ff_vector_fmul_add_rvv(float *dst, const float *src0,
const float *src1,
void ff_vector_fmul_reverse_rvv(float *dst, const float *src0,
const float *src1, int len);
void ff_butterflies_float_rvv(float *v1, float *v2, int len);
+float ff_scalarproduct_float_rvv(const float *v1, const float *v2, int len);
void ff_vector_dmul_rvv(double *dst, const double *src0, const double *src1,
int len);
@@ -59,6 +60,7 @@ av_cold void ff_float_dsp_init_riscv(AVFloatDSPContext *fdsp)
fdsp->vector_fmul_add = ff_vector_fmul_add_rvv;
fdsp->vector_fmul_reverse = ff_vector_fmul_reverse_rvv;
fdsp->butterflies_float = ff_butterflies_float_rvv;
+fdsp->scalarproduct_float = ff_scalarproduct_float_rvv;
}
if (flags & AV_CPU_FLAG_RVV_F64) {
diff --git a/libavutil/riscv/float_dsp_rvv.S b/libavutil/riscv/float_dsp_rvv.S
index ce530f6108..ab2e0c42d7 100644
--- a/libavutil/riscv/float_dsp_rvv.S
+++ b/libavutil/riscv/float_dsp_rvv.S
@@ -165,6 +165,26 @@ func ff_butterflies_float_rvv, zve32f
ret
endfunc
+// a0 = (a0).(a1) [0..a2-1]
+func ff_scalarproduct_float_rvv, zve32f
+vsetvli zero, zero, e32, m1, ta, ma
+vmv.s.x v8, zero
+1:
+vsetvli t0, a2, e32, m1, ta, ma
+vle32.v v16, (a0)
+sub a2, a2, t0
+vle32.v v24, (a1)
+sh2add a0, t0, a0
+vfmul.vv v16, v16, v24
+sh2add a1, t0, a1
+vfredusum.vs v8, v16, v8
+bnez a2, 1b
+
+vfmv.f.s fa0, v8
+NOHWF fmv.x.w a0, fa0
+ret
+endfunc
+
// (a0) = (a1) * (a2) [0..a3-1]
func ff_vector_dmul_rvv, zve64d
1:
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavu/fixeddsp: RISC-V V butterflies_fixed
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:39 2022 +0300| [c1bb19e263e14887ad286c16352edbaa39be4f66] | committer:
Lynne
lavu/fixeddsp: RISC-V V butterflies_fixed
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c1bb19e263e14887ad286c16352edbaa39be4f66
---
libavutil/fixed_dsp.c| 4 +++-
libavutil/fixed_dsp.h| 1 +
libavutil/riscv/Makefile | 4 +++-
libavutil/riscv/fixed_dsp_init.c | 38 ++
libavutil/riscv/fixed_dsp_rvv.S | 40
5 files changed, 85 insertions(+), 2 deletions(-)
diff --git a/libavutil/fixed_dsp.c b/libavutil/fixed_dsp.c
index 154f3bc2d3..bc847949dc 100644
--- a/libavutil/fixed_dsp.c
+++ b/libavutil/fixed_dsp.c
@@ -162,7 +162,9 @@ AVFixedDSPContext * avpriv_alloc_fixed_dsp(int bit_exact)
fdsp->butterflies_fixed = butterflies_fixed_c;
fdsp->scalarproduct_fixed = scalarproduct_fixed_c;
-#if ARCH_X86
+#if ARCH_RISCV
+ff_fixed_dsp_init_riscv(fdsp);
+#elif ARCH_X86
ff_fixed_dsp_init_x86(fdsp);
#endif
diff --git a/libavutil/fixed_dsp.h b/libavutil/fixed_dsp.h
index fec806ff2d..1217d3a53b 100644
--- a/libavutil/fixed_dsp.h
+++ b/libavutil/fixed_dsp.h
@@ -161,6 +161,7 @@ typedef struct AVFixedDSPContext {
*/
AVFixedDSPContext * avpriv_alloc_fixed_dsp(int strict);
+void ff_fixed_dsp_init_riscv(AVFixedDSPContext *fdsp);
void ff_fixed_dsp_init_x86(AVFixedDSPContext *fdsp);
/**
diff --git a/libavutil/riscv/Makefile b/libavutil/riscv/Makefile
index 89a8d0d990..1597154ba5 100644
--- a/libavutil/riscv/Makefile
+++ b/libavutil/riscv/Makefile
@@ -1,3 +1,5 @@
OBJS += riscv/float_dsp_init.o \
+riscv/fixed_dsp_init.o \
riscv/cpu.o
-RVV-OBJS += riscv/float_dsp_rvv.o
+RVV-OBJS += riscv/float_dsp_rvv.o \
+riscv/fixed_dsp_rvv.o
diff --git a/libavutil/riscv/fixed_dsp_init.c b/libavutil/riscv/fixed_dsp_init.c
new file mode 100644
index 00..e2915f1fcd
--- /dev/null
+++ b/libavutil/riscv/fixed_dsp_init.c
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2022 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
+
+#include "config.h"
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavutil/fixed_dsp.h"
+
+void ff_butterflies_fixed_rvv(int *v1, int *v2, int len);
+
+av_cold void ff_fixed_dsp_init_riscv(AVFixedDSPContext *fdsp)
+{
+#if HAVE_RVV
+int flags = av_get_cpu_flags();
+
+if (flags & AV_CPU_FLAG_RVV_I32)
+fdsp->butterflies_fixed = ff_butterflies_fixed_rvv;
+#endif
+}
diff --git a/libavutil/riscv/fixed_dsp_rvv.S b/libavutil/riscv/fixed_dsp_rvv.S
new file mode 100644
index 00..0e78734b4c
--- /dev/null
+++ b/libavutil/riscv/fixed_dsp_rvv.S
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2022 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 "asm.S"
+
+// (a0) = (a0) + (a1), (a1) = (a0) - (a1) [0..a2-1]
+func ff_butterflies_fixed_rvv, zve32x
+1:
+vsetvli t0, a2, e32, m1, ta, ma
+vle32.v v16, (a0)
+sub a2, a2, t0
+vle32.v v24, (a1)
+vadd.vv v0, v16, v24
+vsub.vv v8, v16, v24
+vse32.v v0, (a0)
+sh2add a0, t0, a0
+vse32.v v8, (a1)
+sh2add a1, t0, a1
+bneza2, 1b
+
+ret
+endfunc
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visi
[FFmpeg-cvslog] lavc/audiodsp: RISC-V V vector_clip_int32
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:40 2022 +0300| [27da9514c3a7b506e3c3e0ada5dee67566c5aadf] | committer:
Lynne
lavc/audiodsp: RISC-V V vector_clip_int32
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=27da9514c3a7b506e3c3e0ada5dee67566c5aadf
---
libavcodec/riscv/Makefile| 1 +
libavcodec/riscv/audiodsp_init.c | 9 +
libavcodec/riscv/audiodsp_rvv.S | 36
3 files changed, 46 insertions(+)
diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile
index da07f1fe96..99541b075e 100644
--- a/libavcodec/riscv/Makefile
+++ b/libavcodec/riscv/Makefile
@@ -1,4 +1,5 @@
OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_init.o \
riscv/audiodsp_rvf.o
+RVV-OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_rvv.o
OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_init.o \
riscv/pixblockdsp_rvi.o
diff --git a/libavcodec/riscv/audiodsp_init.c b/libavcodec/riscv/audiodsp_init.c
index c5842815d6..ac06848a82 100644
--- a/libavcodec/riscv/audiodsp_init.c
+++ b/libavcodec/riscv/audiodsp_init.c
@@ -18,16 +18,25 @@
* 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/audiodsp.h"
void ff_vector_clipf_rvf(float *dst, const float *src, int len, float min,
float max);
+void ff_vector_clip_int32_rvv(int32_t *dst, const int32_t *src, int32_t min,
+ int32_t max, unsigned int len);
+
av_cold void ff_audiodsp_init_riscv(AudioDSPContext *c)
{
int flags = av_get_cpu_flags();
if (flags & AV_CPU_FLAG_RVF)
c->vector_clipf = ff_vector_clipf_rvf;
+#if HAVE_RVV
+if (flags & AV_CPU_FLAG_RVV_I32)
+c->vector_clip_int32 = ff_vector_clip_int32_rvv;
+#endif
}
diff --git a/libavcodec/riscv/audiodsp_rvv.S b/libavcodec/riscv/audiodsp_rvv.S
new file mode 100644
index 00..49546ee3c4
--- /dev/null
+++ b/libavcodec/riscv/audiodsp_rvv.S
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2022 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_vector_clip_int32_rvv, zve32x
+1:
+vsetvli t0, a4, e32, m1, ta, ma
+vle32.v v8, (a1)
+sub a4, a4, t0
+vmax.vx v8, v8, a2
+sh2add a1, t0, a1
+vmin.vx v8, v8, a3
+vse32.v v8, (a0)
+sh2add a0, t0, a0
+bneza4, 1b
+
+ret
+endfunc
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavc/fmtconvert: RISC-V V int32_to_float_fmul_scalar
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:43 2022 +0300| [47a10b9a99130457c27b220afba7d7de4a69bb18] | committer:
Lynne
lavc/fmtconvert: RISC-V V int32_to_float_fmul_scalar
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47a10b9a99130457c27b220afba7d7de4a69bb18
---
libavcodec/fmtconvert.c| 2 ++
libavcodec/fmtconvert.h| 1 +
libavcodec/riscv/Makefile | 2 ++
libavcodec/riscv/fmtconvert_init.c | 39 ++
libavcodec/riscv/fmtconvert_rvv.S | 39 ++
5 files changed, 83 insertions(+)
diff --git a/libavcodec/fmtconvert.c b/libavcodec/fmtconvert.c
index cedfd61138..d889e61aca 100644
--- a/libavcodec/fmtconvert.c
+++ b/libavcodec/fmtconvert.c
@@ -52,6 +52,8 @@ av_cold void ff_fmt_convert_init(FmtConvertContext *c)
ff_fmt_convert_init_arm(c);
#elif ARCH_PPC
ff_fmt_convert_init_ppc(c);
+#elif ARCH_RISCV
+ff_fmt_convert_init_riscv(c);
#elif ARCH_X86
ff_fmt_convert_init_x86(c);
#endif
diff --git a/libavcodec/fmtconvert.h b/libavcodec/fmtconvert.h
index da244e05a5..1cb4628a64 100644
--- a/libavcodec/fmtconvert.h
+++ b/libavcodec/fmtconvert.h
@@ -61,6 +61,7 @@ void ff_fmt_convert_init(FmtConvertContext *c);
void ff_fmt_convert_init_aarch64(FmtConvertContext *c);
void ff_fmt_convert_init_arm(FmtConvertContext *c);
void ff_fmt_convert_init_ppc(FmtConvertContext *c);
+void ff_fmt_convert_init_riscv(FmtConvertContext *c);
void ff_fmt_convert_init_x86(FmtConvertContext *c);
void ff_fmt_convert_init_mips(FmtConvertContext *c);
diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile
index 99541b075e..682174e875 100644
--- a/libavcodec/riscv/Makefile
+++ b/libavcodec/riscv/Makefile
@@ -1,5 +1,7 @@
OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_init.o \
riscv/audiodsp_rvf.o
RVV-OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_rvv.o
+OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_init.o
+RVV-OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_rvv.o
OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_init.o \
riscv/pixblockdsp_rvi.o
diff --git a/libavcodec/riscv/fmtconvert_init.c
b/libavcodec/riscv/fmtconvert_init.c
new file mode 100644
index 00..b2c240c1ce
--- /dev/null
+++ b/libavcodec/riscv/fmtconvert_init.c
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2022 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
+
+#include "config.h"
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavcodec/fmtconvert.h"
+
+void ff_int32_to_float_fmul_scalar_rvv(float *dst, const int32_t *src,
+ float mul, int len);
+
+av_cold void ff_fmt_convert_init_riscv(FmtConvertContext *c)
+{
+#ifdef HAVE_RVV
+int flags = av_get_cpu_flags();
+
+if (flags & AV_CPU_FLAG_RVV_F32)
+c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_rvv;
+#endif
+}
diff --git a/libavcodec/riscv/fmtconvert_rvv.S
b/libavcodec/riscv/fmtconvert_rvv.S
new file mode 100644
index 00..b7c78831a0
--- /dev/null
+++ b/libavcodec/riscv/fmtconvert_rvv.S
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2022 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/riscv/asm.S"
+
+func ff_int32_to_float_fmul_scalar_rvv, zve32f
+NOHWF fmv.w.x fa0, a2
+NOHWF mv a2, a3
+1:
+vsetvli t0, a2, e32, m1, ta, ma
+vle32.v v24, (a1)
[FFmpeg-cvslog] lavc/audiodsp: RISC-V V vector_clipf
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:41 2022 +0300| [f127a5d29d7aee99cb4dd4d576d375c678b3c388] | committer:
Lynne
lavc/audiodsp: RISC-V V vector_clipf
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f127a5d29d7aee99cb4dd4d576d375c678b3c388
---
libavcodec/riscv/audiodsp_init.c | 3 +++
libavcodec/riscv/audiodsp_rvv.S | 17 +
2 files changed, 20 insertions(+)
diff --git a/libavcodec/riscv/audiodsp_init.c b/libavcodec/riscv/audiodsp_init.c
index ac06848a82..9c9265531d 100644
--- a/libavcodec/riscv/audiodsp_init.c
+++ b/libavcodec/riscv/audiodsp_init.c
@@ -28,6 +28,7 @@ void ff_vector_clipf_rvf(float *dst, const float *src, int
len, float min, float
void ff_vector_clip_int32_rvv(int32_t *dst, const int32_t *src, int32_t min,
int32_t max, unsigned int len);
+void ff_vector_clipf_rvv(float *dst, const float *src, int len, float min,
float max);
av_cold void ff_audiodsp_init_riscv(AudioDSPContext *c)
{
@@ -38,5 +39,7 @@ av_cold void ff_audiodsp_init_riscv(AudioDSPContext *c)
#if HAVE_RVV
if (flags & AV_CPU_FLAG_RVV_I32)
c->vector_clip_int32 = ff_vector_clip_int32_rvv;
+if (flags & AV_CPU_FLAG_RVV_F32)
+c->vector_clipf = ff_vector_clipf_rvv;
#endif
}
diff --git a/libavcodec/riscv/audiodsp_rvv.S b/libavcodec/riscv/audiodsp_rvv.S
index 49546ee3c4..427b424cb9 100644
--- a/libavcodec/riscv/audiodsp_rvv.S
+++ b/libavcodec/riscv/audiodsp_rvv.S
@@ -34,3 +34,20 @@ func ff_vector_clip_int32_rvv, zve32x
ret
endfunc
+
+func ff_vector_clipf_rvv, zve32f
+NOHWF fmv.w.x fa0, a3
+NOHWF fmv.w.x fa1, a4
+1:
+vsetvli t0, a2, e32, m1, ta, ma
+vle32.v v8, (a1)
+sub a2, a2, t0
+vfmax.vf v8, v8, fa0
+sh2add a1, t0, a1
+vfmin.vf v8, v8, fa1
+vse32.v v8, (a0)
+sh2add a0, t0, a0
+bnez a2, 1b
+
+ret
+endfunc
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavc/fmtconvert: RISC-V V int32_to_float_fmul_array8
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:44 2022 +0300| [220dfd0945ee8481d8cdbf713f515a94ceee9992] | committer:
Lynne
lavc/fmtconvert: RISC-V V int32_to_float_fmul_array8
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=220dfd0945ee8481d8cdbf713f515a94ceee9992
---
libavcodec/riscv/fmtconvert_init.c | 7 ++-
libavcodec/riscv/fmtconvert_rvv.S | 28
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/libavcodec/riscv/fmtconvert_init.c
b/libavcodec/riscv/fmtconvert_init.c
index b2c240c1ce..fd1a8e0ca1 100644
--- a/libavcodec/riscv/fmtconvert_init.c
+++ b/libavcodec/riscv/fmtconvert_init.c
@@ -27,13 +27,18 @@
void ff_int32_to_float_fmul_scalar_rvv(float *dst, const int32_t *src,
float mul, int len);
+void ff_int32_to_float_fmul_array8_rvv(FmtConvertContext *c, float *dst,
+ const int32_t *src, const float *mul,
+ int len);
av_cold void ff_fmt_convert_init_riscv(FmtConvertContext *c)
{
#ifdef HAVE_RVV
int flags = av_get_cpu_flags();
-if (flags & AV_CPU_FLAG_RVV_F32)
+if (flags & AV_CPU_FLAG_RVV_F32) {
c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_rvv;
+c->int32_to_float_fmul_array8 = ff_int32_to_float_fmul_array8_rvv;
+}
#endif
}
diff --git a/libavcodec/riscv/fmtconvert_rvv.S
b/libavcodec/riscv/fmtconvert_rvv.S
index b7c78831a0..c79f80cc47 100644
--- a/libavcodec/riscv/fmtconvert_rvv.S
+++ b/libavcodec/riscv/fmtconvert_rvv.S
@@ -37,3 +37,31 @@ NOHWF mv a2, a3
ret
endfunc
+
+func ff_int32_to_float_fmul_array8_rvv, zve32f
+sraia4, a4, 3
+
+1: vsetvli t0, a4, e32, m1, ta, ma
+vle32.v v24, (a3)
+sllit2, t0, 2 + 3
+vlseg8e32.v v16, (a2)
+vsetvli t3, zero, e32, m8, ta, ma
+vfcvt.f.x.v v16, v16
+vsetvli zero, a4, e32, m1, ta, ma
+vfmul.vvv16, v16, v24
+sub a4, a4, t0
+vfmul.vvv17, v17, v24
+sh2add a3, t0, a3
+vfmul.vvv18, v18, v24
+add a2, a2, t2
+vfmul.vvv19, v19, v24
+vfmul.vvv20, v20, v24
+vfmul.vvv21, v21, v24
+vfmul.vvv22, v22, v24
+vfmul.vvv23, v23, v24
+vsseg8e32.v v16, (a1)
+add a1, a1, t2
+bneza4, 1b
+
+ret
+endfunc
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavc/vorbisdsp: RISC-V V inverse_coupling
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:45 2022 +0300| [453aba71e6db37d367269cc080dae4c1548db33a] | committer:
Lynne
lavc/vorbisdsp: RISC-V V inverse_coupling
This uses the following vectorisation:
for (i = 0; i < blocksize; i++) {
ang[i] = mag[i] - copysignf(fmaxf(ang[i], 0.f), mag[i]);
mag[i] = mag[i] - copysignf(fminf(ang[i], 0.f), mag[i]);
}
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=453aba71e6db37d367269cc080dae4c1548db33a
---
libavcodec/riscv/Makefile | 2 ++
libavcodec/riscv/vorbisdsp_init.c | 37
libavcodec/riscv/vorbisdsp_rvv.S | 44 +++
libavcodec/vorbisdsp.c| 2 ++
libavcodec/vorbisdsp.h| 1 +
5 files changed, 86 insertions(+)
diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile
index 682174e875..03a95301d7 100644
--- a/libavcodec/riscv/Makefile
+++ b/libavcodec/riscv/Makefile
@@ -5,3 +5,5 @@ OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_init.o
RVV-OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_rvv.o
OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_init.o \
riscv/pixblockdsp_rvi.o
+OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_init.o
+RVV-OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_rvv.o
diff --git a/libavcodec/riscv/vorbisdsp_init.c
b/libavcodec/riscv/vorbisdsp_init.c
new file mode 100644
index 00..0c56ffcb9b
--- /dev/null
+++ b/libavcodec/riscv/vorbisdsp_init.c
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2022 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/vorbisdsp.h"
+
+void ff_vorbis_inverse_coupling_rvv(float *mag, float *ang,
+ptrdiff_t blocksize);
+
+av_cold void ff_vorbisdsp_init_riscv(VorbisDSPContext *c)
+{
+#if HAVE_RVV
+int flags = av_get_cpu_flags();
+
+if (flags & AV_CPU_FLAG_RVV_I32)
+c->vorbis_inverse_coupling = ff_vorbis_inverse_coupling_rvv;
+#endif
+}
diff --git a/libavcodec/riscv/vorbisdsp_rvv.S b/libavcodec/riscv/vorbisdsp_rvv.S
new file mode 100644
index 00..e8953fb548
--- /dev/null
+++ b/libavcodec/riscv/vorbisdsp_rvv.S
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2022 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/riscv/asm.S"
+
+func ff_vorbis_inverse_coupling_rvv, zve32f
+fmv.w.x ft0, zero
+1:
+vsetvli t0, a2, e32, m1, ta, ma
+vle32.v v16, (a1)
+sub a2, a2, t0
+vle32.v v24, (a0)
+vfmax.vf v8, v16, ft0
+vfmin.vf v16, v16, ft0
+vfsgnj.vv v8, v8, v24
+vfsgnj.vv v16, v16, v24
+vfsub.vv v8, v24, v8
+vfsub.vv v24, v24, v16
+vse32.v v8, (a1)
+sh2adda1, t0, a1
+vse32.v v24, (a0)
+sh2adda0, t0, a0
+bnez a2, 1b
+
+ret
+endfunc
diff --git a/libavcodec/vorbisdsp.c b/libavcodec/vorbisdsp.c
index 693c44dfcb..70022bd262 100644
--- a/libavcodec/vorbisdsp.c
+++ b/libavcodec/vorbisdsp.c
@@ -53,6 +53,8 @@ av_cold void ff_vorbisdsp_init(VorbisDSPContext *dsp)
ff_vorbisdsp_init_arm(dsp);
#elif ARCH_PPC
ff_vorbisdsp_init_ppc(dsp);
+#elif ARCH_RISCV
+ff_vorbisdsp_init_riscv(dsp);
#elif ARCH_X86
ff_vorbisdsp_init_x86(dsp);
#endif
diff --git a/libavcodec/vorbisdsp.h b/libavcodec/vorbisdsp.h
i
[FFmpeg-cvslog] lavc/aacpsdsp: RISC-V V add_squares
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:46 2022 +0300| [b0cacf4c3f8fe451e22a43462ea68ffa1e2e09ec] | committer:
Lynne
lavc/aacpsdsp: RISC-V V add_squares
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b0cacf4c3f8fe451e22a43462ea68ffa1e2e09ec
---
libavcodec/aacpsdsp.h| 1 +
libavcodec/aacpsdsp_template.c | 2 ++
libavcodec/riscv/Makefile| 2 ++
libavcodec/riscv/aacpsdsp_init.c | 37 +
libavcodec/riscv/aacpsdsp_rvv.S | 37 +
5 files changed, 79 insertions(+)
diff --git a/libavcodec/aacpsdsp.h b/libavcodec/aacpsdsp.h
index 917ac5303f..8b32761bdb 100644
--- a/libavcodec/aacpsdsp.h
+++ b/libavcodec/aacpsdsp.h
@@ -55,6 +55,7 @@ void AAC_RENAME(ff_psdsp_init)(PSDSPContext *s);
void ff_psdsp_init_arm(PSDSPContext *s);
void ff_psdsp_init_aarch64(PSDSPContext *s);
void ff_psdsp_init_mips(PSDSPContext *s);
+void ff_psdsp_init_riscv(PSDSPContext *s);
void ff_psdsp_init_x86(PSDSPContext *s);
#endif /* AVCODEC_AACPSDSP_H */
diff --git a/libavcodec/aacpsdsp_template.c b/libavcodec/aacpsdsp_template.c
index e3cbf3feec..c063788b89 100644
--- a/libavcodec/aacpsdsp_template.c
+++ b/libavcodec/aacpsdsp_template.c
@@ -230,6 +230,8 @@ av_cold void AAC_RENAME(ff_psdsp_init)(PSDSPContext *s)
ff_psdsp_init_aarch64(s);
#elif ARCH_MIPS
ff_psdsp_init_mips(s);
+#elif ARCH_RISCV
+ff_psdsp_init_riscv(s);
#elif ARCH_X86
ff_psdsp_init_x86(s);
#endif
diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile
index 03a95301d7..829a1823d2 100644
--- a/libavcodec/riscv/Makefile
+++ b/libavcodec/riscv/Makefile
@@ -1,3 +1,5 @@
+OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_init.o
+RVV-OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_rvv.o
OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_init.o \
riscv/audiodsp_rvf.o
RVV-OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_rvv.o
diff --git a/libavcodec/riscv/aacpsdsp_init.c b/libavcodec/riscv/aacpsdsp_init.c
new file mode 100644
index 00..83f6d9b16b
--- /dev/null
+++ b/libavcodec/riscv/aacpsdsp_init.c
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2022 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/aacpsdsp.h"
+
+void ff_ps_add_squares_rvv(float *dst, const float (*src)[2], int n);
+
+av_cold void ff_psdsp_init_riscv(PSDSPContext *c)
+{
+#if HAVE_RVV
+int flags = av_get_cpu_flags();
+
+if (flags & AV_CPU_FLAG_RVV_F32)
+c->add_squares = ff_ps_add_squares_rvv;
+#endif
+}
diff --git a/libavcodec/riscv/aacpsdsp_rvv.S b/libavcodec/riscv/aacpsdsp_rvv.S
new file mode 100644
index 00..b516063ea7
--- /dev/null
+++ b/libavcodec/riscv/aacpsdsp_rvv.S
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2022 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_ps_add_squares_rvv, zve32f
+1:
+vsetvli t0, a2, e32, m1, ta, ma
+vlseg2e32.v v24, (a1)
+sub a2, a2, t0
+vle32.v v16, (a0)
+sh3add a1, t0, a1
+vfmacc.vv v16, v24, v24
+vfmacc.vv v16, v25, v25
+vse32.v v16, (a0)
+sh2add a0, t0, a0
+bneza2, 1b
+
+ret
+endfunc
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To
[FFmpeg-cvslog] lavc/aacpsdsp: RISC-V V mul_pair_single
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:47 2022 +0300| [e180326a0b72bbbdee51810592b16178a48797f3] | committer:
Lynne
lavc/aacpsdsp: RISC-V V mul_pair_single
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e180326a0b72bbbdee51810592b16178a48797f3
---
libavcodec/riscv/aacpsdsp_init.c | 6 +-
libavcodec/riscv/aacpsdsp_rvv.S | 17 +
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/libavcodec/riscv/aacpsdsp_init.c b/libavcodec/riscv/aacpsdsp_init.c
index 83f6d9b16b..21fd5b8470 100644
--- a/libavcodec/riscv/aacpsdsp_init.c
+++ b/libavcodec/riscv/aacpsdsp_init.c
@@ -25,13 +25,17 @@
#include "libavcodec/aacpsdsp.h"
void ff_ps_add_squares_rvv(float *dst, const float (*src)[2], int n);
+void ff_ps_mul_pair_single_rvv(float (*dst)[2], float (*src0)[2], float *src1,
+ int n);
av_cold void ff_psdsp_init_riscv(PSDSPContext *c)
{
#if HAVE_RVV
int flags = av_get_cpu_flags();
-if (flags & AV_CPU_FLAG_RVV_F32)
+if (flags & AV_CPU_FLAG_RVV_F32) {
c->add_squares = ff_ps_add_squares_rvv;
+c->mul_pair_single = ff_ps_mul_pair_single_rvv;
+}
#endif
}
diff --git a/libavcodec/riscv/aacpsdsp_rvv.S b/libavcodec/riscv/aacpsdsp_rvv.S
index b516063ea7..70b7b72218 100644
--- a/libavcodec/riscv/aacpsdsp_rvv.S
+++ b/libavcodec/riscv/aacpsdsp_rvv.S
@@ -35,3 +35,20 @@ func ff_ps_add_squares_rvv, zve32f
ret
endfunc
+
+func ff_ps_mul_pair_single_rvv, zve32f
+1:
+vsetvli t0, a3, e32, m1, ta, ma
+vlseg2e32.v v24, (a1)
+sub a3, a3, t0
+vle32.v v16, (a2)
+sh3add a1, t0, a1
+vfmul.vvv24, v24, v16
+sh2add a2, t0, a2
+vfmul.vvv25, v25, v16
+vsseg2e32.v v24, (a0)
+sh3add a0, t0, a0
+bneza3, 1b
+
+ret
+endfunc
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavc/audiodsp: RISC-V V scalarproduct_int16
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:42 2022 +0300| [f41ae62f39ad1f91a3817325fdbba7304aba4641] | committer:
Lynne
lavc/audiodsp: RISC-V V scalarproduct_int16
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f41ae62f39ad1f91a3817325fdbba7304aba4641
---
libavcodec/riscv/audiodsp_init.c | 5 -
libavcodec/riscv/audiodsp_rvv.S | 19 +++
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/libavcodec/riscv/audiodsp_init.c b/libavcodec/riscv/audiodsp_init.c
index 9c9265531d..32c3c6794d 100644
--- a/libavcodec/riscv/audiodsp_init.c
+++ b/libavcodec/riscv/audiodsp_init.c
@@ -26,6 +26,7 @@
void ff_vector_clipf_rvf(float *dst, const float *src, int len, float min,
float max);
+int32_t ff_scalarproduct_int16_rvv(const int16_t *v1, const int16_t *v2, int
len);
void ff_vector_clip_int32_rvv(int32_t *dst, const int32_t *src, int32_t min,
int32_t max, unsigned int len);
void ff_vector_clipf_rvv(float *dst, const float *src, int len, float min,
float max);
@@ -37,8 +38,10 @@ av_cold void ff_audiodsp_init_riscv(AudioDSPContext *c)
if (flags & AV_CPU_FLAG_RVF)
c->vector_clipf = ff_vector_clipf_rvf;
#if HAVE_RVV
-if (flags & AV_CPU_FLAG_RVV_I32)
+if (flags & AV_CPU_FLAG_RVV_I32) {
+c->scalarproduct_int16 = ff_scalarproduct_int16_rvv;
c->vector_clip_int32 = ff_vector_clip_int32_rvv;
+}
if (flags & AV_CPU_FLAG_RVV_F32)
c->vector_clipf = ff_vector_clipf_rvv;
#endif
diff --git a/libavcodec/riscv/audiodsp_rvv.S b/libavcodec/riscv/audiodsp_rvv.S
index 427b424cb9..f4308f27c5 100644
--- a/libavcodec/riscv/audiodsp_rvv.S
+++ b/libavcodec/riscv/audiodsp_rvv.S
@@ -20,6 +20,25 @@
#include "libavutil/riscv/asm.S"
+func ff_scalarproduct_int16_rvv, zve32x
+vsetvli zero, zero, e16, m1, ta, ma
+vmv.s.x v8, zero
+1:
+vsetvli t0, a2, e16, m1, ta, ma
+vle16.v v16, (a0)
+sub a2, a2, t0
+vle16.v v24, (a1)
+sh1add a0, t0, a0
+vwmul.vvv0, v16, v24
+sh1add a1, t0, a1
+vsetvli zero, t0, e32, m2, ta, ma
+vredsum.vs v8, v0, v8
+bneza2, 1b
+
+vmv.x.s a0, v8
+ret
+endfunc
+
func ff_vector_clip_int32_rvv, zve32x
1:
vsetvli t0, a4, e32, m1, ta, ma
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavc/aacpsdsp: RISC-V V hybrid_analysis
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:48 2022 +0300| [15c3a0bd6ec1383e26ca6a41ea8daa95dc0e1736] | committer:
Lynne
lavc/aacpsdsp: RISC-V V hybrid_analysis
This starts with one-time initialisation of the 26 constant factors
like 08edacc248bce3f8946d75e97188d189c74a6de6. That is done with
the scalar instruction set. While the formula can readily be vectored,
the gains would (probably) be more than lost in transfering the results
back to FP registers (or suitably reshuffling them into vector
registers).
Note that the main loop could likely be scheduled sligthly better by
expanding the filter macro and interleaving loads with arithmetic.
It is not clear yet if that would be relevant for vector processing (as
opposed to traditional SIMD).
We could also use fewer vectors, but there is not much point in sparing
them (they are *all* callee-clobbered).
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15c3a0bd6ec1383e26ca6a41ea8daa95dc0e1736
---
libavcodec/riscv/aacpsdsp_init.c | 3 ++
libavcodec/riscv/aacpsdsp_rvv.S | 97
2 files changed, 100 insertions(+)
diff --git a/libavcodec/riscv/aacpsdsp_init.c b/libavcodec/riscv/aacpsdsp_init.c
index 21fd5b8470..09f16f1041 100644
--- a/libavcodec/riscv/aacpsdsp_init.c
+++ b/libavcodec/riscv/aacpsdsp_init.c
@@ -27,6 +27,8 @@
void ff_ps_add_squares_rvv(float *dst, const float (*src)[2], int n);
void ff_ps_mul_pair_single_rvv(float (*dst)[2], float (*src0)[2], float *src1,
int n);
+void ff_ps_hybrid_analysis_rvv(float (*out)[2], float (*in)[2],
+ const float (*filter)[8][2], ptrdiff_t, int n);
av_cold void ff_psdsp_init_riscv(PSDSPContext *c)
{
@@ -36,6 +38,7 @@ av_cold void ff_psdsp_init_riscv(PSDSPContext *c)
if (flags & AV_CPU_FLAG_RVV_F32) {
c->add_squares = ff_ps_add_squares_rvv;
c->mul_pair_single = ff_ps_mul_pair_single_rvv;
+c->hybrid_analysis = ff_ps_hybrid_analysis_rvv;
}
#endif
}
diff --git a/libavcodec/riscv/aacpsdsp_rvv.S b/libavcodec/riscv/aacpsdsp_rvv.S
index 70b7b72218..65e5e0be4f 100644
--- a/libavcodec/riscv/aacpsdsp_rvv.S
+++ b/libavcodec/riscv/aacpsdsp_rvv.S
@@ -52,3 +52,100 @@ func ff_ps_mul_pair_single_rvv, zve32f
ret
endfunc
+
+func ff_ps_hybrid_analysis_rvv, zve32f
+/* We need 26 FP registers, for 20 scratch ones. Spill fs0-fs5. */
+addisp, sp, -32
+.irp n, 0, 1, 2, 3, 4, 5
+fsw fs\n, (4 * \n)(sp)
+.endr
+
+.macro input, j, fd0, fd1, fd2, fd3
+flw \fd0, (4 * ((\j * 2) + 0))(a1)
+flw fs4, (4 * (((12 - \j) * 2) + 0))(a1)
+flw \fd1, (4 * ((\j * 2) + 1))(a1)
+fsub.s \fd3, \fd0, fs4
+flw fs5, (4 * (((12 - \j) * 2) + 1))(a1)
+fadd.s \fd2, \fd1, fs5
+fadd.s \fd0, \fd0, fs4
+fsub.s \fd1, \fd1, fs5
+.endm
+
+// re0, re1, im0, im1
+input 0, ft0, ft1, ft2, ft3
+input 1, ft4, ft5, ft6, ft7
+input 2, ft8, ft9, ft10, ft11
+input 3, fa0, fa1, fa2, fa3
+input 4, fa4, fa5, fa6, fa7
+input 5, fs0, fs1, fs2, fs3
+flw fs4, (4 * ((6 * 2) + 0))(a1)
+flw fs5, (4 * ((6 * 2) + 1))(a1)
+
+adda2, a2, 6 * 2 * 4 // point to filter[i][6][0]
+li t4, 8 * 2 * 4 // filter byte stride
+slli a3, a3, 3 // output byte stride
+1:
+.macro filter, vs0, vs1, fo0, fo1, fo2, fo3
+vfmacc.vf v8, \fo0, \vs0
+vfmacc.vf v9, \fo2, \vs0
+vfnmsac.vf v8, \fo1, \vs1
+vfmacc.vf v9, \fo3, \vs1
+.endm
+
+vsetvlit0, a4, e32, m1, ta, ma
+/*
+ * The filter (a2) has 16 segments, of which 13 need to be extracted.
+ * R-V V supports only up to 8 segments, so unrolling is unavoidable.
+ */
+addi t1, a2, -48
+vlse32.v v22, (a2), t4
+addi t2, a2, -44
+vlse32.v v16, (t1), t4
+addi t1, a2, -40
+vfmul.vf v8, v22, fs4
+vlse32.v v24, (t2), t4
+addi t2, a2, -36
+vfmul.vf v9, v22, fs5
+vlse32.v v17, (t1), t4
+addi t1, a2, -32
+vlse32.v v25, (t2), t4
+addi t2, a2, -28
+filter v16, v24, ft0, ft1, ft2, ft3
+vlse32.v v18, (t1), t4
+addi t1, a2, -24
+vlse32.v v26, (t2), t4
+addi t2, a2, -20
+filter v17, v25, ft4, ft5, ft6, ft7
+vlse32.v v19, (t1), t4
+addi t1, a2, -16
+vlse32.v v27, (t2), t4
+addi t2, a2, -12
+filter v18, v26, ft8, ft9, ft10, ft11
+vlse32.v v20, (t1), t4
+addi t1, a2, -8
+vlse32.v v28, (t2), t4
+addi t2, a2, -4
+filter v19, v27, fa0, fa1, fa2, fa3
+vlse32.v v21, (t1), t4
+
[FFmpeg-cvslog] lavc/aacpsdsp: RISC-V V hybrid_synthesis_deint
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:50 2022 +0300| [a15edb0bc0108362fa3c71de3bf763072341b8b0] | committer:
Lynne
lavc/aacpsdsp: RISC-V V hybrid_synthesis_deint
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a15edb0bc0108362fa3c71de3bf763072341b8b0
---
libavcodec/riscv/aacpsdsp_init.c | 6 +-
libavcodec/riscv/aacpsdsp_rvv.S | 35 +++
2 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/libavcodec/riscv/aacpsdsp_init.c b/libavcodec/riscv/aacpsdsp_init.c
index 1d36f89f6e..c2201ffb6a 100644
--- a/libavcodec/riscv/aacpsdsp_init.c
+++ b/libavcodec/riscv/aacpsdsp_init.c
@@ -31,6 +31,8 @@ void ff_ps_hybrid_analysis_rvv(float (*out)[2], float
(*in)[2],
const float (*filter)[8][2], ptrdiff_t, int n);
void ff_ps_hybrid_analysis_ileave_rvv(float (*out)[32][2], float L[2][38][64],
int i, int len);
+void ff_ps_hybrid_synthesis_deint_rvv(float out[2][38][64], float (*in)[32][2],
+ int i, int len);
av_cold void ff_psdsp_init_riscv(PSDSPContext *c)
{
@@ -43,7 +45,9 @@ av_cold void ff_psdsp_init_riscv(PSDSPContext *c)
c->hybrid_analysis = ff_ps_hybrid_analysis_rvv;
}
-if (flags & AV_CPU_FLAG_RVV_I32)
+if (flags & AV_CPU_FLAG_RVV_I32) {
c->hybrid_analysis_ileave = ff_ps_hybrid_analysis_ileave_rvv;
+c->hybrid_synthesis_deint = ff_ps_hybrid_synthesis_deint_rvv;
+}
#endif
}
diff --git a/libavcodec/riscv/aacpsdsp_rvv.S b/libavcodec/riscv/aacpsdsp_rvv.S
index c9cc15e73d..0cbe4c1d3c 100644
--- a/libavcodec/riscv/aacpsdsp_rvv.S
+++ b/libavcodec/riscv/aacpsdsp_rvv.S
@@ -184,3 +184,38 @@ func ff_ps_hybrid_analysis_ileave_rvv, zve32x /* no needs
for zve32f here */
3:
ret
endfunc
+
+func ff_ps_hybrid_synthesis_deint_rvv, zve32x
+sllit1, a2, 5 + 1 + 2
+sh2add a0, a2, a0
+add a1, a1, t1
+addia2, a2, -64
+li t1, 38 * 64 * 4
+li t6, 64 * 4
+add a4, a0, t1
+beqza2, 3f
+1:
+mv t0, a0
+mv t1, a1
+mv t3, a3
+mv t4, a4
+addia2, a2, 1
+2:
+vsetvli t5, t3, e32, m1, ta, ma
+vlseg2e32.v v16, (t1)
+sub t3, t3, t5
+vsse32.vv16, (t0), t6
+mul t2, t5, t6
+vsse32.vv17, (t4), t6
+sh3add t1, t5, t1
+add t0, t0, t2
+add t4, t4, t2
+bnezt3, 2b
+
+add a0, a0, 4
+add a1, a1, 32 * 2 * 4
+add a4, a4, 4
+bneza2, 1b
+3:
+ret
+endfunc
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavc/aacpsdsp: RISC-V V stereo_interpolate[0]
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:51 2022 +0300| [c03f9654c997b33b8028eb71c9e7ba61fd53a813] | committer:
Lynne
lavc/aacpsdsp: RISC-V V stereo_interpolate[0]
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c03f9654c997b33b8028eb71c9e7ba61fd53a813
---
libavcodec/riscv/aacpsdsp_init.c | 4 +++
libavcodec/riscv/aacpsdsp_rvv.S | 56
2 files changed, 60 insertions(+)
diff --git a/libavcodec/riscv/aacpsdsp_init.c b/libavcodec/riscv/aacpsdsp_init.c
index c2201ffb6a..f42baf4251 100644
--- a/libavcodec/riscv/aacpsdsp_init.c
+++ b/libavcodec/riscv/aacpsdsp_init.c
@@ -34,6 +34,9 @@ void ff_ps_hybrid_analysis_ileave_rvv(float (*out)[32][2],
float L[2][38][64],
void ff_ps_hybrid_synthesis_deint_rvv(float out[2][38][64], float (*in)[32][2],
int i, int len);
+void ff_ps_stereo_interpolate_rvv(float (*l)[2], float (*r)[2],
+ float h[2][4], float h_step[2][4], int len);
+
av_cold void ff_psdsp_init_riscv(PSDSPContext *c)
{
#if HAVE_RVV
@@ -43,6 +46,7 @@ av_cold void ff_psdsp_init_riscv(PSDSPContext *c)
c->add_squares = ff_ps_add_squares_rvv;
c->mul_pair_single = ff_ps_mul_pair_single_rvv;
c->hybrid_analysis = ff_ps_hybrid_analysis_rvv;
+c->stereo_interpolate[0] = ff_ps_stereo_interpolate_rvv;
}
if (flags & AV_CPU_FLAG_RVV_I32) {
diff --git a/libavcodec/riscv/aacpsdsp_rvv.S b/libavcodec/riscv/aacpsdsp_rvv.S
index 0cbe4c1d3c..1d6e73fd2d 100644
--- a/libavcodec/riscv/aacpsdsp_rvv.S
+++ b/libavcodec/riscv/aacpsdsp_rvv.S
@@ -219,3 +219,59 @@ func ff_ps_hybrid_synthesis_deint_rvv, zve32x
3:
ret
endfunc
+
+func ff_ps_stereo_interpolate_rvv, zve32f
+vsetvli t0, zero, e32, m1, ta, ma
+vid.vv24
+flw ft0, (a2)
+vadd.vi v24, v24, 1 // v24[i] = i + 1
+flw ft1, 4(a2)
+vfcvt.f.xu.v v24, v24
+flw ft2, 8(a2)
+vfmv.v.f v16, ft0
+flw ft3, 12(a2)
+vfmv.v.f v17, ft1
+flw ft0, (a3)
+vfmv.v.f v18, ft2
+flw ft1, 4(a3)
+vfmv.v.f v19, ft3
+flw ft2, 8(a3)
+vfmv.v.f v20, ft0
+flw ft3, 12(a3)
+vfmv.v.f v21, ft1
+fcvt.s.wuft4, t0 // (float)(vlenb / sizeof (float))
+vfmv.v.f v22, ft2
+fmul.s ft0, ft0, ft4
+vfmv.v.f v23, ft3
+fmul.s ft1, ft1, ft4
+vfmacc.vvv16, v24, v20 // h0 += (i + 1) * h0_step
+fmul.s ft2, ft2, ft4
+vfmacc.vvv17, v24, v21
+fmul.s ft3, ft3, ft4
+vfmacc.vvv18, v24, v22
+vfmacc.vvv19, v24, v23
+1:
+vsetvli t0, a4, e32, m1, ta, ma
+vlseg2e32.v v8, (a0) // v8:l_re, v9:l_im
+sub a4, a4, t0
+vlseg2e32.v v10, (a1)// v10:r_re, v11:r_im
+vfmul.vv v12, v8, v16
+vfmul.vv v13, v9, v16
+vfmul.vv v14, v8, v17
+vfmul.vv v15, v9, v17
+vfmacc.vv v12, v10, v18
+vfmacc.vv v13, v11, v18
+vfmacc.vv v14, v10, v19
+vfmacc.vv v15, v11, v19
+vsseg2e32.v v12, (a0)
+sh3adda0, t0, a0
+vsseg2e32.v v14, (a1)
+sh3adda1, t0, a1
+vfadd.vf v16, v16, ft0 // h0 += (vlenb / sizeof (float)) * h0_step
+vfadd.vf v17, v17, ft1
+vfadd.vf v18, v18, ft2
+vfadd.vf v19, v19, ft3
+bnez a4, 1b
+
+ret
+endfunc
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavc/aacpsdsp: RISC-V V hybrid_analysis_ileave
ffmpeg | branch: master | Rémi Denis-Courmont | Mon Sep 26
17:52:49 2022 +0300| [09f907999f6ff4204d5848e5fd01e1143cb76d9c] | committer:
Lynne
lavc/aacpsdsp: RISC-V V hybrid_analysis_ileave
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=09f907999f6ff4204d5848e5fd01e1143cb76d9c
---
libavcodec/riscv/aacpsdsp_init.c | 5 +
libavcodec/riscv/aacpsdsp_rvv.S | 35 +++
2 files changed, 40 insertions(+)
diff --git a/libavcodec/riscv/aacpsdsp_init.c b/libavcodec/riscv/aacpsdsp_init.c
index 09f16f1041..1d36f89f6e 100644
--- a/libavcodec/riscv/aacpsdsp_init.c
+++ b/libavcodec/riscv/aacpsdsp_init.c
@@ -29,6 +29,8 @@ void ff_ps_mul_pair_single_rvv(float (*dst)[2], float
(*src0)[2], float *src1,
int n);
void ff_ps_hybrid_analysis_rvv(float (*out)[2], float (*in)[2],
const float (*filter)[8][2], ptrdiff_t, int n);
+void ff_ps_hybrid_analysis_ileave_rvv(float (*out)[32][2], float L[2][38][64],
+ int i, int len);
av_cold void ff_psdsp_init_riscv(PSDSPContext *c)
{
@@ -40,5 +42,8 @@ av_cold void ff_psdsp_init_riscv(PSDSPContext *c)
c->mul_pair_single = ff_ps_mul_pair_single_rvv;
c->hybrid_analysis = ff_ps_hybrid_analysis_rvv;
}
+
+if (flags & AV_CPU_FLAG_RVV_I32)
+c->hybrid_analysis_ileave = ff_ps_hybrid_analysis_ileave_rvv;
#endif
}
diff --git a/libavcodec/riscv/aacpsdsp_rvv.S b/libavcodec/riscv/aacpsdsp_rvv.S
index 65e5e0be4f..c9cc15e73d 100644
--- a/libavcodec/riscv/aacpsdsp_rvv.S
+++ b/libavcodec/riscv/aacpsdsp_rvv.S
@@ -149,3 +149,38 @@ func ff_ps_hybrid_analysis_rvv, zve32f
.purgem input
.purgem filter
endfunc
+
+func ff_ps_hybrid_analysis_ileave_rvv, zve32x /* no needs for zve32f here */
+sllit0, a2, 5 + 1 + 2 // ctz(32 * 2 * 4)
+sh2add a1, a2, a1
+add a0, a0, t0
+addia2, a2, -64
+li t1, 38 * 64 * 4
+li t6, 64 * 4 // (uint8_t *)L[x][j+1][i] - L[x][j][i]
+add a4, a1, t1 // &L[1]
+beqza2, 3f
+1:
+mv t0, a0
+mv t1, a1
+mv t3, a3
+mv t4, a4
+addia2, a2, 1
+2:
+vsetvli t5, t3, e32, m1, ta, ma
+vlse32.vv16, (t1), t6
+sub t3, t3, t5
+vlse32.vv17, (t4), t6
+mul t2, t5, t6
+vsseg2e32.v v16, (t0)
+sh3add t0, t5, t0
+add t1, t1, t2
+add t4, t4, t2
+bnezt3, 2b
+
+add a0, a0, 32 * 2 * 4
+add a1, a1, 4
+add a4, a4, 4
+bneza2, 1b
+3:
+ret
+endfunc
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] ffprobe: Check for invalid matrix error when printing rotation
ffmpeg | branch: master | Derek Buitenhuis | Thu
Sep 22 14:11:31 2022 +0100| [f5cd00bf5265cb1d10de925c4d0b3ebb191f0d74] |
committer: Derek Buitenhuis
ffprobe: Check for invalid matrix error when printing rotation
av_display_rotation_get will return NAN when the display matrix is invalid,
which would end up printing NAN as an integer in the rotation field. This
is poor for multiple reasons:
* Users of ffprobe have no way of discerning "valid but ugly rotation from
display matrix" from "invalid display matrix".
* It can have unintended consequences on some platforms, such as Linux x86_64,
where NAN is equal to INT64_MIN, which, for example, when printed as JSON,
which uses floating point for all numbers, can end up as invalid JSON or wit
a number that cannot be reserialized as an integer at all.
Since NAN is av_display_rotation_get's error case, just print 0 (no rotation)
when that happens.
Signed-off-by: Derek Buitenhuis
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f5cd00bf5265cb1d10de925c4d0b3ebb191f0d74
---
fftools/ffprobe.c | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
index 8ee1b1036c..421ada5bd8 100644
--- a/fftools/ffprobe.c
+++ b/fftools/ffprobe.c
@@ -27,6 +27,7 @@
#include "libavutil/ffversion.h"
#include
+#include
#include "libavformat/avformat.h"
#include "libavformat/version.h"
@@ -2282,8 +2283,11 @@ static void print_pkt_side_data(WriterContext *w,
writer_print_section_header(w, id_data);
print_str("side_data_type", name ? name : "unknown");
if (sd->type == AV_PKT_DATA_DISPLAYMATRIX && sd->size >= 9*4) {
+double rotation = av_display_rotation_get((int32_t *)sd->data);
+if (isnan(rotation))
+rotation = 0;
writer_print_integers(w, "displaymatrix", sd->data, 9, " %11d", 3,
4, 1);
-print_int("rotation", av_display_rotation_get((int32_t
*)sd->data));
+print_int("rotation", rotation);
} else if (sd->type == AV_PKT_DATA_STEREO3D) {
const AVStereo3D *stereo = (AVStereo3D *)sd->data;
print_str("type", av_stereo3d_type_name(stereo->type));
@@ -2639,8 +2643,11 @@ static void show_frame(WriterContext *w, AVFrame *frame,
AVStream *stream,
name = av_frame_side_data_name(sd->type);
print_str("side_data_type", name ? name : "unknown");
if (sd->type == AV_FRAME_DATA_DISPLAYMATRIX && sd->size >= 9*4) {
+double rotation = av_display_rotation_get((int32_t *)sd->data);
+if (isnan(rotation))
+rotation = 0;
writer_print_integers(w, "displaymatrix", sd->data, 9, "
%11d", 3, 4, 1);
-print_int("rotation", av_display_rotation_get((int32_t
*)sd->data));
+print_int("rotation", rotation);
} else if (sd->type == AV_FRAME_DATA_AFD && sd->size > 0) {
print_int("active_format", *sd->data);
} else if (sd->type == AV_FRAME_DATA_GOP_TIMECODE && sd->size >=
8) {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/vf_extractplanes: add missing break; statement
ffmpeg | branch: master | Timo Rothenpieler | Tue Sep
27 19:35:37 2022 +0200| [59cb0bd23d61f6ea3bfd86558346e2720aba7f06] | committer:
Timo Rothenpieler
avfilter/vf_extractplanes: add missing break; statement
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=59cb0bd23d61f6ea3bfd86558346e2720aba7f06
---
libavfilter/vf_extractplanes.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavfilter/vf_extractplanes.c b/libavfilter/vf_extractplanes.c
index 3c794eaa28..08737d6415 100644
--- a/libavfilter/vf_extractplanes.c
+++ b/libavfilter/vf_extractplanes.c
@@ -284,6 +284,7 @@ static void extract_from_packed(uint8_t *dst, int
dst_linesize,
dst[x * 2] = src[x * step + comp * 2];
dst[x * 2 + 1] = src[x * step + comp * 2 + 1];
}
+break;
case 4:
for (x = 0; x < width; x++) {
dst[x * 4] = src[x * step + comp * 4];
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avocdec/snowenc: Fix left shift of negative number
ffmpeg | branch: master | Andreas Rheinhardt |
Tue Sep 27 01:40:24 2022 +0200| [2664b39d54aa44ba185ea39c3933b80d9dfcb542] |
committer: Andreas Rheinhardt
avocdec/snowenc: Fix left shift of negative number
Fixes the vsynth(1|2|_lena)-snow-ll FATE-tests.
Reviewed-by: Michael Niedermayer
Signed-off-by: Andreas Rheinhardt
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2664b39d54aa44ba185ea39c3933b80d9dfcb542
---
libavcodec/snowenc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
index b647fc9016..c5ff50639e 100644
--- a/libavcodec/snowenc.c
+++ b/libavcodec/snowenc.c
@@ -1814,7 +1814,7 @@ redo_frame:
if(s->qlog == LOSSLESS_QLOG){
for(y=0; yspatial_idwt_buffer[y*w + x]<<=FRAC_BITS;
+s->spatial_idwt_buffer[y*w + x] *= 1 << FRAC_BITS;
}
}
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] configure: remove mdct15 from the encoder/decoder's list of requirements
ffmpeg | branch: master | Lynne | Wed Sep 28 00:07:53 2022 +0200| [0bc7ba448868f74866800f956ad7e4835b976f47] | committer: Lynne configure: remove mdct15 from the encoder/decoder's list of requirements > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0bc7ba448868f74866800f956ad7e4835b976f47 --- configure | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure b/configure index a41ebda6d4..6712d045d9 100755 --- a/configure +++ b/configure @@ -2921,8 +2921,7 @@ notchlc_decoder_select="lzf" nuv_decoder_select="idctdsp" on2avc_decoder_select="mdct" opus_decoder_deps="swresample" -opus_decoder_select="mdct15" -opus_encoder_select="audio_frame_queue mdct15" +opus_encoder_select="audio_frame_queue" png_decoder_select="inflate_wrapper" png_encoder_select="deflate_wrapper llvidencdsp" prores_decoder_select="blockdsp idctdsp" ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] format/imfdec: improve error handling when selecting tracks for playback
ffmpeg | branch: master | Pierre-Anthony Lemieux | Mon Sep
19 08:26:18 2022 -0700| [0e402ebf487075727187c78f85908a492eed3e59] | committer:
Zane van Iperen
format/imfdec: improve error handling when selecting tracks for playback
Reviewed-by: Zane van Iperen
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e402ebf487075727187c78f85908a492eed3e59
---
libavformat/imfdec.c | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c
index fde91a6419..4e60dcc4ba 100644
--- a/libavformat/imfdec.c
+++ b/libavformat/imfdec.c
@@ -686,8 +686,11 @@ static IMFVirtualTrackPlaybackCtx
*get_next_track_with_minimum_timestamp(AVForma
{
IMFContext *c = s->priv_data;
IMFVirtualTrackPlaybackCtx *track;
-
AVRational minimum_timestamp = av_make_q(INT32_MAX, 1);
+
+if (!c->track_count)
+return NULL;
+
for (uint32_t i = c->track_count; i > 0; i--) {
av_log(s, AV_LOG_TRACE, "Compare track %d timestamp " AVRATIONAL_FORMAT
" to minimum " AVRATIONAL_FORMAT
@@ -702,8 +705,6 @@ static IMFVirtualTrackPlaybackCtx
*get_next_track_with_minimum_timestamp(AVForma
}
}
-av_log(s, AV_LOG_DEBUG, "Found next track to read: %d (timestamp: %lf /
%lf)\n",
- track->index, av_q2d(track->current_timestamp),
av_q2d(minimum_timestamp));
return track;
}
@@ -766,6 +767,14 @@ static int imf_read_packet(AVFormatContext *s, AVPacket
*pkt)
track = get_next_track_with_minimum_timestamp(s);
+if (!track) {
+av_log(s, AV_LOG_ERROR, "No track found for playback\n");
+return AVERROR_INVALIDDATA;
+}
+
+av_log(s, AV_LOG_DEBUG, "Found track %d to read at timestamp %lf\n",
+ track->index, av_q2d(track->current_timestamp));
+
ret = get_resource_context_for_timestamp(s, track, &resource);
if (ret)
return ret;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
