From patchwork Mon Oct 21 18:01:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 15891 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id DE68E44984B for ; Mon, 21 Oct 2019 21:01:57 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C20CF68B0D5; Mon, 21 Oct 2019 21:01:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D08968B01B for ; Mon, 21 Oct 2019 21:01:51 +0300 (EEST) Received: by mail-wr1-f42.google.com with SMTP id q13so10061317wrs.12 for ; Mon, 21 Oct 2019 11:01:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=IxX5kuAiyJkwSzvXM3utOph4G54+I1FwPALOE6o42SE=; b=iDqcmuem2uTSdYG44GPknck9DHBE7rOHuHHZmz4MIGvlRA4vcPzF2aVp7FImmmJZoO ytraSXU8MkrCn1wqxPOoEg4qr7qFp3uGkaEKPSF3jFKiPqmVpHTW6GN8Z+gcvYtqMhPV i+yIwRdbQNC04c+EBwMpHfvO8JPyQYEkofDf04TvCskRRGtDZhw51gQ3GmOx/r+e1S1T usAZz5MBUClIWNgZELxY/FBu1q+IvLzes08nKXV1JNxRCMbSHDV/xGe8fwr6u3Sshb8D 3U+fOY+t3YGT/WrBd8RXifnzNq7O04UerKcvklwc0uozCu/T4ALpe8BWcKXbrGsA5FaQ grUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=IxX5kuAiyJkwSzvXM3utOph4G54+I1FwPALOE6o42SE=; b=lhz1oLXfvGp1aiw7jrA1R1pO09FjDKloGX5n1oEul9800h/BWmgPqeGp0nD52Z6Vka kRsgAJ3uF/rg8QIWgVRsMYUdZwS00iKTRQVVUc8XM3t0jt2RCx4ASaKF+vMrPABRU/jT F5RxSK3AB57YsJYBkidqKt8V3ADehFz6rlb0US6Famy+5bP1da3LwcLfKwMv3yhLqUtv ox/59L3N1NgKS7LvDic4OyxFFJTai9HFxHFqoArJsiQw6LVqBPCxthz+UmsOvbqY6RAC UyBa11UpEMP0jglcJ3wUO7xKgUaAhJO9lrA0JgMd9xwMyOi9IaBdQ8rTrOW0RyXNk2mU yi7w== X-Gm-Message-State: APjAAAVjwLFNxfPykCuLgCSf9iDP6rbpR5m8F9lAYeencmLwFMVULWLW 9D8EblUYqs8A8MlAY3no6+DiTyJZxBE= X-Google-Smtp-Source: APXvYqxWypfT0HNYyV020IX1qI2hOYcwrH6iQqaiPbCnNoEzZFljika0bXSw6MFmHnuGgeYlPPIw8A== X-Received: by 2002:a5d:630f:: with SMTP id i15mr16816458wru.226.1571680909914; Mon, 21 Oct 2019 11:01:49 -0700 (PDT) Received: from localhost.localdomain ([212.15.160.218]) by smtp.gmail.com with ESMTPSA id r19sm8721121wrr.47.2019.10.21.11.01.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:01:49 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Oct 2019 20:01:41 +0200 Message-Id: <20191021180141.10194-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_transpose: add x86 SIMD X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- 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; + } +}