From patchwork Thu Feb 16 13:11:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 2575 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp2468210vsb; Thu, 16 Feb 2017 05:18:04 -0800 (PST) X-Received: by 10.28.138.136 with SMTP id m130mr12148427wmd.72.1487251084551; Thu, 16 Feb 2017 05:18:04 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 10si9311337wry.3.2017.02.16.05.18.02; Thu, 16 Feb 2017 05:18:04 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@ob-encoder-com.20150623.gappssmtp.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A6B5D689A8E; Thu, 16 Feb 2017 15:17:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E256E689720 for ; Thu, 16 Feb 2017 15:17:48 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id v77so3106693wmv.0 for ; Thu, 16 Feb 2017 05:17:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ob-encoder-com.20150623.gappssmtp.com; s=20150623; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=1gfpcFCTZtDLIPVeuXi6LMgJ3ytrNqhzYU6yMfEpZdU=; b=b1Eqsuj5ylWtKyifYILr7SQsaX2tM+oxrDaxv5sJtppMxsUKtYokMiN/MpwkXAQH43 OBVVVVyzO0o+GfdfocSLacZFSBWQasrd0iDAVDxdizWhIGvQ10nnAuSIEHQQ0OpOGD4h WoDNQOh8il8kh94yGqih7A1W7HK3cZcDhiOFwMNWNkrBRnAT/qWSGOpLk5OgZJb/Qr1n 1Ct7pJdWSlbQqRyHE6UWhT5m3lnObdF3VU0p/CkZX4SoL6MtmakvxIPQ+/2YfyGIDnOu fRL1iw6LM5wLr9UwuBuie6Mdv4MWXSqMQvl0z3H5y/gPB9wXr0TYKSix43IHgqsS61PY gR4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=1gfpcFCTZtDLIPVeuXi6LMgJ3ytrNqhzYU6yMfEpZdU=; b=oWcB5LDaF5mn/E6zeQZTkPeu8solHrmzcBGuyKVeeCNkEdpZe/XQ1W1wnG4iD98CHH 7izQDDmXZVApMuFGpQIlwPd1quZVBUFFqLLCmV6j4kEa6l9/tWR3TCzejU+dzeKn7Vf7 wbJ4MNjKFDrej/O1TYdSbisv8MrVUlO6nZ0T6SxcaltsLP7EMWmd2S90IDxt9+mjFcpM ccPeNzxnAtb8FmJu2m/sD4PIj0DIETxX1w1mUFZxny3JLmftENlYfdvH1qiJrzqFPayR 4VxFdOwn3rfibTZoSIOf+CxHDkcbQ8YJYBktFuflU9FppkRpPtkw36QJdgmMh97s3xfo j0NA== X-Gm-Message-State: AMke39nnzy3nMjgs8Crm50Qb91J8vmOB8rIkOxVMvlEdaGAvsh8Hr6gTH9+pPodrQKMKAw== X-Received: by 10.28.188.213 with SMTP id m204mr12254594wmf.0.1487250741833; Thu, 16 Feb 2017 05:12:21 -0800 (PST) Received: from localhost.localdomain (d51A44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id e74sm210945wmd.2.2017.02.16.05.12.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Feb 2017 05:12:21 -0800 (PST) From: James Darnley To: FFmpeg development discussions and patches Date: Thu, 16 Feb 2017 14:11:49 +0100 Message-Id: <20170216131149.7028-4-jdarnley@obe.tv> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20170216131149.7028-1-jdarnley@obe.tv> References: <20170216131149.7028-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/h264: sse2, avx h luma mbaff deblock/loop filter 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" x86-64 only Yorkfield: - sse2: ~2.17x (434 vs. 200 cycles) Nehalem: - sse2: ~2.94x (409 vs. 139 cycles) Skylake: - sse2: ~3.10x (370 vs. 119 cycles) - avx: ~3.29x (370 vs. 112 cycles) --- libavcodec/x86/h264_deblock.asm | 89 +++++++++++++++++++++++++++++++++++++++++ libavcodec/x86/h264dsp_init.c | 10 +++++ libavutil/x86/x86util.asm | 19 +++++++++ 3 files changed, 118 insertions(+) diff --git a/libavcodec/x86/h264_deblock.asm b/libavcodec/x86/h264_deblock.asm index 509a0db..190f38e 100644 --- a/libavcodec/x86/h264_deblock.asm +++ b/libavcodec/x86/h264_deblock.asm @@ -377,10 +377,99 @@ cglobal deblock_h_luma_8, 5,9,0,0x60+16*WIN64 RET %endmacro +%macro DEBLOCK_H_LUMA_MBAFF 0 + +cglobal deblock_h_luma_mbaff_8, 5, 9, 10, 8*16, pix_, stride_, alpha_, beta_, tc0_, base3_, stride3_ + movsxd stride_q, stride_d + dec alpha_d + dec beta_d + mov base3_q, pix_q + lea stride3_q, [3*stride_q] + add base3_q, stride3_q + + movq m0, [pix_q - 4] + movq m1, [pix_q + stride_q - 4] + movq m2, [pix_q + 2*stride_q - 4] + movq m3, [base3_q - 4] + movq m4, [base3_q + stride_q - 4] + movq m5, [base3_q + 2*stride_q - 4] + movq m6, [base3_q + stride3_q - 4] + movq m7, [base3_q + 4*stride_q - 4] + + TRANSPOSE_8X8B + + %assign i 0 + %rep 8 + movq [rsp + 16*i], m %+ i + %assign i i+1 + %endrep + + ; p2 = m1 [rsp + 16] + ; p1 = m2 [rsp + 32] + ; p0 = m3 [rsp + 48] + ; q0 = m4 [rsp + 64] + ; q1 = m5 [rsp + 80] + ; q2 = m6 [rsp + 96] + + SWAP 0, 2 + SWAP 1, 3 + SWAP 2, 4 + SWAP 3, 5 + + LOAD_MASK alpha_d, beta_d + movd m8, [tc0_q] + punpcklbw m8, m8 + pcmpeqb m9, m9 + pcmpeqb m9, m8 + pandn m9, m7 + pand m8, m9 + + movdqa m3, [rsp + 16] ; p2 + DIFF_GT2 m1, m3, m5, m6, m7 ; |p2-p0| > beta-1 + pand m6, m9 + psubb m7, m8, m6 + pand m6, m8 + LUMA_Q1 m0, m3, [rsp + 16], [rsp + 32], m6, m4 + + movdqa m4, [rsp + 96] ; q2 + DIFF_GT2 m2, m4, m5, m6, m3 ; |q2-q0| > beta-1 + pand m6, m9 + pand m8, m6 + psubb m7, m6 + mova m3, [rsp + 80] + LUMA_Q1 m3, m4, [rsp + 96], [rsp + 80], m8, m6 + + DEBLOCK_P0_Q0 + SWAP 1, 3 + SWAP 2, 4 + movq m0, [rsp] + movq m1, [rsp + 16] + movq m2, [rsp + 32] + movq m5, [rsp + 80] + movq m6, [rsp + 96] + movq m7, [rsp + 112] + + TRANSPOSE_8X8B + movq [pix_q - 4], m0 + movq [pix_q + stride_q - 4], m1 + movq [pix_q + 2*stride_q - 4], m2 + movq [base3_q - 4], m3 + movq [base3_q + stride_q - 4], m4 + movq [base3_q + 2*stride_q - 4], m5 + movq [base3_q + stride3_q - 4], m6 + movq [base3_q + 4*stride_q - 4], m7 + +RET + +%endmacro + INIT_XMM sse2 +DEBLOCK_H_LUMA_MBAFF DEBLOCK_LUMA + %if HAVE_AVX_EXTERNAL INIT_XMM avx +DEBLOCK_H_LUMA_MBAFF DEBLOCK_LUMA %endif diff --git a/libavcodec/x86/h264dsp_init.c b/libavcodec/x86/h264dsp_init.c index 7b3d17f..10f1940 100644 --- a/libavcodec/x86/h264dsp_init.c +++ b/libavcodec/x86/h264dsp_init.c @@ -137,6 +137,9 @@ LF_IFUNC(h, chroma422_intra, depth, avx) \ LF_FUNC(v, chroma, depth, avx) \ LF_IFUNC(v, chroma_intra, depth, avx) +LF_FUNC(h, luma_mbaff, 8, sse2) +LF_FUNC(h, luma_mbaff, 8, avx) + LF_FUNCS(uint8_t, 8) LF_FUNCS(uint16_t, 10) @@ -297,6 +300,10 @@ av_cold void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth, c->h264_h_loop_filter_luma = ff_deblock_h_luma_8_sse2; c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_8_sse2; c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_8_sse2; + +#if ARCH_X86_64 + c->h264_h_loop_filter_luma_mbaff = ff_deblock_h_luma_mbaff_8_sse2; +#endif } if (EXTERNAL_SSSE3(cpu_flags)) { c->biweight_h264_pixels_tab[0] = ff_h264_biweight_16_ssse3; @@ -307,6 +314,9 @@ av_cold void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth, c->h264_h_loop_filter_luma = ff_deblock_h_luma_8_avx; c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_8_avx; c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_8_avx; +#if ARCH_X86_64 + c->h264_h_loop_filter_luma_mbaff = ff_deblock_h_luma_mbaff_8_avx; +#endif } } else if (bit_depth == 10) { if (EXTERNAL_MMXEXT(cpu_flags)) { diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm index 1408f0a..a562809 100644 --- a/libavutil/x86/x86util.asm +++ b/libavutil/x86/x86util.asm @@ -265,6 +265,25 @@ SWAP %12, %15 %endmacro +%macro TRANSPOSE_8X8B 8 + %if mmsize == 8 + %error "This macro does not support mmsize == 8" + %endif + punpcklbw m%1, m%2 + punpcklbw m%3, m%4 + punpcklbw m%5, m%6 + punpcklbw m%7, m%8 + TRANSPOSE4x4W %1, %3, %5, %7, %2 + MOVHL m%2, m%1 + MOVHL m%4, m%3 + MOVHL m%6, m%5 + MOVHL m%8, m%7 +%endmacro + +%macro TRANSPOSE_8X8B 0 + TRANSPOSE_8X8B 0, 1, 2, 3, 4, 5, 6, 7 +%endmacro + ; PABSW macro assumes %1 != %2, while ABS1/2 macros work in-place %macro PABSW 2 %if cpuflag(ssse3)