From patchwork Mon Jan 9 22:15:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 2159 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp7257916vsb; Mon, 9 Jan 2017 14:22:48 -0800 (PST) X-Received: by 10.194.36.40 with SMTP id n8mr14051793wjj.74.1484000568641; Mon, 09 Jan 2017 14:22:48 -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 q15si9354022wrd.242.2017.01.09.14.22.46; Mon, 09 Jan 2017 14:22:48 -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=@martin-st.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 C814D68A28A; Tue, 10 Jan 2017 00:22:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9CA3E6802CB for ; Tue, 10 Jan 2017 00:22:34 +0200 (EET) Received: by mail-lf0-f68.google.com with SMTP id q89so6927141lfi.1 for ; Mon, 09 Jan 2017 14:22:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=ZXuwiNtbJuqnHbJdfp/zxwJ3OZxrWfnHk16JSD5dt+c=; b=QRmTVXoirvG+3ixMR0KydvWH9BuiClEQ0Kw5a2GU4IkLXRmden8p5UUNgJ565NFrXL DoSoEoKqY2Gx8mzpCClPnBgcqmFA5jOc+QeYm0ndiUUAQLGNccODIoz+k8C8DW+lSUEd 6YgigIuru72YJM0zHq1FgiPO9DpyVXT1qyQQTRzOUPDnRR4grZKYRbcuwbl327baMawh sqWFjA/DJGeNgisOPpLd5BDX8U8svIoiwpkp/xPO5PEbHYu9YZKJINoPwFO3/2mAB9z7 pUGymMCmk5pBXc1PznDDMP+EIx6TSLDiRFbuMnT5xqh3IjFu46ZO7f2UZzFvSKGMtz6y /PLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=ZXuwiNtbJuqnHbJdfp/zxwJ3OZxrWfnHk16JSD5dt+c=; b=OUZaOjwNDI2pAerFgafj2xQ+2F4yJBppoUcdoDZAt6wfWet2tgYXavOzrduTBQyd/a oYW8BZNEQtMDq5p5LzGTEQaIPkG9Vl+mENCASby7UIz4OvnISExhClkRK2BUqtKrR3Nu 1TlM6Tz6pOb1172T1Wxmw1FxV8Za8dYPZPNeU63CDd5wOjBBptNYeHdi1Qhon5Nih6WF QTIpmtzmBBjeyhEW69KWly196lEPutGowpmqphubrthdq9svo3aTeqtDTreAPmQpaeZO owCQ2lQ2U2RyaOl0zb1z3P1fgS8XOFlSEEA1b0J5t5tp2V2IbboVbDzxH71CbfzPLB8s WgkA== X-Gm-Message-State: AIkVDXLdF8rxAG8BZOmOLTR/M1QJIXg0j+b3VHUU/jDzIp+HwWLFLate31BgTmqMrTJjtA== X-Received: by 10.25.26.201 with SMTP id a192mr2495897lfa.154.1484000123369; Mon, 09 Jan 2017 14:15:23 -0800 (PST) Received: from localhost.localdomain ([2001:470:28:852:a9ed:5432:636c:1053]) by smtp.gmail.com with ESMTPSA id f25sm1358538lji.26.2017.01.09.14.15.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Jan 2017 14:15:23 -0800 (PST) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Jan 2017 00:15:09 +0200 Message-Id: <1484000119-4959-3-git-send-email-martin@martin.st> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484000119-4959-1-git-send-email-martin@martin.st> References: <1484000119-4959-1-git-send-email-martin@martin.st> Subject: [FFmpeg-devel] [PATCH 03/13] arm: vp9itxfm: Simplify the stack alignment code 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" From: Janne Grunau This is one instruction less for thumb, and only have got 1/2 arm/thumb specific instructions. This is cherrypicked from libav commit e5b0fc170f85b00f7dd0ac514918fb5c95253d39. --- libavcodec/arm/vp9itxfm_neon.S | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/libavcodec/arm/vp9itxfm_neon.S b/libavcodec/arm/vp9itxfm_neon.S index 06470a3..d7a2654 100644 --- a/libavcodec/arm/vp9itxfm_neon.S +++ b/libavcodec/arm/vp9itxfm_neon.S @@ -791,15 +791,13 @@ function ff_vp9_\txfm1\()_\txfm2\()_16x16_add_neon, export=1 .ifnc \txfm1\()_\txfm2,idct_idct vpush {q4-q7} .endif - mov r7, sp @ Align the stack, allocate a temp buffer -T mov r12, sp -T bic r12, r12, #15 -T sub r12, r12, #512 -T mov sp, r12 -A bic sp, sp, #15 -A sub sp, sp, #512 +T mov r7, sp +T and r7, r7, #15 +A and r7, sp, #15 + add r7, r7, #512 + sub sp, sp, r7 mov r4, r0 mov r5, r1 @@ -828,7 +826,7 @@ A sub sp, sp, #512 bl \txfm2\()16_1d_4x16_pass2_neon .endr - mov sp, r7 + add sp, sp, r7 .ifnc \txfm1\()_\txfm2,idct_idct vpop {q4-q7} .endif @@ -1117,15 +1115,13 @@ function ff_vp9_idct_idct_32x32_add_neon, export=1 beq idct32x32_dc_add_neon push {r4-r7,lr} vpush {q4-q7} - mov r7, sp @ Align the stack, allocate a temp buffer -T mov r12, sp -T bic r12, r12, #15 -T sub r12, r12, #2048 -T mov sp, r12 -A bic sp, sp, #15 -A sub sp, sp, #2048 +T mov r7, sp +T and r7, r7, #15 +A and r7, sp, #15 + add r7, r7, #2048 + sub sp, sp, r7 mov r4, r0 mov r5, r1 @@ -1143,7 +1139,7 @@ A sub sp, sp, #2048 bl idct32_1d_4x32_pass2_neon .endr - mov sp, r7 + add sp, sp, r7 vpop {q4-q7} pop {r4-r7,pc} endfunc