From 92ab8374b1051dd632c3ccc326b6cb1d564f293f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Fri, 13 Jan 2017 23:42:28 +0200 Subject: [PATCH] arm: vp9lpf: Use orrs instead of orr+cmp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is cherrypicked from libav commit 435cd7bc99671bf561193421a50ac6e9d63c4266. Signed-off-by: Martin Storsjö --- libavcodec/arm/vp9lpf_neon.S | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavcodec/arm/vp9lpf_neon.S b/libavcodec/arm/vp9lpf_neon.S index 2761956c0c..3d289e5d08 100644 --- a/libavcodec/arm/vp9lpf_neon.S +++ b/libavcodec/arm/vp9lpf_neon.S @@ -78,8 +78,7 @@ vdup.u8 d3, r3 @ H vmov r2, r3, d4 - orr r2, r2, r3 - cmp r2, #0 + orrs r2, r2, r3 @ If no pixels need filtering, just exit as soon as possible beq 9f @@ -192,8 +191,7 @@ .if \wd >= 8 vmov r2, r3, d6 - orr r2, r2, r3 - cmp r2, #0 + orrs r2, r2, r3 @ If no pixels need flat8in, jump to flat8out @ (or to a writeout of the inner 4 pixels, for wd=8) beq 6f @@ -248,14 +246,12 @@ 6: vorr d2, d6, d7 vmov r2, r3, d2 - orr r2, r2, r3 - cmp r2, #0 + orrs r2, r2, r3 @ If no pixels needed flat8in nor flat8out, jump to a @ writeout of the inner 4 pixels beq 7f vmov r2, r3, d7 - orr r2, r2, r3 - cmp r2, #0 + orrs r2, r2, r3 @ If no pixels need flat8out, jump to a writeout of the inner 6 pixels beq 8f