From patchwork Fri Mar 17 13:18:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 2986 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp261212vsy; Fri, 17 Mar 2017 06:26:10 -0700 (PDT) X-Received: by 10.223.153.225 with SMTP id y88mr12716154wrb.81.1489757169940; Fri, 17 Mar 2017 06:26:09 -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 l73si3248294wmd.112.2017.03.17.06.26.09; Fri, 17 Mar 2017 06:26:09 -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 85A6868835E; Fri, 17 Mar 2017 15:25:49 +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 C9BDA68826D for ; Fri, 17 Mar 2017 15:25:48 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id z133so3297624wmb.2 for ; Fri, 17 Mar 2017 06:26:06 -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=rxtEtHUPwxXxOpNoHO6M4r+R9sojHd9bz0N2EQOUJYs=; b=TlBUNOy3z5hFOWVxphOMLaLvnlKJFfRsSPfI6eTusnqhrmFXTvPmHJipDqch43hmP6 2QQSqvTUXU2jc3TohAfL5KERFWDzeEwS8AbecxC1eSq1b+vQ+kEftmmuG2quagxD88zJ TKUy6K+LuZ8mrn9cXrSF+u/shmoofdlI4ctaYAHc3gf+p/XHoewts0DmD+MDoqNNmba6 3MvedNF/1tM+CmIyQ+1a+GXjOzpO6KKAc2tJgSaX/nbVLQNCntcrxHy8bCVvIzRcciAm D0ojTS233FiXRGS47DBCmQ5KVyslF9uosBHqvsT288HklPfCbUDI83bulNorwYcDkPXC wkJg== 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=rxtEtHUPwxXxOpNoHO6M4r+R9sojHd9bz0N2EQOUJYs=; b=L9ixdLu1Vw/p4v28TRPvRb6t5L/gWzYrV6JhGCgP+e6kak75kO154yS89Li4sfSZaF ffGxWoOsRuc1TQ7alqPo7WtPydjUcJMhegmaFZMpNo36fkOz76hfkrjf4fBWC0/1tKsB IFmbuK6ukan02SG7JPjvUINm9f4F26PyPZd58YG/KX7byiUUoJG51WLNjmwkqUK0Vqp1 MtDdBZNgR5ipsdmv7pnLL4ZzFblXqGgh//oX1CAuA6V95+aIjhg76FHc8iibVJCC67Jg cyqrws42kfzzCnlQy59C8mnoHXW/ckvsA92uKZUgAGWRt3m31bRddQwVICTcuIRZPBYh YC7g== X-Gm-Message-State: AFeK/H0hNfXG/+MldPObiSHLpPKvsUfkVS983a4djtVmBka6Yhry68kLogDUIYHmgoXZlA== X-Received: by 10.28.132.20 with SMTP id g20mr3011322wmd.68.1489756769377; Fri, 17 Mar 2017 06:19:29 -0700 (PDT) Received: from localhost.localdomain (d51a44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id e72sm2676411wma.5.2017.03.17.06.19.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Mar 2017 06:19:28 -0700 (PDT) From: James Darnley To: FFmpeg development discussions and patches Date: Fri, 17 Mar 2017 14:18:41 +0100 Message-Id: <20170317131845.7760-7-jdarnley@obe.tv> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20170317131845.7760-1-jdarnley@obe.tv> References: <20170317131845.7760-1-jdarnley@obe.tv> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/10] 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" 1.04x faster (521±1.7 vs. 501±1.1 decicycles) compared with mmxext --- libavcodec/x86/h264_idct.asm | 21 +++++++++++++++++++++ libavcodec/x86/h264dsp_init.c | 2 ++ 2 files changed, 23 insertions(+) diff --git a/libavcodec/x86/h264_idct.asm b/libavcodec/x86/h264_idct.asm index ca8ffdb..c4b6e55 100644 --- a/libavcodec/x86/h264_idct.asm +++ b/libavcodec/x86/h264_idct.asm @@ -1158,6 +1158,18 @@ 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 @@ -1167,3 +1179,12 @@ cglobal h264_idct8_add_8, 3, 4, 10, dst_, block_, stride_ movsxdifnidn stride_q, stride_d IDCT8_ADD_SSE dst_q, block_q, stride_q, r3 RET + +; Not any faster +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 2172a71..1aa66a8 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) @@ -342,6 +343,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_idct8_add = ff_h264_idct8_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)) {