From patchwork Sat Apr 15 01:46:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 3420 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp449768vsd; Fri, 14 Apr 2017 18:54:17 -0700 (PDT) X-Received: by 10.28.125.195 with SMTP id y186mr883648wmc.32.1492221257907; Fri, 14 Apr 2017 18:54:17 -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 l5si5439650wrb.253.2017.04.14.18.54.17; Fri, 14 Apr 2017 18:54:17 -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 C273168920D; Sat, 15 Apr 2017 04:54:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 295BE688365 for ; Sat, 15 Apr 2017 04:54:02 +0300 (EEST) Received: by mail-wr0-f195.google.com with SMTP id u18so14122838wrc.1 for ; Fri, 14 Apr 2017 18:54:09 -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; bh=dBnNbpXa64KBrxIrAuOz8rq6HwDevNqbAvP8Kf0fFSo=; b=OYgOvC0PBo8Sf8bu9Q4MUpRw67pTltbekTf0+MEwqbETWMT16JFINX9a8VVAXmFiKl 30yxKORPdcMXjO81wYuxvqRIUl1FAvF2cc4Wtfz6xf0dZjsRWh+xHpr/YQYQFhUsGWzy +UHr2eLoza6GbesmCsrxPmQ4I4tFohMhR02Vg564s4uvEa2CFIFKrgEC9sn+r5RsUfCl spNcU2+5woq56gTedoNJFQeAjylzgN+l3WmROkgkniApJ+pYgtXiTWYXJ2RxyJJXNZMG jxGgzBxhSMtjB0T+evlYpEJFuZK1AQYBixTaqKCDKw7uqRyRxjrlFEw4h8unJaOJbp9A sS0Q== 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=dBnNbpXa64KBrxIrAuOz8rq6HwDevNqbAvP8Kf0fFSo=; b=kxORi11ZXE8Qx6Dt6hXTTa6zORPZ+4CXbaahCH/phJZQO8TR7Ba8+1PPfiTmWI9E1X 0RDZNCx4Rnwq4sGWS8TURHDwzgN9zMjgKoxJbqMTOkIWVG3V3JnXyyWdbYf72+do78wj Z5F+oxl28EFFakkN+YkFW4zW90UWIRQpWjd3hLDiRzLYjaMHKXS7eujAfn+42v/ejQPj uTnrHNLRj65mC3mV4RbOL1gh+cRBydutioQrVte6TvGI4NutR3cVee0VUWnk2bA68Tkx gEZ9EVFRwneXHWi48WrvEysIEVZP7hA7694zoKJJZMqYALcGhb/GyDnr1p+FBPHpXGOr fhXw== X-Gm-Message-State: AN3rC/7Lts+dO+WsA+d7vBDw62PpapOFD322gXyCwv/4t7ZY+vy2XQO2 /hrvemR91N4LQ1wF X-Received: by 10.223.147.225 with SMTP id 88mr9721720wrp.146.1492220811527; Fri, 14 Apr 2017 18:46:51 -0700 (PDT) Received: from localhost.localdomain (d51a44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id 3sm4459091wrv.33.2017.04.14.18.46.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Apr 2017 18:46:51 -0700 (PDT) From: James Darnley To: FFmpeg development discussions and patches Date: Sat, 15 Apr 2017 03:46:18 +0200 Message-Id: <20170415014618.1592-7-jdarnley@obe.tv> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20170415014618.1592-1-jdarnley@obe.tv> References: <20170415014618.1592-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 6/6] avcodec/h264: add sse2 versions of previous idct functions 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" Kaby Lake Pentium: - ff_h264_idct_add_8_sse2: ~1.18x faster than mmxext - ff_h264_idct_dc_add_8_sse2: ~1.07x faster than mmxext --- libavcodec/x86/h264_idct.asm | 11 +++++++++-- libavcodec/x86/h264dsp_init.c | 5 +++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libavcodec/x86/h264_idct.asm b/libavcodec/x86/h264_idct.asm index 43f7791..5d83d91 100644 --- a/libavcodec/x86/h264_idct.asm +++ b/libavcodec/x86/h264_idct.asm @@ -1140,8 +1140,6 @@ 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] @@ -1170,6 +1168,10 @@ INIT_XMM avx packuswb m1, m1 %endmacro +%macro IDCT_XMM 1 + +INIT_XMM %1 + cglobal h264_idct_add_8, 3, 3, 8, dst_, block_, stride_ movsxdifnidn stride_q, stride_d IDCT4_ADD dst_q, block_q, stride_q @@ -1182,3 +1184,8 @@ cglobal h264_idct_dc_add_8, 3, 4, 6, dst_, block_, stride_ DC_ADD_INIT r3 DC_ADD_MMXEXT_OP movd, dst_q, stride_q, r3 RET + +%endmacro + +IDCT_XMM sse2 +IDCT_XMM avx diff --git a/libavcodec/x86/h264dsp_init.c b/libavcodec/x86/h264dsp_init.c index bf74937..ce7179f 100644 --- a/libavcodec/x86/h264dsp_init.c +++ b/libavcodec/x86/h264dsp_init.c @@ -32,9 +32,11 @@ void ff_h264_idct ## NUM ## _add_ ## DEPTH ## _ ## OPT(uint8_t *dst, \ int stride); IDCT_ADD_FUNC(, 8, mmx) +IDCT_ADD_FUNC(, 8, sse2) IDCT_ADD_FUNC(, 8, avx) IDCT_ADD_FUNC(, 10, sse2) IDCT_ADD_FUNC(_dc, 8, mmxext) +IDCT_ADD_FUNC(_dc, 8, sse2) IDCT_ADD_FUNC(_dc, 8, avx) IDCT_ADD_FUNC(_dc, 10, mmxext) IDCT_ADD_FUNC(8_dc, 8, mmxext) @@ -316,6 +318,9 @@ av_cold void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth, c->h264_h_loop_filter_chroma = ff_deblock_h_chroma422_8_sse2; c->h264_h_loop_filter_chroma_intra = ff_deblock_h_chroma422_intra_8_sse2; } + + c->h264_idct_add = ff_h264_idct_add_8_sse2; + c->h264_idct_dc_add = ff_h264_idct_dc_add_8_sse2; } if (EXTERNAL_SSSE3(cpu_flags)) { c->biweight_h264_pixels_tab[0] = ff_h264_biweight_16_ssse3;