From patchwork Mon Feb 13 12:44:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 2537 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp894791vsb; Mon, 13 Feb 2017 04:55:21 -0800 (PST) X-Received: by 10.28.186.197 with SMTP id k188mr38385119wmf.25.1486990521111; Mon, 13 Feb 2017 04:55:21 -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 m72si5398534wmc.159.2017.02.13.04.55.20; Mon, 13 Feb 2017 04:55:21 -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 3DA586891F3; Mon, 13 Feb 2017 14:55:13 +0200 (EET) 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 307AC6802F0 for ; Mon, 13 Feb 2017 14:55:07 +0200 (EET) Received: by mail-wr0-f194.google.com with SMTP id 89so24003892wrr.1 for ; Mon, 13 Feb 2017 04:55:12 -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=b5yAJECbIa7owBLqGhAZPcSacBhXy42UiFg0l60xl5U=; b=qL21ewu23yuol6IkPm9CeroiILwtDDOYecMgKEHaGS8s2eonyRcZnZARSAqNxMCvV4 O4WXgugGL9AFpWbCkeIBkhoSJ/kO1fLGf7HctwOwNyWt+SZVvt/7hd2ZHr8R3kPorRsE gMvObH0HlYMW6pIBGjmWb5r1GgUU8ZhHaoZzpReAEX6E/mSqfU5muP3n3X+nWO1iWt6c MF0HmynwkkliVWenINaqJuIZ0S7JpqwD0INKf2ePFN9vl+Myo7ialxxv9FjwLpumcEUP ynE+OmcbdcwQ5SFmxClxwBQ/ndZEpAFZgSJPhjxQLl2BCeeHaIYBqDby8LfI+ZEXyRee iXOg== 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=b5yAJECbIa7owBLqGhAZPcSacBhXy42UiFg0l60xl5U=; b=s/QQYtpmp1hiaqe5uMCsIaMNdgDVBNzbDdKvFJZ5POYgdBDp7tXG9KuVto7SNCnagU 7afp8IPlfXwSdj7EBabR6OQVudCR1VHljQAO7MqAfLTTaWYzWeFFnPHLjzdA1/5KEonj tokiNNSOn0yV6+W9XkTxaiwjsy+dCp60xI9do9xPbGvoyJzcQV0/gsTxFJoqlzpGuPMj 9UEGf5jeICPmzAEr2C/6LSTRoIrhHNK4CNDe/ErLjkgiRF8H4f3hjc7eg9gzOi0lbQgX PNy0egeshKmx+q71K0csV2G9i0udaU55cVq5tuTlUFzwb5RpoTCA2IPYOU/cTcCdqRQr 3JQA== X-Gm-Message-State: AMke39mZxrZ4tpZtmdCDL4DyQS2OugQJ81EcDyrFyfR5zbw4BjLMFR0IToB52OEnoz+M+g== X-Received: by 10.223.143.48 with SMTP id p45mr19233182wrb.33.1486990044744; Mon, 13 Feb 2017 04:47:24 -0800 (PST) Received: from Ifrit.systemlords.lan (d51a44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id 10sm13778137wrw.13.2017.02.13.04.47.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Feb 2017 04:47:24 -0800 (PST) From: James Darnley To: FFmpeg development discussions and patches Date: Mon, 13 Feb 2017 13:44:14 +0100 Message-Id: <20170213124417.25808-1-jdarnley@obe.tv> X-Mailer: git-send-email 2.11.1 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 fe0ab20266..435c8be56f 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 c2953640bb..1af3257a67 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 48a597530b..85ee4800bb 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 44ed750ae5..c063436e0a 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