History

aarch64: hevc: Produce epel_hv functions for both plain neon and i8mm

AWS Graviton 3: put_hevc_epel_hv4_8_c: 163.7 put_hevc_epel_hv4_8_neon: 52.5 put_hevc_epel_hv4_8_i8mm: 49.5 put_hevc_epel_hv6_8_c: 292.2 put_hevc_epel_hv6_8_neon: 97.7 put_hevc_epel_hv6_8_i8mm: 101.2 put_hevc_epel_hv8_8_c: 471.0 put_hevc_epel_hv8_8_neon: 106.7 put_hevc_epel_hv8_8_i8mm: 102.5 put_hevc_epel_hv12_8_c: 1030.2 put_hevc_epel_hv12_8_neon: 240.5 put_hevc_epel_hv12_8_i8mm: 215.0 put_hevc_epel_hv16_8_c: 1711.5 put_hevc_epel_hv16_8_neon: 340.2 put_hevc_epel_hv16_8_i8mm: 319.2 put_hevc_epel_hv24_8_c: 3670.0 put_hevc_epel_hv24_8_neon: 702.0 put_hevc_epel_hv24_8_i8mm: 666.5 put_hevc_epel_hv32_8_c: 6785.5 put_hevc_epel_hv32_8_neon: 1247.0 put_hevc_epel_hv32_8_i8mm: 1169.0 put_hevc_epel_hv48_8_c: 14689.7 put_hevc_epel_hv48_8_neon: 2665.2 put_hevc_epel_hv48_8_i8mm: 2740.0 put_hevc_epel_hv64_8_c: 25899.2 put_hevc_epel_hv64_8_neon: 4801.2 put_hevc_epel_hv64_8_i8mm: 4487.7

Martin Storsjö committed 2 years ago

Commit 7bf3d141 parent 5b5666e2 files · +38 −26Browse files

Unified · Split

2 files
  1. libavcodec/aarch64/hevcdsp_epel_neon.S +32 −26
  2. libavcodec/aarch64/hevcdsp_init_aarch64.c +6 −0
