[FFmpeg-devel] [PATCH 2/2] avcodec/mpegvideoencdsp: add aarch64 pix_sum and pix_norm1
Rémi Denis-Courmont
remi at remlab.net
Tue Aug 13 10:45:15 EEST 2024
Le 9 août 2024 14:27:27 GMT+03:00, Ramiro Polla <ramiro.polla at gmail.com> a écrit :
>checkasm --bench for Raspberry Pi 5 Model B Rev 1.0:
>pix_norm1_c: 235.7
>pix_norm1_neon: 40.7
>pix_sum_c: 249.0
>pix_sum_neon: 22.0
>---
> libavcodec/aarch64/Makefile | 2 +
> libavcodec/aarch64/mpegvideoencdsp_init.c | 39 +++++++++
> libavcodec/aarch64/mpegvideoencdsp_neon.S | 102 ++++++++++++++++++++++
> libavcodec/mpegvideoencdsp.c | 4 +-
> libavcodec/mpegvideoencdsp.h | 2 +
> 5 files changed, 148 insertions(+), 1 deletion(-)
> create mode 100644 libavcodec/aarch64/mpegvideoencdsp_init.c
> create mode 100644 libavcodec/aarch64/mpegvideoencdsp_neon.S
>
>diff --git a/libavcodec/aarch64/Makefile b/libavcodec/aarch64/Makefile
>index a3256bb1cc..de0653ebbc 100644
>--- a/libavcodec/aarch64/Makefile
>+++ b/libavcodec/aarch64/Makefile
>@@ -10,6 +10,7 @@ OBJS-$(CONFIG_HPELDSP) += aarch64/hpeldsp_init_aarch64.o
> OBJS-$(CONFIG_IDCTDSP) += aarch64/idctdsp_init_aarch64.o
> OBJS-$(CONFIG_ME_CMP) += aarch64/me_cmp_init_aarch64.o
> OBJS-$(CONFIG_MPEGAUDIODSP) += aarch64/mpegaudiodsp_init.o
>+OBJS-$(CONFIG_MPEGVIDEOENC) += aarch64/mpegvideoencdsp_init.o
> OBJS-$(CONFIG_NEON_CLOBBER_TEST) += aarch64/neontest.o
> OBJS-$(CONFIG_PIXBLOCKDSP) += aarch64/pixblockdsp_init_aarch64.o
> OBJS-$(CONFIG_VIDEODSP) += aarch64/videodsp_init.o
>@@ -51,6 +52,7 @@ NEON-OBJS-$(CONFIG_IDCTDSP) += aarch64/idctdsp_neon.o \
> aarch64/simple_idct_neon.o
> NEON-OBJS-$(CONFIG_ME_CMP) += aarch64/me_cmp_neon.o
> NEON-OBJS-$(CONFIG_MPEGAUDIODSP) += aarch64/mpegaudiodsp_neon.o
>+NEON-OBJS-$(CONFIG_MPEGVIDEOENC) += aarch64/mpegvideoencdsp_neon.o
> NEON-OBJS-$(CONFIG_PIXBLOCKDSP) += aarch64/pixblockdsp_neon.o
> NEON-OBJS-$(CONFIG_VC1DSP) += aarch64/vc1dsp_neon.o
> NEON-OBJS-$(CONFIG_VP8DSP) += aarch64/vp8dsp_neon.o
>diff --git a/libavcodec/aarch64/mpegvideoencdsp_init.c b/libavcodec/aarch64/mpegvideoencdsp_init.c
>new file mode 100644
>index 0000000000..c014fac727
>--- /dev/null
>+++ b/libavcodec/aarch64/mpegvideoencdsp_init.c
>@@ -0,0 +1,39 @@
>+/*
>+ * 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 <stddef.h>
>+#include <stdint.h>
>+
>+#include "libavutil/attributes.h"
>+#include "libavutil/aarch64/cpu.h"
>+#include "libavcodec/mpegvideoencdsp.h"
>+#include "config.h"
>+
>+int ff_pix_sum_neon(const uint8_t *pix, int line_size);
>+int ff_pix_norm1_neon(const uint8_t *pix, int line_size);
>+
>+av_cold void ff_mpegvideoencdsp_init_aarch64(MpegvideoEncDSPContext *c,
>+ AVCodecContext *avctx)
>+{
>+ int cpu_flags = av_get_cpu_flags();
>+
>+ if (have_neon(cpu_flags)) {
>+ c->pix_sum = ff_pix_sum_neon;
>+ c->pix_norm1 = ff_pix_norm1_neon;
>+ }
>+}
>diff --git a/libavcodec/aarch64/mpegvideoencdsp_neon.S b/libavcodec/aarch64/mpegvideoencdsp_neon.S
>new file mode 100644
>index 0000000000..eb45afe005
>--- /dev/null
>+++ b/libavcodec/aarch64/mpegvideoencdsp_neon.S
>@@ -0,0 +1,102 @@
>+/*
>+ * Copyright (c) 2024 Ramiro Polla
>+ *
>+ * 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/aarch64/asm.S"
>+
>+.macro sum_line add_insn, postinc
>+.ifb \postinc
>+ ld1 { v1.16b }, [x0]
>+.else
>+ ld1 { v1.16b }, [x0], \postinc
>+.endif
>+ \add_insn v0.8h, v1.16b
>+.endm
>+
>+function ff_pix_sum_neon, export=1
>+// x0 const uint8_t *pix
>+// x1 int line_size
>+
>+ uxtw x1, w1
>+
>+ sum_line uaddlp, x1
>+ sum_line uadalp, x1
>+ sum_line uadalp, x1
>+ sum_line uadalp, x1
>+ sum_line uadalp, x1
>+ sum_line uadalp, x1
>+ sum_line uadalp, x1
>+ sum_line uadalp, x1
>+ sum_line uadalp, x1
>+ sum_line uadalp, x1
>+ sum_line uadalp, x1
>+ sum_line uadalp, x1
>+ sum_line uadalp, x1
>+ sum_line uadalp, x1
>+ sum_line uadalp, x1
>+ sum_line uadalp
>+
>+ uaddlp v0.4s, v0.8h
>+ uaddlv d0, v0.4s
>+ fmov w0, s0
>+
>+ ret
>+endfunc
>+
>+.macro norm1_line add_insn, postinc
>+.ifb \postinc
>+ ld1 { v2.16b }, [x0]
>+.else
>+ ld1 { v2.16b }, [x0], \postinc
>+.endif
>+ umull v0.8h, v2.8b, v2.8b
>+ umull2 v1.8h, v2.16b, v2.16b
>+ \add_insn v3.4s, v0.8h
>+ \add_insn v4.4s, v1.8h
>+.endm
Wher available, I expect that USDOT would be faster here. Can be added separately later so not a blocking issue though.
>+
>+function ff_pix_norm1_neon, export=1
>+// x0 const uint8_t *pix
>+// x1 int line_size
>+
>+ uxtw x1, w1
>+
>+ norm1_line uaddlp, x1
>+ norm1_line uadalp, x1
>+ norm1_line uadalp, x1
>+ norm1_line uadalp, x1
>+ norm1_line uadalp, x1
>+ norm1_line uadalp, x1
>+ norm1_line uadalp, x1
>+ norm1_line uadalp, x1
>+ norm1_line uadalp, x1
>+ norm1_line uadalp, x1
>+ norm1_line uadalp, x1
>+ norm1_line uadalp, x1
>+ norm1_line uadalp, x1
>+ norm1_line uadalp, x1
>+ norm1_line uadalp, x1
>+ norm1_line uadalp
>+
>+ add v0.4s, v3.4s, v4.4s
>+ uaddlv d0, v0.4s
>+ fmov w0, s0
>+
>+ ret
>+endfunc
>diff --git a/libavcodec/mpegvideoencdsp.c b/libavcodec/mpegvideoencdsp.c
>index 997d048663..a96f0b6436 100644
>--- a/libavcodec/mpegvideoencdsp.c
>+++ b/libavcodec/mpegvideoencdsp.c
>@@ -245,7 +245,9 @@ av_cold void ff_mpegvideoencdsp_init(MpegvideoEncDSPContext *c,
>
> c->draw_edges = draw_edges_8_c;
>
>-#if ARCH_ARM
>+#if ARCH_AARCH64
>+ ff_mpegvideoencdsp_init_aarch64(c, avctx);
>+#elif ARCH_ARM
> ff_mpegvideoencdsp_init_arm(c, avctx);
> #elif ARCH_PPC
> ff_mpegvideoencdsp_init_ppc(c, avctx);
>diff --git a/libavcodec/mpegvideoencdsp.h b/libavcodec/mpegvideoencdsp.h
>index 95084679d9..63dbd39603 100644
>--- a/libavcodec/mpegvideoencdsp.h
>+++ b/libavcodec/mpegvideoencdsp.h
>@@ -46,6 +46,8 @@ typedef struct MpegvideoEncDSPContext {
>
> void ff_mpegvideoencdsp_init(MpegvideoEncDSPContext *c,
> AVCodecContext *avctx);
>+void ff_mpegvideoencdsp_init_aarch64(MpegvideoEncDSPContext *c,
>+ AVCodecContext *avctx);
> void ff_mpegvideoencdsp_init_arm(MpegvideoEncDSPContext *c,
> AVCodecContext *avctx);
> void ff_mpegvideoencdsp_init_ppc(MpegvideoEncDSPContext *c,
More information about the ffmpeg-devel
mailing list