* [FFmpeg-devel] [PATCH v4 1/5] lavc/vp9dsp: R-V V mc avg
@ 2024-05-18 18:15 uk7b
2024-05-18 18:16 ` flow gg
2024-05-21 15:23 ` Rémi Denis-Courmont
0 siblings, 2 replies; 5+ messages in thread
From: uk7b @ 2024-05-18 18:15 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: sunyuechi
From: sunyuechi <sunyuechi@iscas.ac.cn>
C908:
vp9_avg4_8bpp_c: 1.2
vp9_avg4_8bpp_rvv_i64: 1.0
vp9_avg8_8bpp_c: 3.7
vp9_avg8_8bpp_rvv_i64: 1.5
vp9_avg16_8bpp_c: 14.7
vp9_avg16_8bpp_rvv_i64: 3.5
vp9_avg32_8bpp_c: 57.7
vp9_avg32_8bpp_rvv_i64: 10.0
vp9_avg64_8bpp_c: 229.0
vp9_avg64_8bpp_rvv_i64: 31.7
---
libavcodec/riscv/Makefile | 3 +-
libavcodec/riscv/vp9_mc_rvv.S | 58 ++++++++++++++++++++++++++++++++++
libavcodec/riscv/vp9dsp_init.c | 18 +++++++++++
3 files changed, 78 insertions(+), 1 deletion(-)
create mode 100644 libavcodec/riscv/vp9_mc_rvv.S
diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile
index 27b268ae39..4739d83522 100644
--- a/libavcodec/riscv/Makefile
+++ b/libavcodec/riscv/Makefile
@@ -65,6 +65,7 @@ RVV-OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_rvv.o
OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9dsp_init.o
RV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvi.o \
riscv/vp9_mc_rvi.o
-RVV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvv.o
+RVV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvv.o \
+ riscv/vp9_mc_rvv.o
OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_init.o
RVV-OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_rvv.o
diff --git a/libavcodec/riscv/vp9_mc_rvv.S b/libavcodec/riscv/vp9_mc_rvv.S
new file mode 100644
index 0000000000..7811cd9928
--- /dev/null
+++ b/libavcodec/riscv/vp9_mc_rvv.S
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/riscv/asm.S"
+
+.macro vsetvlstatic8 len an maxlen mn=m4
+.if \len == 4
+ vsetivli zero, \len, e8, mf4, ta, ma
+.elseif \len == 8
+ vsetivli zero, \len, e8, mf2, ta, ma
+.elseif \len == 16
+ vsetivli zero, \len, e8, m1, ta, ma
+.elseif \len == 32
+ li \an, \len
+ vsetvli zero, \an, e8, m2, ta, ma
+.elseif \len == 64
+ li \an, \maxlen
+ vsetvli zero, \an, e8, \mn, ta, ma
+.endif
+.endm
+
+.macro copy_avg len
+func ff_avg\len\()_rvv, zve32x
+ csrwi vxrm, 0
+ vsetvlstatic8 \len t0 64
+1:
+ vle8.v v8, (a2)
+ vle8.v v16, (a0)
+ vaaddu.vv v8, v8, v16
+ addi a4, a4, -1
+ vse8.v v8, (a0)
+ add a2, a2, a3
+ add a0, a0, a1
+ bnez a4, 1b
+ ret
+endfunc
+.endm
+
+.irp len, 64, 32, 16, 8, 4
+ copy_avg \len
+.endr
diff --git a/libavcodec/riscv/vp9dsp_init.c b/libavcodec/riscv/vp9dsp_init.c
index ab99294d44..6bfe23563a 100644
--- a/libavcodec/riscv/vp9dsp_init.c
+++ b/libavcodec/riscv/vp9dsp_init.c
@@ -48,6 +48,24 @@ static av_cold void vp9dsp_mc_init_riscv(VP9DSPContext *dsp, int bpp)
}
# endif
+#if HAVE_RVV
+ if (bpp == 8 && (flags & AV_CPU_FLAG_RVV_I32) && ff_rv_vlen_least(128)) {
+
+#define init_fpel(idx1, sz) \
+ dsp->mc[idx1][FILTER_8TAP_SMOOTH ][1][0][0] = ff_avg##sz##_rvv; \
+ dsp->mc[idx1][FILTER_8TAP_REGULAR][1][0][0] = ff_avg##sz##_rvv; \
+ dsp->mc[idx1][FILTER_8TAP_SHARP ][1][0][0] = ff_avg##sz##_rvv; \
+ dsp->mc[idx1][FILTER_BILINEAR ][1][0][0] = ff_avg##sz##_rvv
+
+ init_fpel(0, 64);
+ init_fpel(1, 32);
+ init_fpel(2, 16);
+ init_fpel(3, 8);
+ init_fpel(4, 4);
+
+#undef init_fpel
+ }
+#endif
#endif
}
--
2.45.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH v4 1/5] lavc/vp9dsp: R-V V mc avg
2024-05-18 18:15 [FFmpeg-devel] [PATCH v4 1/5] lavc/vp9dsp: R-V V mc avg uk7b
@ 2024-05-18 18:16 ` flow gg
2024-05-21 15:23 ` Rémi Denis-Courmont
1 sibling, 0 replies; 5+ messages in thread
From: flow gg @ 2024-05-18 18:16 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Fixed issues with .irp and comma, as well as the ifc issue (same
modifications as previously done for vp8).
<uk7b@foxmail.com> 于2024年5月19日周日 02:16写道：
> From: sunyuechi <sunyuechi@iscas.ac.cn>
>
> C908:
> vp9_avg4_8bpp_c: 1.2
> vp9_avg4_8bpp_rvv_i64: 1.0
> vp9_avg8_8bpp_c: 3.7
> vp9_avg8_8bpp_rvv_i64: 1.5
> vp9_avg16_8bpp_c: 14.7
> vp9_avg16_8bpp_rvv_i64: 3.5
> vp9_avg32_8bpp_c: 57.7
> vp9_avg32_8bpp_rvv_i64: 10.0
> vp9_avg64_8bpp_c: 229.0
> vp9_avg64_8bpp_rvv_i64: 31.7
> ---
> libavcodec/riscv/Makefile | 3 +-
> libavcodec/riscv/vp9_mc_rvv.S | 58 ++++++++++++++++++++++++++++++++++
> libavcodec/riscv/vp9dsp_init.c | 18 +++++++++++
> 3 files changed, 78 insertions(+), 1 deletion(-)
> create mode 100644 libavcodec/riscv/vp9_mc_rvv.S
>
> diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile
> index 27b268ae39..4739d83522 100644
> --- a/libavcodec/riscv/Makefile
> +++ b/libavcodec/riscv/Makefile
> @@ -65,6 +65,7 @@ RVV-OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_rvv.o
> OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9dsp_init.o
> RV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvi.o \
> riscv/vp9_mc_rvi.o
> -RVV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvv.o
> +RVV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvv.o \
> + riscv/vp9_mc_rvv.o
> OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_init.o
> RVV-OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_rvv.o
> diff --git a/libavcodec/riscv/vp9_mc_rvv.S b/libavcodec/riscv/vp9_mc_rvv.S
> new file mode 100644
> index 0000000000..7811cd9928
> --- /dev/null
> +++ b/libavcodec/riscv/vp9_mc_rvv.S
> @@ -0,0 +1,58 @@
> +/*
> + * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences
> (ISCAS).
> + *
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with FFmpeg; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> 02110-1301 USA
> + */
> +
> +#include "libavutil/riscv/asm.S"
> +
> +.macro vsetvlstatic8 len an maxlen mn=m4
> +.if \len == 4
> + vsetivli zero, \len, e8, mf4, ta, ma
> +.elseif \len == 8
> + vsetivli zero, \len, e8, mf2, ta, ma
> +.elseif \len == 16
> + vsetivli zero, \len, e8, m1, ta, ma
> +.elseif \len == 32
> + li \an, \len
> + vsetvli zero, \an, e8, m2, ta, ma
> +.elseif \len == 64
> + li \an, \maxlen
> + vsetvli zero, \an, e8, \mn, ta, ma
> +.endif
> +.endm
> +
> +.macro copy_avg len
> +func ff_avg\len\()_rvv, zve32x
> + csrwi vxrm, 0
> + vsetvlstatic8 \len t0 64
> +1:
> + vle8.v v8, (a2)
> + vle8.v v16, (a0)
> + vaaddu.vv v8, v8, v16
> + addi a4, a4, -1
> + vse8.v v8, (a0)
> + add a2, a2, a3
> + add a0, a0, a1
> + bnez a4, 1b
> + ret
> +endfunc
> +.endm
> +
> +.irp len, 64, 32, 16, 8, 4
> + copy_avg \len
> +.endr
> diff --git a/libavcodec/riscv/vp9dsp_init.c
> b/libavcodec/riscv/vp9dsp_init.c
> index ab99294d44..6bfe23563a 100644
> --- a/libavcodec/riscv/vp9dsp_init.c
> +++ b/libavcodec/riscv/vp9dsp_init.c
> @@ -48,6 +48,24 @@ static av_cold void vp9dsp_mc_init_riscv(VP9DSPContext
> *dsp, int bpp)
> }
> # endif
>
> +#if HAVE_RVV
> + if (bpp == 8 && (flags & AV_CPU_FLAG_RVV_I32) &&
> ff_rv_vlen_least(128)) {
> +
> +#define init_fpel(idx1, sz) \
> + dsp->mc[idx1][FILTER_8TAP_SMOOTH ][1][0][0] = ff_avg##sz##_rvv; \
> + dsp->mc[idx1][FILTER_8TAP_REGULAR][1][0][0] = ff_avg##sz##_rvv; \
> + dsp->mc[idx1][FILTER_8TAP_SHARP ][1][0][0] = ff_avg##sz##_rvv; \
> + dsp->mc[idx1][FILTER_BILINEAR ][1][0][0] = ff_avg##sz##_rvv
> +
> + init_fpel(0, 64);
> + init_fpel(1, 32);
> + init_fpel(2, 16);
> + init_fpel(3, 8);
> + init_fpel(4, 4);
> +
> +#undef init_fpel
> + }
> +#endif
> #endif
> }
>
> --
> 2.45.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH v4 1/5] lavc/vp9dsp: R-V V mc avg
2024-05-18 18:15 [FFmpeg-devel] [PATCH v4 1/5] lavc/vp9dsp: R-V V mc avg uk7b
2024-05-18 18:16 ` flow gg
@ 2024-05-21 15:23 ` Rémi Denis-Courmont
2024-05-21 15:36 ` flow gg
1 sibling, 1 reply; 5+ messages in thread
From: Rémi Denis-Courmont @ 2024-05-21 15:23 UTC (permalink / raw)
To: ffmpeg-devel
Le lauantaina 18. toukokuuta 2024, 21.15.29 EEST uk7b@foxmail.com a écrit :
> From: sunyuechi <sunyuechi@iscas.ac.cn>
>
> C908:
> vp9_avg4_8bpp_c: 1.2
> vp9_avg4_8bpp_rvv_i64: 1.0
> vp9_avg8_8bpp_c: 3.7
> vp9_avg8_8bpp_rvv_i64: 1.5
> vp9_avg16_8bpp_c: 14.7
> vp9_avg16_8bpp_rvv_i64: 3.5
> vp9_avg32_8bpp_c: 57.7
> vp9_avg32_8bpp_rvv_i64: 10.0
> vp9_avg64_8bpp_c: 229.0
> vp9_avg64_8bpp_rvv_i64: 31.7
> ---
> libavcodec/riscv/Makefile | 3 +-
> libavcodec/riscv/vp9_mc_rvv.S | 58 ++++++++++++++++++++++++++++++++++
> libavcodec/riscv/vp9dsp_init.c | 18 +++++++++++
> 3 files changed, 78 insertions(+), 1 deletion(-)
> create mode 100644 libavcodec/riscv/vp9_mc_rvv.S
>
> diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile
> index 27b268ae39..4739d83522 100644
> --- a/libavcodec/riscv/Makefile
> +++ b/libavcodec/riscv/Makefile
> @@ -65,6 +65,7 @@ RVV-OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_rvv.o
> OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9dsp_init.o
> RV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvi.o \
> riscv/vp9_mc_rvi.o
> -RVV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvv.o
> +RVV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvv.o \
> + riscv/vp9_mc_rvv.o
> OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_init.o
> RVV-OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_rvv.o
> diff --git a/libavcodec/riscv/vp9_mc_rvv.S b/libavcodec/riscv/vp9_mc_rvv.S
> new file mode 100644
> index 0000000000..7811cd9928
> --- /dev/null
> +++ b/libavcodec/riscv/vp9_mc_rvv.S
> @@ -0,0 +1,58 @@
> +/*
> + * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences
> (ISCAS). + *
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with FFmpeg; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
> USA + */
> +
> +#include "libavutil/riscv/asm.S"
> +
> +.macro vsetvlstatic8 len an maxlen mn=m4
Please put commas between operands.
> +.if \len == 4
> + vsetivli zero, \len, e8, mf4, ta, ma
> +.elseif \len == 8
> + vsetivli zero, \len, e8, mf2, ta, ma
> +.elseif \len == 16
> + vsetivli zero, \len, e8, m1, ta, ma
> +.elseif \len == 32
> + li \an, \len
> + vsetvli zero, \an, e8, m2, ta, ma
> +.elseif \len == 64
> + li \an, \maxlen
> + vsetvli zero, \an, e8, \mn, ta, ma
> +.endif
> +.endm
> +
> +.macro copy_avg len
> +func ff_avg\len\()_rvv, zve32x
This should probably be ff_avg_vp9 or something slightly more specific.
> + csrwi vxrm, 0
> + vsetvlstatic8 \len t0 64
> +1:
> + vle8.v v8, (a2)
> + vle8.v v16, (a0)
> + vaaddu.vv v8, v8, v16
> + addi a4, a4, -1
> + vse8.v v8, (a0)
> + add a2, a2, a3
> + add a0, a0, a1
> + bnez a4, 1b
> + ret
> +endfunc
> +.endm
> +
> +.irp len, 64, 32, 16, 8, 4
> + copy_avg \len
> +.endr
> diff --git a/libavcodec/riscv/vp9dsp_init.c b/libavcodec/riscv/vp9dsp_init.c
> index ab99294d44..6bfe23563a 100644
> --- a/libavcodec/riscv/vp9dsp_init.c
> +++ b/libavcodec/riscv/vp9dsp_init.c
> @@ -48,6 +48,24 @@ static av_cold void vp9dsp_mc_init_riscv(VP9DSPContext
> *dsp, int bpp) }
> # endif
>
> +#if HAVE_RVV
> + if (bpp == 8 && (flags & AV_CPU_FLAG_RVV_I32) && ff_rv_vlen_least(128))
> { +
> +#define init_fpel(idx1, sz) \
> + dsp->mc[idx1][FILTER_8TAP_SMOOTH ][1][0][0] = ff_avg##sz##_rvv; \
> + dsp->mc[idx1][FILTER_8TAP_REGULAR][1][0][0] = ff_avg##sz##_rvv; \
> + dsp->mc[idx1][FILTER_8TAP_SHARP ][1][0][0] = ff_avg##sz##_rvv; \
> + dsp->mc[idx1][FILTER_BILINEAR ][1][0][0] = ff_avg##sz##_rvv
> +
> + init_fpel(0, 64);
> + init_fpel(1, 32);
> + init_fpel(2, 16);
> + init_fpel(3, 8);
> + init_fpel(4, 4);
> +
> +#undef init_fpel
> + }
> +#endif
> #endif
> }
--
Rémi Denis-Courmont
http://www.remlab.net/
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH v4 1/5] lavc/vp9dsp: R-V V mc avg
2024-05-21 15:23 ` Rémi Denis-Courmont
@ 2024-05-21 15:36 ` flow gg
2024-05-21 15:55 ` Rémi Denis-Courmont
0 siblings, 1 reply; 5+ messages in thread
From: flow gg @ 2024-05-21 15:36 UTC (permalink / raw)
To: FFmpeg development discussions and patches
> Please put commas between operands.
Okay
> This should probably be ff_avg_vp9 or something slightly more specific.
Is it necessary here? Many macros in the C file are copied from MIPS, where
it is called ff_avg4_msa. Here, it has been simply changed to ff_avg4_rvv.
Rémi Denis-Courmont <remi@remlab.net> 于2024年5月21日周二 23:24写道：
> Le lauantaina 18. toukokuuta 2024, 21.15.29 EEST uk7b@foxmail.com a écrit
> :
> > From: sunyuechi <sunyuechi@iscas.ac.cn>
> >
> > C908:
> > vp9_avg4_8bpp_c: 1.2
> > vp9_avg4_8bpp_rvv_i64: 1.0
> > vp9_avg8_8bpp_c: 3.7
> > vp9_avg8_8bpp_rvv_i64: 1.5
> > vp9_avg16_8bpp_c: 14.7
> > vp9_avg16_8bpp_rvv_i64: 3.5
> > vp9_avg32_8bpp_c: 57.7
> > vp9_avg32_8bpp_rvv_i64: 10.0
> > vp9_avg64_8bpp_c: 229.0
> > vp9_avg64_8bpp_rvv_i64: 31.7
> > ---
> > libavcodec/riscv/Makefile | 3 +-
> > libavcodec/riscv/vp9_mc_rvv.S | 58 ++++++++++++++++++++++++++++++++++
> > libavcodec/riscv/vp9dsp_init.c | 18 +++++++++++
> > 3 files changed, 78 insertions(+), 1 deletion(-)
> > create mode 100644 libavcodec/riscv/vp9_mc_rvv.S
> >
> > diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile
> > index 27b268ae39..4739d83522 100644
> > --- a/libavcodec/riscv/Makefile
> > +++ b/libavcodec/riscv/Makefile
> > @@ -65,6 +65,7 @@ RVV-OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_rvv.o
> > OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9dsp_init.o
> > RV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvi.o \
> > riscv/vp9_mc_rvi.o
> > -RVV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvv.o
> > +RVV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvv.o \
> > + riscv/vp9_mc_rvv.o
> > OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_init.o
> > RVV-OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_rvv.o
> > diff --git a/libavcodec/riscv/vp9_mc_rvv.S
> b/libavcodec/riscv/vp9_mc_rvv.S
> > new file mode 100644
> > index 0000000000..7811cd9928
> > --- /dev/null
> > +++ b/libavcodec/riscv/vp9_mc_rvv.S
> > @@ -0,0 +1,58 @@
> > +/*
> > + * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences
> > (ISCAS). + *
> > + * This file is part of FFmpeg.
> > + *
> > + * FFmpeg is free software; you can redistribute it and/or
> > + * modify it under the terms of the GNU Lesser General Public
> > + * License as published by the Free Software Foundation; either
> > + * version 2.1 of the License, or (at your option) any later version.
> > + *
> > + * FFmpeg is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> > + * Lesser General Public License for more details.
> > + *
> > + * You should have received a copy of the GNU Lesser General Public
> > + * License along with FFmpeg; if not, write to the Free Software
> > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> 02110-1301
> > USA + */
> > +
> > +#include "libavutil/riscv/asm.S"
> > +
> > +.macro vsetvlstatic8 len an maxlen mn=m4
>
> Please put commas between operands.
>
> > +.if \len == 4
> > + vsetivli zero, \len, e8, mf4, ta, ma
> > +.elseif \len == 8
> > + vsetivli zero, \len, e8, mf2, ta, ma
> > +.elseif \len == 16
> > + vsetivli zero, \len, e8, m1, ta, ma
> > +.elseif \len == 32
> > + li \an, \len
> > + vsetvli zero, \an, e8, m2, ta, ma
> > +.elseif \len == 64
> > + li \an, \maxlen
> > + vsetvli zero, \an, e8, \mn, ta, ma
> > +.endif
> > +.endm
> > +
> > +.macro copy_avg len
> > +func ff_avg\len\()_rvv, zve32x
>
> This should probably be ff_avg_vp9 or something slightly more specific.
>
> > + csrwi vxrm, 0
> > + vsetvlstatic8 \len t0 64
> > +1:
> > + vle8.v v8, (a2)
> > + vle8.v v16, (a0)
> > + vaaddu.vv v8, v8, v16
> > + addi a4, a4, -1
> > + vse8.v v8, (a0)
> > + add a2, a2, a3
> > + add a0, a0, a1
> > + bnez a4, 1b
> > + ret
> > +endfunc
> > +.endm
> > +
> > +.irp len, 64, 32, 16, 8, 4
> > + copy_avg \len
> > +.endr
> > diff --git a/libavcodec/riscv/vp9dsp_init.c
> b/libavcodec/riscv/vp9dsp_init.c
> > index ab99294d44..6bfe23563a 100644
> > --- a/libavcodec/riscv/vp9dsp_init.c
> > +++ b/libavcodec/riscv/vp9dsp_init.c
> > @@ -48,6 +48,24 @@ static av_cold void vp9dsp_mc_init_riscv(VP9DSPContext
> > *dsp, int bpp) }
> > # endif
> >
> > +#if HAVE_RVV
> > + if (bpp == 8 && (flags & AV_CPU_FLAG_RVV_I32) &&
> ff_rv_vlen_least(128))
> > { +
> > +#define init_fpel(idx1, sz) \
> > + dsp->mc[idx1][FILTER_8TAP_SMOOTH ][1][0][0] = ff_avg##sz##_rvv; \
> > + dsp->mc[idx1][FILTER_8TAP_REGULAR][1][0][0] = ff_avg##sz##_rvv; \
> > + dsp->mc[idx1][FILTER_8TAP_SHARP ][1][0][0] = ff_avg##sz##_rvv; \
> > + dsp->mc[idx1][FILTER_BILINEAR ][1][0][0] = ff_avg##sz##_rvv
> > +
> > + init_fpel(0, 64);
> > + init_fpel(1, 32);
> > + init_fpel(2, 16);
> > + init_fpel(3, 8);
> > + init_fpel(4, 4);
> > +
> > +#undef init_fpel
> > + }
> > +#endif
> > #endif
> > }
>
>
> --
> Rémi Denis-Courmont
> http://www.remlab.net/
>
>
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH v4 1/5] lavc/vp9dsp: R-V V mc avg
2024-05-21 15:36 ` flow gg
@ 2024-05-21 15:55 ` Rémi Denis-Courmont
0 siblings, 0 replies; 5+ messages in thread
From: Rémi Denis-Courmont @ 2024-05-21 15:55 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Le tiistaina 21. toukokuuta 2024, 18.36.02 EEST flow gg a écrit :
> > Please put commas between operands.
>
> Okay
>
> > This should probably be ff_avg_vp9 or something slightly more specific.
>
> Is it necessary here?
It works because VP9 is the odd one out doing this. All non-static symbols in
libavcodec are in the same namespace.
> Many macros in the C file are copied from MIPS, where
> it is called ff_avg4_msa. Here, it has been simply changed to ff_avg4_rvv.
AArch64 uses ff_vp9_avg which seems a lot saner.
--
Rémi Denis-Courmont
http://www.remlab.net/
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-05-21 15:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-18 18:15 [FFmpeg-devel] [PATCH v4 1/5] lavc/vp9dsp: R-V V mc avg uk7b
2024-05-18 18:16 ` flow gg
2024-05-21 15:23 ` Rémi Denis-Courmont
2024-05-21 15:36 ` flow gg
2024-05-21 15:55 ` Rémi Denis-Courmont
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git