From patchwork Wed Apr 5 01:53:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 3295 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp54350vss; Tue, 4 Apr 2017 18:59:46 -0700 (PDT) X-Received: by 10.223.134.74 with SMTP id 10mr12666451wrw.200.1491357586446; Tue, 04 Apr 2017 18:59:46 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u50si4342230wrb.59.2017.04.04.18.59.46; Tue, 04 Apr 2017 18:59:46 -0700 (PDT) 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 631FA688284; Wed, 5 Apr 2017 04:59:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC701680949 for ; Wed, 5 Apr 2017 04:59:34 +0300 (EEST) Received: by mail-wr0-f194.google.com with SMTP id g19so1203061wrb.0 for ; Tue, 04 Apr 2017 18:59:37 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=ECppSoHdslHjQZmJ6Ub2I/bNF8i+dCjA2S6xmImiH2A=; b=coIMhIEtR+2fU74c/9DUD63os3AnLbKCklhKAW/0+E9i66ANZ7DJxJzPxzjHJN5k9g AaZ5Ip0ep+7yv4g/haxdIE343Ns0NNQP3ca783Py8d9OcCFvoIajy07BUMEq+zh+AYUU +9kWYgQPeLSwQuVJH4BzstMfPfw9Zs65+a2jixWJ2uPFRDnWP6Ed0QiU8tZZoE8abIx4 xeYNwqL9UoNvkuDygkmyzeVOL/2gk3dhCtnzjFdPY7mqVuzIRz0vgQbXUqZ0qt4mORIf 6RZWbt6JIZfcfBC14U6bkT1b57PLGeY40qY/75blrk8D2tNzI6rxtR240ifWscOWjs50 tcMQ== 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:mime-version:content-transfer-encoding; bh=ECppSoHdslHjQZmJ6Ub2I/bNF8i+dCjA2S6xmImiH2A=; b=aBVpbcJi8B6tHkj2rhv1jowIApNO2LLoNy/IbuG/vD0sdjLmszPDs41tpb2z7N7Fkh dm9rlty+vk3xVLBh84Vsv5LhwObFhTUSTbYr0iN9n1EcntaLrZAl2mSiVMlBvzuQq5wB 1X6FNTGK9xFOrLEc5YWg/KG/qNIRI6C966lEpEGVp6G3WPrCD7QH5ubx+ULkLQTdbn/N epkl5wvJpcFQeGkR3qE5yfSigpgEcGEwIHAoGTP8gdmeVYKP33bcdh+Mk0c7g47BroRI 5neAvbrFEDXRvzjMcqdpcWmLYL9YKi5lO/3Rml6fKidovHCCmHY6Ap3+CTZ5iNtHWxY3 qYyw== X-Gm-Message-State: AFeK/H0uHvhFaIvLnBNa8ky1syNuaaLG1DsY8KVsTHWB5gaVcuXTbCpHh7Ulm6Txa3IEyQ== X-Received: by 10.223.138.225 with SMTP id z30mr23364371wrz.26.1491357217382; Tue, 04 Apr 2017 18:53:37 -0700 (PDT) Received: from localhost.localdomain (d51a44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id o66sm20381630wmg.33.2017.04.04.18.53.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Apr 2017 18:53:36 -0700 (PDT) From: James Darnley To: FFmpeg development discussions and patches Date: Wed, 5 Apr 2017 03:53:28 +0200 Message-Id: <20170405015328.5476-6-jdarnley@obe.tv> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20170405015328.5476-1-jdarnley@obe.tv> References: <20170405015328.5476-1-jdarnley@obe.tv> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/h264: add avx 8-bit h264_idct_dc_add 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Haswell: - 1.02x faster (405±0.7 vs. 397±0.8 decicycles) compared with mmxext Skylake-U: - 1.06x faster (498±1.8 vs. 470±1.3 decicycles) compared with mmxext --- libavcodec/x86/h264_idct.asm | 20 ++++++++++++++++++++ libavcodec/x86/h264dsp_init.c | 2 ++ 2 files changed, 22 insertions(+) diff --git a/libavcodec/x86/h264_idct.asm b/libavcodec/x86/h264_idct.asm index 24fb4d2..7fd57d3 100644 --- a/libavcodec/x86/h264_idct.asm +++ b/libavcodec/x86/h264_idct.asm @@ -1158,7 +1158,27 @@ INIT_XMM avx movd [%7+%8], %4 %endmacro +%macro DC_ADD_INIT 1 + add %1d, 32 + sar %1d, 6 + movd m0, %1d + SPLATW m0, m0, 0 + lea %1, [3*stride_q] + pxor m1, m1 + psubw m1, m0 + packuswb m0, m0 + packuswb m1, m1 +%endmacro + cglobal h264_idct_add_8, 3, 3, 8, dst_, block_, stride_ movsxdifnidn stride_q, stride_d IDCT4_ADD dst_q, block_q, stride_q RET + +cglobal h264_idct_dc_add_8, 3, 4, 0, dst_, block_, stride_ + movsxdifnidn stride_q, stride_d + movsx r3d, word [block_q] + mov dword [block_q], 0 + DC_ADD_INIT r3 + DC_ADD_MMXEXT_OP movd, dst_q, stride_q, r3 +RET diff --git a/libavcodec/x86/h264dsp_init.c b/libavcodec/x86/h264dsp_init.c index 8ba085f..bf74937 100644 --- a/libavcodec/x86/h264dsp_init.c +++ b/libavcodec/x86/h264dsp_init.c @@ -35,6 +35,7 @@ IDCT_ADD_FUNC(, 8, mmx) IDCT_ADD_FUNC(, 8, avx) IDCT_ADD_FUNC(, 10, sse2) IDCT_ADD_FUNC(_dc, 8, mmxext) +IDCT_ADD_FUNC(_dc, 8, avx) IDCT_ADD_FUNC(_dc, 10, mmxext) IDCT_ADD_FUNC(8_dc, 8, mmxext) IDCT_ADD_FUNC(8_dc, 10, sse2) @@ -340,6 +341,7 @@ av_cold void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth, } c->h264_idct_add = ff_h264_idct_add_8_avx; + c->h264_idct_dc_add = ff_h264_idct_dc_add_8_avx; } } else if (bit_depth == 10) { if (EXTERNAL_MMXEXT(cpu_flags)) {