ref: eb7077ed7773e1a1f06db58f77c7d52c05452d61
parent: e3dbf92664918ecc830b4fde74b7cc0f6cd2065c
author: Martin Storsjö <martin@martin.st>
date: Wed Feb 12 18:42:58 EST 2020
arm: cdef: Remove leftover unused labels and macro parameters These were missed in 361a3c8ee2d03f87f42a76213ee0f93e49fa9ec3.
--- a/src/arm/32/cdef.S
+++ b/src/arm/32/cdef.S
@@ -310,7 +310,7 @@
vld1.16 {\d22}, [r9] // p1.endif
.endm
-.macro handle_pixel s1, s2, threshold, thresh_vec, shift, tap, min
+.macro handle_pixel s1, s2, thresh_vec, shift, tap, min
.if \min
vmin.u16 q2, q2, \s1
vmax.s16 q3, q3, \s1
@@ -334,7 +334,6 @@
vmax.s16 q13, q13, q11 // constrain() = imax(imin(diff, clip), -clip)
vmla.i16 q1, q10, q9 // sum += taps[k] * constrain()
vmla.i16 q1, q13, q9 // sum += taps[k] * constrain()
-3:
.endm
// void dav1d_cdef_filterX_8bpc_neon(pixel *dst, ptrdiff_t dst_stride,
@@ -407,7 +406,7 @@
.if \pri
ldrb r12, [r8] // *pri_taps
- handle_pixel q14, q15, r3, q5, q4, r12, \min
+ handle_pixel q14, q15, q5, q4, r12, \min
.endif
.if \sec
@@ -416,11 +415,11 @@
add r5, r5, #8 // +2*4
ldrsb r9, [r5] // off3
- handle_pixel q14, q15, r4, q7, q6, lr, \min
+ handle_pixel q14, q15, q7, q6, lr, \min
load_px d28, d29, d30, d31, \w
- handle_pixel q14, q15, r4, q7, q6, lr, \min
+ handle_pixel q14, q15, q7, q6, lr, \min
sub r5, r5, #11 // r5 -= 2*(2+4); r5 += 1;
.else
--- a/src/arm/64/cdef_tmpl.S
+++ b/src/arm/64/cdef_tmpl.S
@@ -74,7 +74,7 @@
ld1 {\d2\().d}[1], [x9] // p1.endif
.endm
-.macro handle_pixel s1, s2, threshold, thresh_vec, shift, tap, min
+.macro handle_pixel s1, s2, thresh_vec, shift, tap, min
.if \min
umin v2.8h, v2.8h, \s1\().8h
smax v3.8h, v3.8h, \s1\().8h
@@ -98,7 +98,6 @@
smax v22.8h, v22.8h, v20.8h // constrain() = imax(imin(diff, clip), -clip)
mla v1.8h, v18.8h, v19.8h // sum += taps[k] * constrain()
mla v1.8h, v22.8h, v19.8h // sum += taps[k] * constrain()
-3:
.endm
// void dav1d_cdef_filterX_Ybpc_neon(pixel *dst, ptrdiff_t dst_stride,
@@ -182,7 +181,7 @@
.if \pri
ldrb w10, [x8] // *pri_taps
- handle_pixel v4, v5, w3, v25.8h, v24.8h, w10, \min
+ handle_pixel v4, v5, v25.8h, v24.8h, w10, \min
.endif
.if \sec
@@ -190,9 +189,9 @@
ldrb w9, [x5] // off3
load_px v4, v5, \w
- handle_pixel v6, v7, w4, v27.8h, v26.8h, w11, \min
+ handle_pixel v6, v7, v27.8h, v26.8h, w11, \min
- handle_pixel v4, v5, w4, v27.8h, v26.8h, w11, \min
+ handle_pixel v4, v5, v27.8h, v26.8h, w11, \min
sub x5, x5, #11 // x5 -= 2*(2+4); x5 += 1;
.else