libavcodec/aarch64/hevcdsp_epel_neon.S+32−26
@@ -2298,10 +2298,8 @@ function hevc_put_hevc_epel_hv24_8_end_neon · 2297 unmodified lines
22982: ret22982: ret
2299endfunc2299endfunc
2300 2300
2301#if HAVE_I8MM2301.macro epel_hv suffix
2302ENABLE_I8MM2302function ff_hevc_put_hevc_epel_hv4_8_\suffix, export=1
2303
2304function ff_hevc_put_hevc_epel_hv4_8_neon_i8mm, export=1
2305 add w10, w3, #32303 add w10, w3, #3
2306 lsl x10, x10, #72304 lsl x10, x10, #7
2307 sub sp, sp, x10 // tmp_array2305 sub sp, sp, x10 // tmp_array
@@ -2310,13 +2308,13 @@ function ff_hevc_put_hevc_epel_hv4_8_neon_i8mm, export=1 · 2 unmodified lines
2310 add x0, sp, #322308 add x0, sp, #32
2311 sub x1, x1, x22309 sub x1, x1, x2
2312 add w3, w3, #32310 add w3, w3, #3
2313 bl X(ff_hevc_put_hevc_epel_h4_8_neon_i8mm)2311 bl X(ff_hevc_put_hevc_epel_h4_8_\suffix)
2314 ldp x0, x3, [sp, #16]2312 ldp x0, x3, [sp, #16]
2315 ldp x5, x30, [sp], #322313 ldp x5, x30, [sp], #32
2316 b hevc_put_hevc_epel_hv4_8_end_neon2314 b hevc_put_hevc_epel_hv4_8_end_neon
2317endfunc2315endfunc
2318 2316
2319function ff_hevc_put_hevc_epel_hv6_8_neon_i8mm, export=12317function ff_hevc_put_hevc_epel_hv6_8_\suffix, export=1
2320 add w10, w3, #32318 add w10, w3, #3
2321 lsl x10, x10, #72319 lsl x10, x10, #7
2322 sub sp, sp, x10 // tmp_array2320 sub sp, sp, x10 // tmp_array
@@ -2325,13 +2323,13 @@ function ff_hevc_put_hevc_epel_hv6_8_neon_i8mm, export=1 · 2 unmodified lines
2325 add x0, sp, #322323 add x0, sp, #32
2326 sub x1, x1, x22324 sub x1, x1, x2
2327 add w3, w3, #32325 add w3, w3, #3
2328 bl X(ff_hevc_put_hevc_epel_h6_8_neon_i8mm)2326 bl X(ff_hevc_put_hevc_epel_h6_8_\suffix)
2329 ldp x0, x3, [sp, #16]2327 ldp x0, x3, [sp, #16]
2330 ldp x5, x30, [sp], #322328 ldp x5, x30, [sp], #32
2331 b hevc_put_hevc_epel_hv6_8_end_neon2329 b hevc_put_hevc_epel_hv6_8_end_neon
2332endfunc2330endfunc
2333 2331
2334function ff_hevc_put_hevc_epel_hv8_8_neon_i8mm, export=12332function ff_hevc_put_hevc_epel_hv8_8_\suffix, export=1
2335 add w10, w3, #32333 add w10, w3, #3
2336 lsl x10, x10, #72334 lsl x10, x10, #7
2337 sub sp, sp, x10 // tmp_array2335 sub sp, sp, x10 // tmp_array
@@ -2340,13 +2338,13 @@ function ff_hevc_put_hevc_epel_hv8_8_neon_i8mm, export=1 · 2 unmodified lines
2340 add x0, sp, #322338 add x0, sp, #32
2341 sub x1, x1, x22339 sub x1, x1, x2
2342 add w3, w3, #32340 add w3, w3, #3
2343 bl X(ff_hevc_put_hevc_epel_h8_8_neon_i8mm)2341 bl X(ff_hevc_put_hevc_epel_h8_8_\suffix)
2344 ldp x0, x3, [sp, #16]2342 ldp x0, x3, [sp, #16]
2345 ldp x5, x30, [sp], #322343 ldp x5, x30, [sp], #32
2346 b hevc_put_hevc_epel_hv8_8_end_neon2344 b hevc_put_hevc_epel_hv8_8_end_neon
2347endfunc2345endfunc
2348 2346
2349function ff_hevc_put_hevc_epel_hv12_8_neon_i8mm, export=12347function ff_hevc_put_hevc_epel_hv12_8_\suffix, export=1
2350 add w10, w3, #32348 add w10, w3, #3
2351 lsl x10, x10, #72349 lsl x10, x10, #7
2352 sub sp, sp, x10 // tmp_array2350 sub sp, sp, x10 // tmp_array
@@ -2355,13 +2353,13 @@ function ff_hevc_put_hevc_epel_hv12_8_neon_i8mm, export=1 · 2 unmodified lines
2355 add x0, sp, #322353 add x0, sp, #32
2356 sub x1, x1, x22354 sub x1, x1, x2
2357 add w3, w3, #32355 add w3, w3, #3
2358 bl X(ff_hevc_put_hevc_epel_h12_8_neon_i8mm)2356 bl X(ff_hevc_put_hevc_epel_h12_8_\suffix)
2359 ldp x0, x3, [sp, #16]2357 ldp x0, x3, [sp, #16]
2360 ldp x5, x30, [sp], #322358 ldp x5, x30, [sp], #32
2361 b hevc_put_hevc_epel_hv12_8_end_neon2359 b hevc_put_hevc_epel_hv12_8_end_neon
2362endfunc2360endfunc
2363 2361
2364function ff_hevc_put_hevc_epel_hv16_8_neon_i8mm, export=12362function ff_hevc_put_hevc_epel_hv16_8_\suffix, export=1
2365 add w10, w3, #32363 add w10, w3, #3
2366 lsl x10, x10, #72364 lsl x10, x10, #7
2367 sub sp, sp, x10 // tmp_array2365 sub sp, sp, x10 // tmp_array
@@ -2370,13 +2368,13 @@ function ff_hevc_put_hevc_epel_hv16_8_neon_i8mm, export=1 · 2 unmodified lines
2370 add x0, sp, #322368 add x0, sp, #32
2371 sub x1, x1, x22369 sub x1, x1, x2
2372 add w3, w3, #32370 add w3, w3, #3
2373 bl X(ff_hevc_put_hevc_epel_h16_8_neon_i8mm)2371 bl X(ff_hevc_put_hevc_epel_h16_8_\suffix)
2374 ldp x0, x3, [sp, #16]2372 ldp x0, x3, [sp, #16]
2375 ldp x5, x30, [sp], #322373 ldp x5, x30, [sp], #32
2376 b hevc_put_hevc_epel_hv16_8_end_neon2374 b hevc_put_hevc_epel_hv16_8_end_neon
2377endfunc2375endfunc
2378 2376
2379function ff_hevc_put_hevc_epel_hv24_8_neon_i8mm, export=12377function ff_hevc_put_hevc_epel_hv24_8_\suffix, export=1
2380 add w10, w3, #32378 add w10, w3, #3
2381 lsl x10, x10, #72379 lsl x10, x10, #7
2382 sub sp, sp, x10 // tmp_array2380 sub sp, sp, x10 // tmp_array
@@ -2385,79 +2383,87 @@ function ff_hevc_put_hevc_epel_hv24_8_neon_i8mm, export=1 · 2 unmodified lines
2385 add x0, sp, #322383 add x0, sp, #32
2386 sub x1, x1, x22384 sub x1, x1, x2
2387 add w3, w3, #32385 add w3, w3, #3
2388 bl X(ff_hevc_put_hevc_epel_h24_8_neon_i8mm)2386 bl X(ff_hevc_put_hevc_epel_h24_8_\suffix)
2389 ldp x0, x3, [sp, #16]2387 ldp x0, x3, [sp, #16]
2390 ldp x5, x30, [sp], #322388 ldp x5, x30, [sp], #32
2391 b hevc_put_hevc_epel_hv24_8_end_neon2389 b hevc_put_hevc_epel_hv24_8_end_neon
2392endfunc2390endfunc
2393 2391
2394function ff_hevc_put_hevc_epel_hv32_8_neon_i8mm, export=12392function ff_hevc_put_hevc_epel_hv32_8_\suffix, export=1
2395 stp x4, x5, [sp, #-64]!2393 stp x4, x5, [sp, #-64]!
2396 stp x2, x3, [sp, #16]2394 stp x2, x3, [sp, #16]
2397 stp x0, x1, [sp, #32]2395 stp x0, x1, [sp, #32]
2398 str x30, [sp, #48]2396 str x30, [sp, #48]
2399 mov x6, #162397 mov x6, #16
2400 bl X(ff_hevc_put_hevc_epel_hv16_8_neon_i8mm)2398 bl X(ff_hevc_put_hevc_epel_hv16_8_\suffix)
2401 ldp x0, x1, [sp, #32]2399 ldp x0, x1, [sp, #32]
2402 ldp x2, x3, [sp, #16]2400 ldp x2, x3, [sp, #16]
2403 ldp x4, x5, [sp], #482401 ldp x4, x5, [sp], #48
2404 add x0, x0, #322402 add x0, x0, #32
2405 add x1, x1, #162403 add x1, x1, #16
2406 mov x6, #162404 mov x6, #16
2407 bl X(ff_hevc_put_hevc_epel_hv16_8_neon_i8mm)2405 bl X(ff_hevc_put_hevc_epel_hv16_8_\suffix)
2408 ldr x30, [sp], #162406 ldr x30, [sp], #16
2409 ret2407 ret
2410endfunc2408endfunc
2411 2409
2412function ff_hevc_put_hevc_epel_hv48_8_neon_i8mm, export=12410function ff_hevc_put_hevc_epel_hv48_8_\suffix, export=1
2413 stp x4, x5, [sp, #-64]!2411 stp x4, x5, [sp, #-64]!
2414 stp x2, x3, [sp, #16]2412 stp x2, x3, [sp, #16]
2415 stp x0, x1, [sp, #32]2413 stp x0, x1, [sp, #32]
2416 str x30, [sp, #48]2414 str x30, [sp, #48]
2417 mov x6, #242415 mov x6, #24
2418 bl X(ff_hevc_put_hevc_epel_hv24_8_neon_i8mm)2416 bl X(ff_hevc_put_hevc_epel_hv24_8_\suffix)
2419 ldp x0, x1, [sp, #32]2417 ldp x0, x1, [sp, #32]
2420 ldp x2, x3, [sp, #16]2418 ldp x2, x3, [sp, #16]
2421 ldp x4, x5, [sp], #482419 ldp x4, x5, [sp], #48
2422 add x0, x0, #482420 add x0, x0, #48
2423 add x1, x1, #242421 add x1, x1, #24
2424 mov x6, #242422 mov x6, #24
2425 bl X(ff_hevc_put_hevc_epel_hv24_8_neon_i8mm)2423 bl X(ff_hevc_put_hevc_epel_hv24_8_\suffix)
2426 ldr x30, [sp], #162424 ldr x30, [sp], #16
2427 ret2425 ret
2428endfunc2426endfunc
2429 2427
2430function ff_hevc_put_hevc_epel_hv64_8_neon_i8mm, export=12428function ff_hevc_put_hevc_epel_hv64_8_\suffix, export=1
2431 stp x4, x5, [sp, #-64]!2429 stp x4, x5, [sp, #-64]!
2432 stp x2, x3, [sp, #16]2430 stp x2, x3, [sp, #16]
2433 stp x0, x1, [sp, #32]2431 stp x0, x1, [sp, #32]
2434 str x30, [sp, #48]2432 str x30, [sp, #48]
2435 mov x6, #162433 mov x6, #16
2436 bl X(ff_hevc_put_hevc_epel_hv16_8_neon_i8mm)2434 bl X(ff_hevc_put_hevc_epel_hv16_8_\suffix)
2437 ldp x4, x5, [sp]2435 ldp x4, x5, [sp]
2438 ldp x2, x3, [sp, #16]2436 ldp x2, x3, [sp, #16]
2439 ldp x0, x1, [sp, #32]2437 ldp x0, x1, [sp, #32]
2440 add x0, x0, #322438 add x0, x0, #32
2441 add x1, x1, #162439 add x1, x1, #16
2442 mov x6, #162440 mov x6, #16
2443 bl X(ff_hevc_put_hevc_epel_hv16_8_neon_i8mm)2441 bl X(ff_hevc_put_hevc_epel_hv16_8_\suffix)
2444 ldp x4, x5, [sp]2442 ldp x4, x5, [sp]
2445 ldp x2, x3, [sp, #16]2443 ldp x2, x3, [sp, #16]
2446 ldp x0, x1, [sp, #32]2444 ldp x0, x1, [sp, #32]
2447 add x0, x0, #642445 add x0, x0, #64
2448 add x1, x1, #322446 add x1, x1, #32
2449 mov x6, #162447 mov x6, #16
2450 bl X(ff_hevc_put_hevc_epel_hv16_8_neon_i8mm)2448 bl X(ff_hevc_put_hevc_epel_hv16_8_\suffix)
2451 ldp x0, x1, [sp, #32]2449 ldp x0, x1, [sp, #32]
2452 ldp x2, x3, [sp, #16]2450 ldp x2, x3, [sp, #16]
2453 ldp x4, x5, [sp], #482451 ldp x4, x5, [sp], #48
2454 add x0, x0, #962452 add x0, x0, #96
2455 add x1, x1, #482453 add x1, x1, #48
2456 mov x6, #162454 mov x6, #16
2457 bl X(ff_hevc_put_hevc_epel_hv16_8_neon_i8mm)2455 bl X(ff_hevc_put_hevc_epel_hv16_8_\suffix)
2458 ldr x30, [sp], #162456 ldr x30, [sp], #16
2459 ret2457 ret
2460endfunc2458endfunc
2459.endm
2460
2461epel_hv neon
2462
2463#if HAVE_I8MM
2464ENABLE_I8MM
2465
2466epel_hv neon_i8mm
2461 2467
2462DISABLE_I8MM2468DISABLE_I8MM
2463#endif2469#endif
libavcodec/aarch64/hevcdsp_init_aarch64.c+6−0
@@ -227,6 +227,10 @@ NEON8_FNPROTO(epel_h, (int16_t *dst, · 226 unmodified lines
227 const uint8_t *_src, ptrdiff_t _srcstride,227 const uint8_t *_src, ptrdiff_t _srcstride,
228 int height, intptr_t mx, intptr_t my, int width),);228 int height, intptr_t mx, intptr_t my, int width),);
229 229
230NEON8_FNPROTO(epel_hv, (int16_t *dst,
231 const uint8_t *src, ptrdiff_t srcstride,
232 int height, intptr_t mx, intptr_t my, int width), );
233
230NEON8_FNPROTO(epel_h, (int16_t *dst,234NEON8_FNPROTO(epel_h, (int16_t *dst,
231 const uint8_t *_src, ptrdiff_t _srcstride,235 const uint8_t *_src, ptrdiff_t _srcstride,
232 int height, intptr_t mx, intptr_t my, int width), _i8mm);236 int height, intptr_t mx, intptr_t my, int width), _i8mm);
@@ -407,6 +411,8 @@ av_cold void ff_hevc_dsp_init_aarch64(HEVCDSPContext *c, const int bit_depth) · 174 unmodified lines
407 NEON8_FNASSIGN_SHARED_32(c->put_hevc_epel, 0, 1, epel_h,);411 NEON8_FNASSIGN_SHARED_32(c->put_hevc_epel, 0, 1, epel_h,);
408 NEON8_FNASSIGN_SHARED_32(c->put_hevc_epel_uni_w, 0, 1, epel_uni_w_h,);412 NEON8_FNASSIGN_SHARED_32(c->put_hevc_epel_uni_w, 0, 1, epel_uni_w_h,);
409 413
414 NEON8_FNASSIGN(c->put_hevc_epel, 1, 1, epel_hv,);
415
410 if (have_i8mm(cpu_flags)) {416 if (have_i8mm(cpu_flags)) {
411 NEON8_FNASSIGN(c->put_hevc_epel, 0, 1, epel_h, _i8mm);417 NEON8_FNASSIGN(c->put_hevc_epel, 0, 1, epel_h, _i8mm);
412 NEON8_FNASSIGN(c->put_hevc_epel, 1, 1, epel_hv, _i8mm);418 NEON8_FNASSIGN(c->put_hevc_epel, 1, 1, epel_hv, _i8mm);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t