From patchwork Wed Apr 5 01:53:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 3298 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp54801vss; Tue, 4 Apr 2017 19:01:12 -0700 (PDT) X-Received: by 10.28.6.203 with SMTP id 194mr17189610wmg.125.1491357671932; Tue, 04 Apr 2017 19:01:11 -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 c26si19839552wrb.192.2017.04.04.19.01.11; Tue, 04 Apr 2017 19:01:11 -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 C694C6882AD; Wed, 5 Apr 2017 05:01:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f175.google.com (mail-wr0-f175.google.com [209.85.128.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC2926882AC for ; Wed, 5 Apr 2017 05:00:59 +0300 (EEST) Received: by mail-wr0-f175.google.com with SMTP id w11so224686982wrc.3 for ; Tue, 04 Apr 2017 19:01:02 -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=X9HyTGjB8zdKzD+1Mmjv4gkH66ER8lMfbwZ4Sd1o2o0=; b=CBw20vWMWHMnuDCTRFakUUEEHH2OuC/HCnSbzofiVsI3V5GH42A+A2YMxIPLP1Ac3+ /Dyva6JCVdpDmqONLkuofrRuhRTi1EsTRjMRNaSuyvxipdyjxxfIoQkUpTJVUvAEFUTx 2HMZzntzZl9rAm7H1SIF9h9DKdD2MEmls9krak0U+q/ocKuRU8PzKm3Sqmw0SoSTZtIT VOcdg+NvhUvByTrQYODQwR4TqlOUIPmjbzu0ChLr9NVrIHxi4D1gYXOqWZT2Y2FG9GDc ohi8yJtYzMmh39kjLlyXt79AiWFESaefIrSwereAahFyh1l/gLahrqv2jIAtq7+4BxL9 sptg== 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=X9HyTGjB8zdKzD+1Mmjv4gkH66ER8lMfbwZ4Sd1o2o0=; b=GqREqpQygQpJlf/RrlaVUlfanomkGgTdmcYMBA2xVCThWK7XMw/sTr0xbdyrrkD9M6 ZU5owjoFAiZglD3NdmKkYjF00Ph9G/4aIZijN8+060NKPkQOmkoXnxFGRKXoAaI66nZz /oxrVn41Wi49VSwQK0jsAlteQo2Zgb8h84t+ctGw4f7oXFUyHtaXQRb3O0GKNME7sLYi HHJWr9En92E8sRzW9kZwREiI08C4eLtcJg3gzSgKq9o+0FX4kZWB2sKiRGQbVYOTNX7y YmwcKXy/NRwqXyNeA3p+NbUPVzG1VLbb0hdpy73q0BT0NYZK2koDHdyl24cZfM4wpOVj BiUQ== X-Gm-Message-State: AFeK/H3J8knUtkifyB4RmH/TJaK+1Cekava8K8KqS8k3jsurf1oy1iRgJCwJZj8Y1E5atg== X-Received: by 10.223.171.71 with SMTP id r7mr20998065wrc.199.1491357216655; Tue, 04 Apr 2017 18:53:36 -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.35 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:27 +0200 Message-Id: <20170405015328.5476-5-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 4/5] avcodec/h264: add avx 8-bit h264_idct_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.11x faster (522±0.4 vs. 469±1.8 decicycles) compared with mmxext Skylake-U: - 1.21x faster (671±5.5 vs. 555±1.4 decicycles) compared with mmxext --- libavcodec/x86/h264_idct.asm | 33 ++++++++++++++++++++++++++++++++- libavcodec/x86/h264dsp_init.c | 3 +++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/libavcodec/x86/h264_idct.asm b/libavcodec/x86/h264_idct.asm index bc4dce4..24fb4d2 100644 --- a/libavcodec/x86/h264_idct.asm +++ b/libavcodec/x86/h264_idct.asm @@ -65,7 +65,15 @@ SECTION .text IDCT4_1D w, 0, 1, 2, 3, 4, 5 mova m6, [pw_32] - TRANSPOSE4x4W 0, 1, 2, 3, 4 + %if mmsize == 8 + TRANSPOSE4x4W 0, 1, 2, 3, 4 + %else + punpcklwd m0, m1 + punpcklwd m2, m3 + SBUTTERFLY dq, 0, 2, 4 + MOVHL m1, m0 + MOVHL m3, m2 + %endif paddw m0, m6 IDCT4_1D w, 0, 1, 2, 3, 4, 5 pxor m7, m7 @@ -1131,3 +1139,26 @@ INIT_MMX mmx IDCT_DC_DEQUANT 0 INIT_MMX sse2 IDCT_DC_DEQUANT 7 + +INIT_XMM avx + +; %unmacro STORE_DIFFx2 8 ; remove macro from x86util.asm but yasm doesn't have this yet +%macro STORE_DIFFx2 8 ; add1, add2, reg1, reg2, zero, shift, source, stride + movd %3, [%7] + movd %4, [%7+%8] + psraw %1, %6 + psraw %2, %6 + punpcklbw %3, %5 + punpcklbw %4, %5 + paddw %3, %1 + paddw %4, %2 + packuswb %3, %5 + packuswb %4, %5 + movd [%7], %3 + movd [%7+%8], %4 +%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 diff --git a/libavcodec/x86/h264dsp_init.c b/libavcodec/x86/h264dsp_init.c index 0643b37..8ba085f 100644 --- a/libavcodec/x86/h264dsp_init.c +++ b/libavcodec/x86/h264dsp_init.c @@ -32,6 +32,7 @@ void ff_h264_idct ## NUM ## _add_ ## DEPTH ## _ ## OPT(uint8_t *dst, \ int stride); 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, 10, mmxext) @@ -337,6 +338,8 @@ av_cold void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth, c->h264_h_loop_filter_chroma = ff_deblock_h_chroma422_8_avx; c->h264_h_loop_filter_chroma_intra = ff_deblock_h_chroma422_intra_8_avx; } + + c->h264_idct_add = ff_h264_idct_add_8_avx; } } else if (bit_depth == 10) { if (EXTERNAL_MMXEXT(cpu_flags)) {