ffmpeg | branch: master | Martin Storsjö <mar...@martin.st> | Fri Mar 22 13:41:45 2024 +0200| [d21b9a041136c6d855a56e5ae353c98118b95ea8] | committer: Martin Storsjö
aarch64: hevc: Produce plain neon versions of qpel_uni_w_hv 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. AWS Graviton 3: put_hevc_qpel_uni_w_hv4_8_c: 422.2 put_hevc_qpel_uni_w_hv4_8_neon: 140.7 put_hevc_qpel_uni_w_hv4_8_i8mm: 100.7 put_hevc_qpel_uni_w_hv8_8_c: 1208.0 put_hevc_qpel_uni_w_hv8_8_neon: 268.2 put_hevc_qpel_uni_w_hv8_8_i8mm: 261.5 put_hevc_qpel_uni_w_hv16_8_c: 4297.2 put_hevc_qpel_uni_w_hv16_8_neon: 802.2 put_hevc_qpel_uni_w_hv16_8_i8mm: 731.2 put_hevc_qpel_uni_w_hv32_8_c: 15518.5 put_hevc_qpel_uni_w_hv32_8_neon: 3085.2 put_hevc_qpel_uni_w_hv32_8_i8mm: 2783.2 put_hevc_qpel_uni_w_hv64_8_c: 57254.5 put_hevc_qpel_uni_w_hv64_8_neon: 11787.5 put_hevc_qpel_uni_w_hv64_8_i8mm: 10659.0 Signed-off-by: Martin Storsjö <mar...@martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d21b9a041136c6d855a56e5ae353c98118b95ea8 --- libavcodec/aarch64/hevcdsp_init_aarch64.c | 6 ++++ libavcodec/aarch64/hevcdsp_qpel_neon.S | 47 ++++++++++++++++++++----------- 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/libavcodec/aarch64/hevcdsp_init_aarch64.c b/libavcodec/aarch64/hevcdsp_init_aarch64.c index 0531db027b..e9ee901322 100644 --- a/libavcodec/aarch64/hevcdsp_init_aarch64.c +++ b/libavcodec/aarch64/hevcdsp_init_aarch64.c @@ -305,6 +305,11 @@ NEON8_FNPROTO(epel_uni_w_hv, (uint8_t *_dst, ptrdiff_t _dststride, int height, int denom, int wx, int ox, intptr_t mx, intptr_t my, int width), _i8mm); +NEON8_FNPROTO_PARTIAL_5(qpel_uni_w_hv, (uint8_t *_dst, ptrdiff_t _dststride, + const uint8_t *_src, ptrdiff_t _srcstride, + int height, int denom, int wx, int ox, + intptr_t mx, intptr_t my, int width),); + NEON8_FNPROTO_PARTIAL_5(qpel_uni_w_hv, (uint8_t *_dst, ptrdiff_t _dststride, const uint8_t *_src, ptrdiff_t _srcstride, int height, int denom, int wx, int ox, @@ -446,6 +451,7 @@ av_cold void ff_hevc_dsp_init_aarch64(HEVCDSPContext *c, const int bit_depth) NEON8_FNASSIGN(c->put_hevc_qpel, 1, 1, qpel_hv,); NEON8_FNASSIGN(c->put_hevc_qpel_uni, 1, 1, qpel_uni_hv,); + NEON8_FNASSIGN_PARTIAL_5(c->put_hevc_qpel_uni_w, 1, 1, qpel_uni_w_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 f285ab7461..df7032b692 100644 --- a/libavcodec/aarch64/hevcdsp_qpel_neon.S +++ b/libavcodec/aarch64/hevcdsp_qpel_neon.S @@ -4164,7 +4164,7 @@ qpel_hv neon_i8mm DISABLE_I8MM #endif -.macro QPEL_UNI_W_HV_HEADER width +.macro QPEL_UNI_W_HV_HEADER width, suffix ldp x14, x15, [sp] // mx, my ldr w13, [sp, #16] // width stp x19, x30, [sp, #-80]! @@ -4173,7 +4173,7 @@ DISABLE_I8MM stp x24, x25, [sp, #48] stp x26, x27, [sp, #64] mov x19, sp - mov x11, #9088 + mov x11, #(MAX_PB_SIZE*(MAX_PB_SIZE+8)*2) sub sp, sp, x11 mov x20, x0 mov x21, x1 @@ -4190,7 +4190,16 @@ DISABLE_I8MM mov w26, #-6 sub w26, w26, w5 // -shift mov w27, w13 // width - bl X(ff_hevc_put_hevc_qpel_h\width\()_8_neon_i8mm) +.ifc \suffix, neon +.if \width >= 32 + mov w6, #\width + bl X(ff_hevc_put_hevc_qpel_h32_8_neon) +.else + bl X(ff_hevc_put_hevc_qpel_h\width\()_8_\suffix) +.endif +.else + bl X(ff_hevc_put_hevc_qpel_h\width\()_8_\suffix) +.endif movrel x9, qpel_filters add x9, x9, x23, lsl #3 ld1 {v0.8b}, [x9] @@ -4552,33 +4561,39 @@ function hevc_put_hevc_qpel_uni_w_hv16_8_end_neon ret endfunc -#if HAVE_I8MM -ENABLE_I8MM - -function ff_hevc_put_hevc_qpel_uni_w_hv4_8_neon_i8mm, export=1 - QPEL_UNI_W_HV_HEADER 4 +.macro qpel_uni_w_hv suffix +function ff_hevc_put_hevc_qpel_uni_w_hv4_8_\suffix, export=1 + QPEL_UNI_W_HV_HEADER 4, \suffix b hevc_put_hevc_qpel_uni_w_hv4_8_end_neon endfunc -function ff_hevc_put_hevc_qpel_uni_w_hv8_8_neon_i8mm, export=1 - QPEL_UNI_W_HV_HEADER 8 +function ff_hevc_put_hevc_qpel_uni_w_hv8_8_\suffix, export=1 + QPEL_UNI_W_HV_HEADER 8, \suffix b hevc_put_hevc_qpel_uni_w_hv8_8_end_neon endfunc -function ff_hevc_put_hevc_qpel_uni_w_hv16_8_neon_i8mm, export=1 - QPEL_UNI_W_HV_HEADER 16 +function ff_hevc_put_hevc_qpel_uni_w_hv16_8_\suffix, export=1 + QPEL_UNI_W_HV_HEADER 16, \suffix b hevc_put_hevc_qpel_uni_w_hv16_8_end_neon endfunc -function ff_hevc_put_hevc_qpel_uni_w_hv32_8_neon_i8mm, export=1 - QPEL_UNI_W_HV_HEADER 32 +function ff_hevc_put_hevc_qpel_uni_w_hv32_8_\suffix, export=1 + QPEL_UNI_W_HV_HEADER 32, \suffix b hevc_put_hevc_qpel_uni_w_hv16_8_end_neon endfunc -function ff_hevc_put_hevc_qpel_uni_w_hv64_8_neon_i8mm, export=1 - QPEL_UNI_W_HV_HEADER 64 +function ff_hevc_put_hevc_qpel_uni_w_hv64_8_\suffix, export=1 + QPEL_UNI_W_HV_HEADER 64, \suffix b hevc_put_hevc_qpel_uni_w_hv16_8_end_neon endfunc +.endm + +qpel_uni_w_hv neon + +#if HAVE_I8MM +ENABLE_I8MM + +qpel_uni_w_hv neon_i8mm DISABLE_I8MM #endif _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
