[FFmpeg-cvslog] aarch64: hevc: Produce epel_uni_hv functions for both neon and i8mm
Martin Storsjö
git at videolan.org
Tue Mar 26 09:06:39 EET 2024
ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Wed Mar 20 11:16:36 2024 +0200| [d7294199ab32ea4a683a3a4f23648b31dbb902db] | committer: Martin Storsjö
aarch64: hevc: Produce epel_uni_hv functions for both neon and i8mm
AWS Graviton 3:
put_hevc_epel_uni_hv4_8_c: 163.5
put_hevc_epel_uni_hv4_8_neon: 59.7
put_hevc_epel_uni_hv4_8_i8mm: 57.5
put_hevc_epel_uni_hv6_8_c: 344.7
put_hevc_epel_uni_hv6_8_neon: 105.0
put_hevc_epel_uni_hv6_8_i8mm: 102.7
put_hevc_epel_uni_hv8_8_c: 552.2
put_hevc_epel_uni_hv8_8_neon: 111.2
put_hevc_epel_uni_hv8_8_i8mm: 104.0
put_hevc_epel_uni_hv12_8_c: 1195.0
put_hevc_epel_uni_hv12_8_neon: 248.7
put_hevc_epel_uni_hv12_8_i8mm: 229.5
put_hevc_epel_uni_hv16_8_c: 1910.2
put_hevc_epel_uni_hv16_8_neon: 339.5
put_hevc_epel_uni_hv16_8_i8mm: 323.2
put_hevc_epel_uni_hv24_8_c: 4048.2
put_hevc_epel_uni_hv24_8_neon: 737.7
put_hevc_epel_uni_hv24_8_i8mm: 713.7
put_hevc_epel_uni_hv32_8_c: 6865.7
put_hevc_epel_uni_hv32_8_neon: 1285.0
put_hevc_epel_uni_hv32_8_i8mm: 1206.0
put_hevc_epel_uni_hv48_8_c: 15830.5
put_hevc_epel_uni_hv48_8_neon: 2844.7
put_hevc_epel_uni_hv48_8_i8mm: 2914.0
put_hevc_epel_uni_hv64_8_c: 27912.7
put_hevc_epel_uni_hv64_8_neon: 4970.5
put_hevc_epel_uni_hv64_8_i8mm: 4653.7
Signed-off-by: Martin Storsjö <martin at martin.st>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d7294199ab32ea4a683a3a4f23648b31dbb902db
---
libavcodec/aarch64/hevcdsp_epel_neon.S | 67 +++++++++++++++----------------
libavcodec/aarch64/hevcdsp_init_aarch64.c | 5 +++
2 files changed, 38 insertions(+), 34 deletions(-)
diff --git a/libavcodec/aarch64/hevcdsp_epel_neon.S b/libavcodec/aarch64/hevcdsp_epel_neon.S
index 024464723b..876db9d449 100644
--- a/libavcodec/aarch64/hevcdsp_epel_neon.S
+++ b/libavcodec/aarch64/hevcdsp_epel_neon.S
@@ -2460,14 +2460,6 @@ endfunc
epel_hv neon
-#if HAVE_I8MM
-ENABLE_I8MM
-
-epel_hv neon_i8mm
-
-DISABLE_I8MM
-#endif
-
function hevc_put_hevc_epel_uni_hv4_8_end_neon
load_epel_filterh x6, x5
mov x10, #(MAX_PB_SIZE * 2)
@@ -2596,10 +2588,8 @@ function hevc_put_hevc_epel_uni_hv24_8_end_neon
2: ret
endfunc
-#if HAVE_I8MM
-ENABLE_I8MM
-
-function ff_hevc_put_hevc_epel_uni_hv4_8_neon_i8mm, export=1
+.macro epel_uni_hv suffix
+function ff_hevc_put_hevc_epel_uni_hv4_8_\suffix, export=1
add w10, w4, #3
lsl x10, x10, #7
sub sp, sp, x10 // tmp_array
@@ -2611,14 +2601,14 @@ function ff_hevc_put_hevc_epel_uni_hv4_8_neon_i8mm, export=1
mov x2, x3
add w3, w4, #3
mov x4, x5
- bl X(ff_hevc_put_hevc_epel_h4_8_neon_i8mm)
+ bl X(ff_hevc_put_hevc_epel_h4_8_\suffix)
ldp x4, x6, [sp, #16]
ldp x0, x1, [sp, #32]
ldr x30, [sp], #48
b hevc_put_hevc_epel_uni_hv4_8_end_neon
endfunc
-function ff_hevc_put_hevc_epel_uni_hv6_8_neon_i8mm, export=1
+function ff_hevc_put_hevc_epel_uni_hv6_8_\suffix, export=1
add w10, w4, #3
lsl x10, x10, #7
sub sp, sp, x10 // tmp_array
@@ -2630,14 +2620,14 @@ function ff_hevc_put_hevc_epel_uni_hv6_8_neon_i8mm, export=1
mov x2, x3
add w3, w4, #3
mov x4, x5
- bl X(ff_hevc_put_hevc_epel_h6_8_neon_i8mm)
+ bl X(ff_hevc_put_hevc_epel_h6_8_\suffix)
ldp x4, x6, [sp, #16]
ldp x0, x1, [sp, #32]
ldr x30, [sp], #48
b hevc_put_hevc_epel_uni_hv6_8_end_neon
endfunc
-function ff_hevc_put_hevc_epel_uni_hv8_8_neon_i8mm, export=1
+function ff_hevc_put_hevc_epel_uni_hv8_8_\suffix, export=1
add w10, w4, #3
lsl x10, x10, #7
sub sp, sp, x10 // tmp_array
@@ -2649,14 +2639,14 @@ function ff_hevc_put_hevc_epel_uni_hv8_8_neon_i8mm, export=1
mov x2, x3
add w3, w4, #3
mov x4, x5
- bl X(ff_hevc_put_hevc_epel_h8_8_neon_i8mm)
+ bl X(ff_hevc_put_hevc_epel_h8_8_\suffix)
ldp x4, x6, [sp, #16]
ldp x0, x1, [sp, #32]
ldr x30, [sp], #48
b hevc_put_hevc_epel_uni_hv8_8_end_neon
endfunc
-function ff_hevc_put_hevc_epel_uni_hv12_8_neon_i8mm, export=1
+function ff_hevc_put_hevc_epel_uni_hv12_8_\suffix, export=1
add w10, w4, #3
lsl x10, x10, #7
sub sp, sp, x10 // tmp_array
@@ -2668,14 +2658,14 @@ function ff_hevc_put_hevc_epel_uni_hv12_8_neon_i8mm, export=1
mov x2, x3
add w3, w4, #3
mov x4, x5
- bl X(ff_hevc_put_hevc_epel_h12_8_neon_i8mm)
+ bl X(ff_hevc_put_hevc_epel_h12_8_\suffix)
ldp x4, x6, [sp, #16]
ldp x0, x1, [sp, #32]
ldr x30, [sp], #48
b hevc_put_hevc_epel_uni_hv12_8_end_neon
endfunc
-function ff_hevc_put_hevc_epel_uni_hv16_8_neon_i8mm, export=1
+function ff_hevc_put_hevc_epel_uni_hv16_8_\suffix, export=1
add w10, w4, #3
lsl x10, x10, #7
sub sp, sp, x10 // tmp_array
@@ -2687,14 +2677,14 @@ function ff_hevc_put_hevc_epel_uni_hv16_8_neon_i8mm, export=1
mov x2, x3
add w3, w4, #3
mov x4, x5
- bl X(ff_hevc_put_hevc_epel_h16_8_neon_i8mm)
+ bl X(ff_hevc_put_hevc_epel_h16_8_\suffix)
ldp x4, x6, [sp, #16]
ldp x0, x1, [sp, #32]
ldr x30, [sp], #48
b hevc_put_hevc_epel_uni_hv16_8_end_neon
endfunc
-function ff_hevc_put_hevc_epel_uni_hv24_8_neon_i8mm, export=1
+function ff_hevc_put_hevc_epel_uni_hv24_8_\suffix, export=1
add w10, w4, #3
lsl x10, x10, #7
sub sp, sp, x10 // tmp_array
@@ -2706,20 +2696,20 @@ function ff_hevc_put_hevc_epel_uni_hv24_8_neon_i8mm, export=1
mov x2, x3
add w3, w4, #3
mov x4, x5
- bl X(ff_hevc_put_hevc_epel_h24_8_neon_i8mm)
+ bl X(ff_hevc_put_hevc_epel_h24_8_\suffix)
ldp x4, x6, [sp, #16]
ldp x0, x1, [sp, #32]
ldr x30, [sp], #48
b hevc_put_hevc_epel_uni_hv24_8_end_neon
endfunc
-function ff_hevc_put_hevc_epel_uni_hv32_8_neon_i8mm, export=1
+function ff_hevc_put_hevc_epel_uni_hv32_8_\suffix, export=1
stp x5, x6, [sp, #-64]!
stp x3, x4, [sp, #16]
stp x1, x2, [sp, #32]
stp x0, x30, [sp, #48]
mov x7, #16
- bl X(ff_hevc_put_hevc_epel_uni_hv16_8_neon_i8mm)
+ bl X(ff_hevc_put_hevc_epel_uni_hv16_8_\suffix)
ldp x5, x6, [sp]
ldp x3, x4, [sp, #16]
ldp x1, x2, [sp, #32]
@@ -2727,19 +2717,19 @@ function ff_hevc_put_hevc_epel_uni_hv32_8_neon_i8mm, export=1
add x0, x0, #16
add x2, x2, #16
mov x7, #16
- bl X(ff_hevc_put_hevc_epel_uni_hv16_8_neon_i8mm)
+ bl X(ff_hevc_put_hevc_epel_uni_hv16_8_\suffix)
ldr x30, [sp, #56]
add sp, sp, #64
ret
endfunc
-function ff_hevc_put_hevc_epel_uni_hv48_8_neon_i8mm, export=1
+function ff_hevc_put_hevc_epel_uni_hv48_8_\suffix, export=1
stp x5, x6, [sp, #-64]!
stp x3, x4, [sp, #16]
stp x1, x2, [sp, #32]
stp x0, x30, [sp, #48]
mov x7, #24
- bl X(ff_hevc_put_hevc_epel_uni_hv24_8_neon_i8mm)
+ bl X(ff_hevc_put_hevc_epel_uni_hv24_8_\suffix)
ldp x5, x6, [sp]
ldp x3, x4, [sp, #16]
ldp x1, x2, [sp, #32]
@@ -2747,19 +2737,19 @@ function ff_hevc_put_hevc_epel_uni_hv48_8_neon_i8mm, export=1
add x0, x0, #24
add x2, x2, #24
mov x7, #24
- bl X(ff_hevc_put_hevc_epel_uni_hv24_8_neon_i8mm)
+ bl X(ff_hevc_put_hevc_epel_uni_hv24_8_\suffix)
ldr x30, [sp, #56]
add sp, sp, #64
ret
endfunc
-function ff_hevc_put_hevc_epel_uni_hv64_8_neon_i8mm, export=1
+function ff_hevc_put_hevc_epel_uni_hv64_8_\suffix, export=1
stp x5, x6, [sp, #-64]!
stp x3, x4, [sp, #16]
stp x1, x2, [sp, #32]
stp x0, x30, [sp, #48]
mov x7, #16
- bl X(ff_hevc_put_hevc_epel_uni_hv16_8_neon_i8mm)
+ bl X(ff_hevc_put_hevc_epel_uni_hv16_8_\suffix)
ldp x5, x6, [sp]
ldp x3, x4, [sp, #16]
ldp x1, x2, [sp, #32]
@@ -2767,7 +2757,7 @@ function ff_hevc_put_hevc_epel_uni_hv64_8_neon_i8mm, export=1
add x0, x0, #16
add x2, x2, #16
mov x7, #16
- bl X(ff_hevc_put_hevc_epel_uni_hv16_8_neon_i8mm)
+ bl X(ff_hevc_put_hevc_epel_uni_hv16_8_\suffix)
ldp x5, x6, [sp]
ldp x3, x4, [sp, #16]
ldp x1, x2, [sp, #32]
@@ -2775,7 +2765,7 @@ function ff_hevc_put_hevc_epel_uni_hv64_8_neon_i8mm, export=1
add x0, x0, #32
add x2, x2, #32
mov x7, #16
- bl X(ff_hevc_put_hevc_epel_uni_hv16_8_neon_i8mm)
+ bl X(ff_hevc_put_hevc_epel_uni_hv16_8_\suffix)
ldp x5, x6, [sp]
ldp x3, x4, [sp, #16]
ldp x1, x2, [sp, #32]
@@ -2783,12 +2773,21 @@ function ff_hevc_put_hevc_epel_uni_hv64_8_neon_i8mm, export=1
add x0, x0, #48
add x2, x2, #48
mov x7, #16
- bl X(ff_hevc_put_hevc_epel_uni_hv16_8_neon_i8mm)
+ bl X(ff_hevc_put_hevc_epel_uni_hv16_8_\suffix)
ldr x30, [sp, #56]
add sp, sp, #64
ret
endfunc
+.endm
+
+epel_uni_hv neon
+
+#if HAVE_I8MM
+ENABLE_I8MM
+
+epel_hv neon_i8mm
+epel_uni_hv neon_i8mm
function ff_hevc_put_hevc_epel_uni_w_h4_8_neon_i8mm, export=1
EPEL_UNI_W_H_HEADER
diff --git a/libavcodec/aarch64/hevcdsp_init_aarch64.c b/libavcodec/aarch64/hevcdsp_init_aarch64.c
index 87e321da71..447ae80bfb 100644
--- a/libavcodec/aarch64/hevcdsp_init_aarch64.c
+++ b/libavcodec/aarch64/hevcdsp_init_aarch64.c
@@ -209,6 +209,10 @@ NEON8_FNPROTO(epel_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(epel_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(epel_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);
@@ -412,6 +416,7 @@ av_cold void ff_hevc_dsp_init_aarch64(HEVCDSPContext *c, const int bit_depth)
NEON8_FNASSIGN_SHARED_32(c->put_hevc_epel_uni_w, 0, 1, epel_uni_w_h,);
NEON8_FNASSIGN(c->put_hevc_epel, 1, 1, epel_hv,);
+ NEON8_FNASSIGN(c->put_hevc_epel_uni, 1, 1, epel_uni_hv,);
if (have_i8mm(cpu_flags)) {
NEON8_FNASSIGN(c->put_hevc_epel, 0, 1, epel_h, _i8mm);
More information about the ffmpeg-cvslog
mailing list