[FFmpeg-devel] [PATCH 19/21] aarch64: hevc: Produce plain neon versions of qpel_uni_hv
Martin Storsjö
martin at martin.st
Mon Mar 25 17:02:41 EET 2024
As the plain neon qpel_h functions process two rows at a time,
we need to allocate storage for h+8 rows instead of h+7.
By allocating storage for h+8 rows, incrementing the stack
pointer won't end up at the right spot in the end. Store the
intended final stack pointer value in a register x14 which we
store on the stack.
AWS Graviton 3:
put_hevc_qpel_uni_hv4_8_c: 384.2
put_hevc_qpel_uni_hv4_8_neon: 127.5
put_hevc_qpel_uni_hv4_8_i8mm: 85.5
put_hevc_qpel_uni_hv6_8_c: 705.5
put_hevc_qpel_uni_hv6_8_neon: 224.5
put_hevc_qpel_uni_hv6_8_i8mm: 176.2
put_hevc_qpel_uni_hv8_8_c: 1136.5
put_hevc_qpel_uni_hv8_8_neon: 216.5
put_hevc_qpel_uni_hv8_8_i8mm: 214.0
put_hevc_qpel_uni_hv12_8_c: 2259.5
put_hevc_qpel_uni_hv12_8_neon: 498.5
put_hevc_qpel_uni_hv12_8_i8mm: 410.7
put_hevc_qpel_uni_hv16_8_c: 3824.7
put_hevc_qpel_uni_hv16_8_neon: 670.0
put_hevc_qpel_uni_hv16_8_i8mm: 603.7
put_hevc_qpel_uni_hv24_8_c: 8113.5
put_hevc_qpel_uni_hv24_8_neon: 1474.7
put_hevc_qpel_uni_hv24_8_i8mm: 1351.5
put_hevc_qpel_uni_hv32_8_c: 14744.5
put_hevc_qpel_uni_hv32_8_neon: 2599.7
put_hevc_qpel_uni_hv32_8_i8mm: 2266.0
put_hevc_qpel_uni_hv48_8_c: 32800.0
put_hevc_qpel_uni_hv48_8_neon: 5650.0
put_hevc_qpel_uni_hv48_8_i8mm: 5011.7
put_hevc_qpel_uni_hv64_8_c: 57856.2
put_hevc_qpel_uni_hv64_8_neon: 9863.5
put_hevc_qpel_uni_hv64_8_i8mm: 8767.7
---
libavcodec/aarch64/hevcdsp_init_aarch64.c | 5 +
libavcodec/aarch64/hevcdsp_qpel_neon.S | 156 ++++++++++++++--------
2 files changed, 102 insertions(+), 59 deletions(-)
diff --git a/libavcodec/aarch64/hevcdsp_init_aarch64.c b/libavcodec/aarch64/hevcdsp_init_aarch64.c
index 105c26017b..0531db027b 100644
--- a/libavcodec/aarch64/hevcdsp_init_aarch64.c
+++ b/libavcodec/aarch64/hevcdsp_init_aarch64.c
@@ -277,6 +277,10 @@ NEON8_FNPROTO(qpel_uni_v, (uint8_t *dst, ptrdiff_t dststride,
const uint8_t *src, ptrdiff_t srcstride,
int height, intptr_t mx, intptr_t my, int width),);
+NEON8_FNPROTO(qpel_uni_hv, (uint8_t *dst, ptrdiff_t dststride,
+ const uint8_t *src, ptrdiff_t srcstride,
+ int height, intptr_t mx, intptr_t my, int width),);
+
NEON8_FNPROTO(qpel_uni_hv, (uint8_t *dst, ptrdiff_t dststride,
const uint8_t *src, ptrdiff_t srcstride,
int height, intptr_t mx, intptr_t my, int width), _i8mm);
@@ -441,6 +445,7 @@ av_cold void ff_hevc_dsp_init_aarch64(HEVCDSPContext *c, const int bit_depth)
NEON8_FNASSIGN_SHARED_32(c->put_hevc_qpel_uni_w, 0, 1, qpel_uni_w_h,);
NEON8_FNASSIGN(c->put_hevc_qpel, 1, 1, qpel_hv,);
+ NEON8_FNASSIGN(c->put_hevc_qpel_uni, 1, 1, qpel_uni_hv,);
if (have_i8mm(cpu_flags)) {
NEON8_FNASSIGN(c->put_hevc_epel, 0, 1, epel_h, _i8mm);
diff --git a/libavcodec/aarch64/hevcdsp_qpel_neon.S b/libavcodec/aarch64/hevcdsp_qpel_neon.S
index 7bffb991a7..f285ab7461 100644
--- a/libavcodec/aarch64/hevcdsp_qpel_neon.S
+++ b/libavcodec/aarch64/hevcdsp_qpel_neon.S
@@ -2169,7 +2169,8 @@ function hevc_put_hevc_qpel_uni_hv4_8_end_neon
.endm
1: calc_all
.purgem calc
-2: ret
+2: mov sp, x14
+ ret
endfunc
function hevc_put_hevc_qpel_uni_hv6_8_end_neon
@@ -2198,7 +2199,8 @@ function hevc_put_hevc_qpel_uni_hv6_8_end_neon
.endm
1: calc_all
.purgem calc
-2: ret
+2: mov sp, x14
+ ret
endfunc
function hevc_put_hevc_qpel_uni_hv8_8_end_neon
@@ -2225,7 +2227,8 @@ function hevc_put_hevc_qpel_uni_hv8_8_end_neon
.endm
1: calc_all
.purgem calc
-2: ret
+2: mov sp, x14
+ ret
endfunc
function hevc_put_hevc_qpel_uni_hv12_8_end_neon
@@ -2252,7 +2255,8 @@ function hevc_put_hevc_qpel_uni_hv12_8_end_neon
.endm
1: calc_all2
.purgem calc
-2: ret
+2: mov sp, x14
+ ret
endfunc
function hevc_put_hevc_qpel_uni_hv16_8_end_neon
@@ -2286,21 +2290,17 @@ function hevc_put_hevc_qpel_uni_hv16_8_end_neon
add sp, sp, #32
subs w7, w7, #16
b.ne 0b
- add w10, w4, #6
- add sp, sp, x12 // discard rest of first line
- lsl x10, x10, #7
- add sp, sp, x10 // tmp_array without first line
+ mov sp, x14
ret
endfunc
-#if HAVE_I8MM
-ENABLE_I8MM
-
-function ff_hevc_put_hevc_qpel_uni_hv4_8_neon_i8mm, export=1
- add w10, w4, #7
+.macro qpel_uni_hv suffix
+function ff_hevc_put_hevc_qpel_uni_hv4_8_\suffix, export=1
+ add w10, w4, #8
lsl x10, x10, #7
+ mov x14, sp
sub sp, sp, x10 // tmp_array
- str x30, [sp, #-48]!
+ stp x30, x14,[sp, #-48]!
stp x4, x6, [sp, #16]
stp x0, x1, [sp, #32]
sub x1, x2, x3, lsl #1
@@ -2309,18 +2309,19 @@ function ff_hevc_put_hevc_qpel_uni_hv4_8_neon_i8mm, export=1
mov x2, x3
add x3, x4, #7
mov x4, x5
- bl X(ff_hevc_put_hevc_qpel_h4_8_neon_i8mm)
+ bl X(ff_hevc_put_hevc_qpel_h4_8_\suffix)
ldp x4, x6, [sp, #16]
ldp x0, x1, [sp, #32]
- ldr x30, [sp], #48
+ ldp x30, x14, [sp], #48
b hevc_put_hevc_qpel_uni_hv4_8_end_neon
endfunc
-function ff_hevc_put_hevc_qpel_uni_hv6_8_neon_i8mm, export=1
- add w10, w4, #7
+function ff_hevc_put_hevc_qpel_uni_hv6_8_\suffix, export=1
+ add w10, w4, #8
lsl x10, x10, #7
+ mov x14, sp
sub sp, sp, x10 // tmp_array
- str x30, [sp, #-48]!
+ stp x30, x14,[sp, #-48]!
stp x4, x6, [sp, #16]
stp x0, x1, [sp, #32]
sub x1, x2, x3, lsl #1
@@ -2329,18 +2330,19 @@ function ff_hevc_put_hevc_qpel_uni_hv6_8_neon_i8mm, export=1
mov x2, x3
add w3, w4, #7
mov x4, x5
- bl X(ff_hevc_put_hevc_qpel_h6_8_neon_i8mm)
+ bl X(ff_hevc_put_hevc_qpel_h6_8_\suffix)
ldp x4, x6, [sp, #16]
ldp x0, x1, [sp, #32]
- ldr x30, [sp], #48
+ ldp x30, x14, [sp], #48
b hevc_put_hevc_qpel_uni_hv6_8_end_neon
endfunc
-function ff_hevc_put_hevc_qpel_uni_hv8_8_neon_i8mm, export=1
- add w10, w4, #7
+function ff_hevc_put_hevc_qpel_uni_hv8_8_\suffix, export=1
+ add w10, w4, #8
lsl x10, x10, #7
+ mov x14, sp
sub sp, sp, x10 // tmp_array
- str x30, [sp, #-48]!
+ stp x30, x14,[sp, #-48]!
stp x4, x6, [sp, #16]
stp x0, x1, [sp, #32]
sub x1, x2, x3, lsl #1
@@ -2349,60 +2351,67 @@ function ff_hevc_put_hevc_qpel_uni_hv8_8_neon_i8mm, export=1
mov x2, x3
add w3, w4, #7
mov x4, x5
- bl X(ff_hevc_put_hevc_qpel_h8_8_neon_i8mm)
+ bl X(ff_hevc_put_hevc_qpel_h8_8_\suffix)
ldp x4, x6, [sp, #16]
ldp x0, x1, [sp, #32]
- ldr x30, [sp], #48
+ ldp x30, x14, [sp], #48
b hevc_put_hevc_qpel_uni_hv8_8_end_neon
endfunc
-function ff_hevc_put_hevc_qpel_uni_hv12_8_neon_i8mm, export=1
- add w10, w4, #7
+function ff_hevc_put_hevc_qpel_uni_hv12_8_\suffix, export=1
+ add w10, w4, #8
lsl x10, x10, #7
+ mov x14, sp
sub sp, sp, x10 // tmp_array
- stp x7, x30, [sp, #-48]!
+ stp x7, x30, [sp, #-64]!
stp x4, x6, [sp, #16]
stp x0, x1, [sp, #32]
+ str x14, [sp, #48]
sub x1, x2, x3, lsl #1
sub x1, x1, x3
mov x2, x3
- add x0, sp, #48
+ add x0, sp, #64
add w3, w4, #7
mov x4, x5
- bl X(ff_hevc_put_hevc_qpel_h12_8_neon_i8mm)
+ mov w6, #12
+ bl X(ff_hevc_put_hevc_qpel_h12_8_\suffix)
+ ldr x14, [sp, #48]
ldp x4, x6, [sp, #16]
ldp x0, x1, [sp, #32]
- ldp x7, x30, [sp], #48
+ ldp x7, x30, [sp], #64
b hevc_put_hevc_qpel_uni_hv12_8_end_neon
endfunc
-function ff_hevc_put_hevc_qpel_uni_hv16_8_neon_i8mm, export=1
- add w10, w4, #7
+function ff_hevc_put_hevc_qpel_uni_hv16_8_\suffix, export=1
+ add w10, w4, #8
lsl x10, x10, #7
+ mov x14, sp
sub sp, sp, x10 // tmp_array
- stp x7, x30, [sp, #-48]!
+ stp x7, x30, [sp, #-64]!
stp x4, x6, [sp, #16]
stp x0, x1, [sp, #32]
- add x0, sp, #48
+ str x14, [sp, #48]
+ add x0, sp, #64
sub x1, x2, x3, lsl #1
sub x1, x1, x3
mov x2, x3
add w3, w4, #7
mov x4, x5
- bl X(ff_hevc_put_hevc_qpel_h16_8_neon_i8mm)
+ bl X(ff_hevc_put_hevc_qpel_h16_8_\suffix)
+ ldr x14, [sp, #48]
ldp x4, x6, [sp, #16]
ldp x0, x1, [sp, #32]
- ldp x7, x30, [sp], #48
+ ldp x7, x30, [sp], #64
b hevc_put_hevc_qpel_uni_hv16_8_end_neon
endfunc
-function ff_hevc_put_hevc_qpel_uni_hv24_8_neon_i8mm, export=1
+function ff_hevc_put_hevc_qpel_uni_hv24_8_\suffix, export=1
stp x4, x5, [sp, #-64]!
stp x2, x3, [sp, #16]
stp x0, x1, [sp, #32]
stp x6, x30, [sp, #48]
mov x7, #16
- bl X(ff_hevc_put_hevc_qpel_uni_hv16_8_neon_i8mm)
+ bl X(ff_hevc_put_hevc_qpel_uni_hv16_8_\suffix)
ldp x2, x3, [sp, #16]
add x2, x2, #16
ldp x0, x1, [sp, #32]
@@ -2410,71 +2419,100 @@ function ff_hevc_put_hevc_qpel_uni_hv24_8_neon_i8mm, export=1
mov x7, #8
add x0, x0, #16
ldr x6, [sp]
- bl X(ff_hevc_put_hevc_qpel_uni_hv8_8_neon_i8mm)
+ bl X(ff_hevc_put_hevc_qpel_uni_hv8_8_\suffix)
ldr x30, [sp, #8]
add sp, sp, #16
ret
endfunc
-function ff_hevc_put_hevc_qpel_uni_hv32_8_neon_i8mm, export=1
- add w10, w4, #7
+function ff_hevc_put_hevc_qpel_uni_hv32_8_\suffix, export=1
+ add w10, w4, #8
lsl x10, x10, #7
+ mov x14, sp
sub sp, sp, x10 // tmp_array
- stp x7, x30, [sp, #-48]!
+ stp x7, x30, [sp, #-64]!
stp x4, x6, [sp, #16]
stp x0, x1, [sp, #32]
+ str x14, [sp, #48]
sub x1, x2, x3, lsl #1
- add x0, sp, #48
+ add x0, sp, #64
sub x1, x1, x3
mov x2, x3
add w3, w4, #7
mov x4, x5
- bl X(ff_hevc_put_hevc_qpel_h32_8_neon_i8mm)
+ mov w6, #32
+ bl X(ff_hevc_put_hevc_qpel_h32_8_\suffix)
+ ldr x14, [sp, #48]
ldp x4, x6, [sp, #16]
ldp x0, x1, [sp, #32]
- ldp x7, x30, [sp], #48
+ ldp x7, x30, [sp], #64
b hevc_put_hevc_qpel_uni_hv16_8_end_neon
endfunc
-function ff_hevc_put_hevc_qpel_uni_hv48_8_neon_i8mm, export=1
- add w10, w4, #7
+function ff_hevc_put_hevc_qpel_uni_hv48_8_\suffix, export=1
+ add w10, w4, #8
lsl x10, x10, #7
+ mov x14, sp
sub sp, sp, x10 // tmp_array
- stp x7, x30, [sp, #-48]!
+ stp x7, x30, [sp, #-64]!
stp x4, x6, [sp, #16]
stp x0, x1, [sp, #32]
+ str x14, [sp, #48]
sub x1, x2, x3, lsl #1
sub x1, x1, x3
mov x2, x3
- add x0, sp, #48
+ add x0, sp, #64
add w3, w4, #7
mov x4, x5
- bl X(ff_hevc_put_hevc_qpel_h48_8_neon_i8mm)
+.ifc \suffix, neon
+ mov w6, #48
+ bl X(ff_hevc_put_hevc_qpel_h32_8_\suffix)
+.else
+ bl X(ff_hevc_put_hevc_qpel_h48_8_\suffix)
+.endif
+ ldr x14, [sp, #48]
ldp x4, x6, [sp, #16]
ldp x0, x1, [sp, #32]
- ldp x7, x30, [sp], #48
+ ldp x7, x30, [sp], #64
b hevc_put_hevc_qpel_uni_hv16_8_end_neon
endfunc
-function ff_hevc_put_hevc_qpel_uni_hv64_8_neon_i8mm, export=1
- add w10, w4, #7
+function ff_hevc_put_hevc_qpel_uni_hv64_8_\suffix, export=1
+ add w10, w4, #8
lsl x10, x10, #7
+ mov x14, sp
sub sp, sp, x10 // tmp_array
- stp x7, x30, [sp, #-48]!
+ stp x7, x30, [sp, #-64]!
stp x4, x6, [sp, #16]
stp x0, x1, [sp, #32]
- add x0, sp, #48
+ str x14, [sp, #48]
+ add x0, sp, #64
sub x1, x2, x3, lsl #1
mov x2, x3
sub x1, x1, x3
add w3, w4, #7
mov x4, x5
- bl X(ff_hevc_put_hevc_qpel_h64_8_neon_i8mm)
+.ifc \suffix, neon
+ mov w6, #64
+ bl X(ff_hevc_put_hevc_qpel_h32_8_\suffix)
+.else
+ bl X(ff_hevc_put_hevc_qpel_h64_8_\suffix)
+.endif
+ ldr x14, [sp, #48]
ldp x4, x6, [sp, #16]
ldp x0, x1, [sp, #32]
- ldp x7, x30, [sp], #48
+ ldp x7, x30, [sp], #64
b hevc_put_hevc_qpel_uni_hv16_8_end_neon
endfunc
+.endm
+
+qpel_uni_hv neon
+
+#if HAVE_I8MM
+ENABLE_I8MM
+
+qpel_uni_hv neon_i8mm
+
DISABLE_I8MM
#endif
--
2.39.3 (Apple Git-146)
More information about the ffmpeg-devel
mailing list