[FFmpeg-devel] [PATCH] avfilter/vf_transpose: add x86 SIMD
James Almer
jamrial at gmail.com
Mon Oct 21 21:10:57 EEST 2019
On 10/21/2019 3:01 PM, Paul B Mahol wrote:
> Signed-off-by: Paul B Mahol <onemda at gmail.com>
> ---
> libavfilter/transpose.h | 10 ++++
> libavfilter/vf_transpose.c | 16 +++---
> libavfilter/x86/Makefile | 2 +
> libavfilter/x86/vf_transpose.asm | 88 +++++++++++++++++++++++++++++
> libavfilter/x86/vf_transpose_init.c | 49 ++++++++++++++++
> 5 files changed, 157 insertions(+), 8 deletions(-)
> create mode 100644 libavfilter/x86/vf_transpose.asm
> create mode 100644 libavfilter/x86/vf_transpose_init.c
>
> diff --git a/libavfilter/transpose.h b/libavfilter/transpose.h
> index aa262b9487..f73a42864f 100644
> --- a/libavfilter/transpose.h
> +++ b/libavfilter/transpose.h
> @@ -34,4 +34,14 @@ enum TransposeDir {
> TRANSPOSE_VFLIP,
> };
>
> +typedef struct TransVtable {
> + void (*transpose_8x8)(uint8_t *src, ptrdiff_t src_linesize,
> + uint8_t *dst, ptrdiff_t dst_linesize);
> + void (*transpose_block)(uint8_t *src, ptrdiff_t src_linesize,
> + uint8_t *dst, ptrdiff_t dst_linesize,
> + int w, int h);
> +} TransVtable;
> +
> +void ff_transpose_init_x86(TransVtable *v, int pixstep);
> +
> #endif
> diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c
> index dd54947bd9..cb49c4a301 100644
> --- a/libavfilter/vf_transpose.c
> +++ b/libavfilter/vf_transpose.c
> @@ -40,14 +40,6 @@
> #include "video.h"
> #include "transpose.h"
>
> -typedef struct TransVtable {
> - void (*transpose_8x8)(uint8_t *src, ptrdiff_t src_linesize,
> - uint8_t *dst, ptrdiff_t dst_linesize);
> - void (*transpose_block)(uint8_t *src, ptrdiff_t src_linesize,
> - uint8_t *dst, ptrdiff_t dst_linesize,
> - int w, int h);
> -} TransVtable;
> -
> typedef struct TransContext {
> const AVClass *class;
> int hsub, vsub;
> @@ -243,6 +235,14 @@ static int config_props_output(AVFilterLink *outlink)
> }
> }
>
> + if (ARCH_X86) {
> + for (int i = 0; i < 4; i++) {
> + TransVtable *v = &s->vtables[i];
> +
> + ff_transpose_init_x86(v, s->pixsteps[i]);
> + }
> + }
> +
> av_log(ctx, AV_LOG_VERBOSE,
> "w:%d h:%d dir:%d -> w:%d h:%d rotation:%s vflip:%d\n",
> inlink->w, inlink->h, s->dir, outlink->w, outlink->h,
> diff --git a/libavfilter/x86/Makefile b/libavfilter/x86/Makefile
> index 06f832e36c..8d97e46c3f 100644
> --- a/libavfilter/x86/Makefile
> +++ b/libavfilter/x86/Makefile
> @@ -31,6 +31,7 @@ OBJS-$(CONFIG_STEREO3D_FILTER) += x86/vf_stereo3d_init.o
> OBJS-$(CONFIG_TBLEND_FILTER) += x86/vf_blend_init.o
> OBJS-$(CONFIG_THRESHOLD_FILTER) += x86/vf_threshold_init.o
> OBJS-$(CONFIG_TINTERLACE_FILTER) += x86/vf_tinterlace_init.o
> +OBJS-$(CONFIG_TRANSPOSE_FILTER) += x86/vf_transpose_init.o
> OBJS-$(CONFIG_VOLUME_FILTER) += x86/af_volume_init.o
> OBJS-$(CONFIG_V360_FILTER) += x86/vf_v360_init.o
> OBJS-$(CONFIG_W3FDIF_FILTER) += x86/vf_w3fdif_init.o
> @@ -69,6 +70,7 @@ X86ASM-OBJS-$(CONFIG_STEREO3D_FILTER) += x86/vf_stereo3d.o
> X86ASM-OBJS-$(CONFIG_TBLEND_FILTER) += x86/vf_blend.o
> X86ASM-OBJS-$(CONFIG_THRESHOLD_FILTER) += x86/vf_threshold.o
> X86ASM-OBJS-$(CONFIG_TINTERLACE_FILTER) += x86/vf_interlace.o
> +X86ASM-OBJS-$(CONFIG_TRANSPOSE_FILTER) += x86/vf_transpose.o
> X86ASM-OBJS-$(CONFIG_VOLUME_FILTER) += x86/af_volume.o
> X86ASM-OBJS-$(CONFIG_V360_FILTER) += x86/vf_v360.o
> X86ASM-OBJS-$(CONFIG_W3FDIF_FILTER) += x86/vf_w3fdif.o
> diff --git a/libavfilter/x86/vf_transpose.asm b/libavfilter/x86/vf_transpose.asm
> new file mode 100644
> index 0000000000..5bc94a2480
> --- /dev/null
> +++ b/libavfilter/x86/vf_transpose.asm
> @@ -0,0 +1,88 @@
> +;*****************************************************************************
> +;* x86-optimized functions for transpose filter
> +;*
> +;* Copyright (C) 2019 Paul B Mahol
> +;*
> +;* 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/x86/x86util.asm"
> +
> +SECTION .text
> +
> +;------------------------------------------------------------------------------
> +; void ff_transpose_8x8(uint8_t *src, ptrdiff_t src_linesize,
> +; uint8_t *dst, ptrdiff_t dst_linesize)
> +;------------------------------------------------------------------------------
> +
> +INIT_XMM sse4
> +cglobal transpose_8x8_8, 4,5,8, src, src_linesize, dst, dst_linesize, linesize3
> + lea linesize3q, [src_linesizeq * 3]
> + movq m0, [srcq + src_linesizeq * 0]
> + movq m1, [srcq + src_linesizeq * 1]
> + movq m2, [srcq + src_linesizeq * 2]
> + movq m3, [srcq + linesize3q]
> + lea srcq, [srcq + src_linesizeq * 4]
> + movq m4, [srcq + src_linesizeq * 0]
> + movq m5, [srcq + src_linesizeq * 1]
> + movq m6, [srcq + src_linesizeq * 2]
> + movq m7, [srcq + linesize3q]
> +
> + TRANSPOSE_8X8B 0, 1, 2, 3, 4, 5, 6, 7
> +
> + lea linesize3q, [dst_linesizeq * 3]
> + movq [dstq + dst_linesizeq * 0], m0
> + movq [dstq + dst_linesizeq * 1], m1
> + movq [dstq + dst_linesizeq * 2], m2
> + movq [dstq + linesize3q], m3
> + lea dstq, [dstq + dst_linesizeq * 4]
> + movq [dstq + dst_linesizeq * 0], m4
> + movq [dstq + dst_linesizeq * 1], m5
> + movq [dstq + dst_linesizeq * 2], m6
> + movq [dstq + linesize3q], m7
> + RET
> +
> +%if ARCH_X86_64
> +
> +INIT_XMM sse4
> +cglobal transpose_8x8_16, 4,5,9, src, src_linesize, dst, dst_linesize, linesize3
> + lea linesize3q, [src_linesizeq * 3]
> + movu m0, [srcq + src_linesizeq * 0]
> + movu m1, [srcq + src_linesizeq * 1]
> + movu m2, [srcq + src_linesizeq * 2]
> + movu m3, [srcq + linesize3q]
> + lea srcq, [srcq + src_linesizeq * 4]
> + movu m4, [srcq + src_linesizeq * 0]
> + movu m5, [srcq + src_linesizeq * 1]
> + movu m6, [srcq + src_linesizeq * 2]
> + movu m7, [srcq + linesize3q]
> +
> + TRANSPOSE8x8W 0, 1, 2, 3, 4, 5, 6, 7, 8
> +
> + lea linesize3q, [dst_linesizeq * 3]
> + movu [dstq + dst_linesizeq * 0], m0
> + movu [dstq + dst_linesizeq * 1], m1
> + movu [dstq + dst_linesizeq * 2], m2
> + movu [dstq + linesize3q], m3
> + lea dstq, [dstq + dst_linesizeq * 4]
> + movu [dstq + dst_linesizeq * 0], m4
> + movu [dstq + dst_linesizeq * 1], m5
> + movu [dstq + dst_linesizeq * 2], m6
> + movu [dstq + linesize3q], m7
> + RET
> +
> +%endif
> diff --git a/libavfilter/x86/vf_transpose_init.c b/libavfilter/x86/vf_transpose_init.c
> new file mode 100644
> index 0000000000..3c096cf92f
> --- /dev/null
> +++ b/libavfilter/x86/vf_transpose_init.c
> @@ -0,0 +1,49 @@
> +/*
> + * Copyright (C) 2019 Paul B Mahol
> + *
> + * 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 "libavutil/mem.h"
> +#include "libavutil/x86/asm.h"
> +#include "libavutil/x86/cpu.h"
> +#include "libavfilter/transpose.h"
> +
> +void ff_transpose_8x8_8_sse4(uint8_t *src,
> + ptrdiff_t src_linesize,
> + uint8_t *dst,
> + ptrdiff_t dst_linesize);
> +
> +void ff_transpose_8x8_16_sse4(uint8_t *src,
> + ptrdiff_t src_linesize,
> + uint8_t *dst,
> + ptrdiff_t dst_linesize);
> +
> +av_cold void ff_transpose_init_x86(TransVtable *v, int pixstep)
> +{
> + int cpu_flags = av_get_cpu_flags();
> +
> + if (EXTERNAL_SSE4(cpu_flags) && pixstep == 1) {
> + v->transpose_8x8 = ff_transpose_8x8_8_sse4;
> + }
> +
> + if (ARCH_X86_64 && EXTERNAL_SSE4(cpu_flags) && pixstep == 2) {
> + v->transpose_8x8 = ff_transpose_8x8_16_sse4;
> + }
> +}
Mark both functions as SSE2 before pushing, since they are not using any
newer instruction.
LGTM if tested to work and be bitexact.
More information about the ffmpeg-devel
mailing list