From patchwork Thu Feb 16 13:11:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 2577 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp2469450vsb; Thu, 16 Feb 2017 05:20:05 -0800 (PST) X-Received: by 10.28.211.205 with SMTP id k196mr12027323wmg.124.1487251205550; Thu, 16 Feb 2017 05:20:05 -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 v13si9325844wrv.32.2017.02.16.05.20.04; Thu, 16 Feb 2017 05:20:05 -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 C1D74689AC6; Thu, 16 Feb 2017 15:19:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 33B106891D5 for ; Thu, 16 Feb 2017 15:19:50 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id u63so3092963wmu.2 for ; Thu, 16 Feb 2017 05:19:56 -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; bh=zi04la99jWxyiLaoSvG7E2UnPfM3cfViyCAZ2Auh8ns=; b=yxkUmWdPONzarA+UB3hWv016hC2uWpwAass/dJnmiF0fha5DHe6sViLE3sb16ReT3/ Ne93bSLuceO01OazHzlQB+6TiF6Jlzn4iKbTLwrBbRhDWHKbMih8TlN0Z30cCuQset4u AAeyvrxgJ89UORFG9UvvjyEwI8ZIZ2dMpGqZt23AULPES8et86S02HngjRE789tKnWqS WALR2UwcQJfzuk5riWpDcw6FjV1AgmQOznPotgjak42muUX1bUB2iB5iEZ99crKb9FIi ohxtJgE/8T3ns3bn+tka6y9Befzze5x+BCkY14Ml4QUh83rQ7+bx/xgPXfDxEBVgHd0C 62MA== 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; bh=zi04la99jWxyiLaoSvG7E2UnPfM3cfViyCAZ2Auh8ns=; b=SJe2gVZ9AkhDEJI1FHfYWUTmZTiNW+Aa6k/NBQDbjandfE+ulzhHfGgap7Y917Aq3T DOI2wj4fdKxRidnVQ+Kp/osZ/7CysyXJBoi76ecsaKvwJ7g4GhUGGievn1G8Jl2Qj79K sb6GlsNUQDCoMsl/R3k7UYvwO8bqs79aL3zqpW2ro8epe/zwUYF5OHDMdOaRyEz6sWWa xakU9vle/YpwoeU4sIjYHSLD3S2avu17pRpR3+aQ+E7jqbQRXxM+TNVYuKFKtMuVNzuV eJRb9c7/FfzHKVwNczzwXgzfjI4clzoIcFM1Kh8h20dHWx4OlOMYOuZmL44eEUVvUq3K 7mQA== X-Gm-Message-State: AMke39khGxLj/t9cs619KRZq7IoSc48QTxEK9yXUtdkr38Ze+0s5OXDj9EFzYgHBw+Dn7A== X-Received: by 10.28.138.147 with SMTP id m141mr2350833wmd.57.1487250739322; Thu, 16 Feb 2017 05:12:19 -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.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Feb 2017 05:12:18 -0800 (PST) From: James Darnley To: FFmpeg development discussions and patches Date: Thu, 16 Feb 2017 14:11:46 +0100 Message-Id: <20170216131149.7028-1-jdarnley@obe.tv> X-Mailer: git-send-email 2.8.3 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/x86: deduplicate PASS8ROWS macro 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" --- libavcodec/x86/h264_deblock.asm | 5 ----- libavcodec/x86/h264_deblock_10bit.asm | 5 ----- libavcodec/x86/hevc_deblock.asm | 5 ----- libavutil/x86/x86util.asm | 5 +++++ 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/libavcodec/x86/h264_deblock.asm b/libavcodec/x86/h264_deblock.asm index fe0ab20..435c8be 100644 --- a/libavcodec/x86/h264_deblock.asm +++ b/libavcodec/x86/h264_deblock.asm @@ -37,11 +37,6 @@ cextern pb_0 cextern pb_1 cextern pb_3 -; expands to [base],...,[base+7*stride] -%define PASS8ROWS(base, base3, stride, stride3) \ - [base], [base+stride], [base+stride*2], [base3], \ - [base3+stride], [base3+stride*2], [base3+stride3], [base3+stride*4] - %define PASS8ROWS(base, base3, stride, stride3, offset) \ PASS8ROWS(base+offset, base3+offset, stride, stride3) diff --git a/libavcodec/x86/h264_deblock_10bit.asm b/libavcodec/x86/h264_deblock_10bit.asm index c295364..1af3257 100644 --- a/libavcodec/x86/h264_deblock_10bit.asm +++ b/libavcodec/x86/h264_deblock_10bit.asm @@ -843,11 +843,6 @@ DEBLOCK_LUMA_INTRA mova [r0+2*r1], m2 %endmacro -; expands to [base],...,[base+7*stride] -%define PASS8ROWS(base, base3, stride, stride3) \ - [base], [base+stride], [base+stride*2], [base3], \ - [base3+stride], [base3+stride*2], [base3+stride3], [base3+stride*4] - ; in: 8 rows of 4 words in %4..%11 ; out: 4 rows of 8 words in m0..m3 %macro TRANSPOSE4x8W_LOAD 8 diff --git a/libavcodec/x86/hevc_deblock.asm b/libavcodec/x86/hevc_deblock.asm index 48a5975..85ee480 100644 --- a/libavcodec/x86/hevc_deblock.asm +++ b/libavcodec/x86/hevc_deblock.asm @@ -39,11 +39,6 @@ cextern pw_m1 SECTION .text INIT_XMM sse2 -; expands to [base],...,[base+7*stride] -%define PASS8ROWS(base, base3, stride, stride3) \ - [base], [base+stride], [base+stride*2], [base3], \ - [base3+stride], [base3+stride*2], [base3+stride3], [base3+stride*4] - ; in: 8 rows of 4 bytes in %4..%11 ; out: 4 rows of 8 words in m0..m3 %macro TRANSPOSE4x8B_LOAD 8 diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm index 44ed750..c063436 100644 --- a/libavutil/x86/x86util.asm +++ b/libavutil/x86/x86util.asm @@ -29,6 +29,11 @@ %include "libavutil/x86/x86inc.asm" +; expands to [base],...,[base+7*stride] +%define PASS8ROWS(base, base3, stride, stride3) \ + [base], [base + stride], [base + 2*stride], [base3], \ + [base3 + stride], [base3 + 2*stride], [base3 + stride3], [base3 + stride*4] + %macro SBUTTERFLY 4 %ifidn %1, dqqq vperm2i128 m%4, m%2, m%3, q0301