History

aarch64: hevc: Deduplicate the hevc_put_hevc_qpel_uni_w_hv*_8_end_neon functions

The hv32 and hv64 functions were identical - both loop and process 16 pixels at a time. The hv16 function was near identical, except for the outer loop (and using sp instead of a separate register). Given the size of these functions, the extra cost of the outer loop is negligible, so use the same function for hv16 as well. This removes over 200 lines of duplicated assembly, and over 4 KB of binary size.

Martin Storsjö committed 2 years ago

Commit 4f71e4e1 parent 4063e501 file · +3 −217Browse files

Showing the changes to libavcodec (1 of 1 file). Show all

Unified · Split

libavcodec/aarch64/hevcdsp_qpel_neon.S+3−217
@@ -4381,231 +4381,17 @@ function ff_hevc_put_hevc_qpel_uni_w_hv16_8_neon_i8mm, export=1 · 4380 unmodified lines
4381 b hevc_put_hevc_qpel_uni_w_hv16_8_end_neon4381 b hevc_put_hevc_qpel_uni_w_hv16_8_end_neon
4382endfunc4382endfunc
4383 4383
4384function hevc_put_hevc_qpel_uni_w_hv16_8_end_neon
4385 ldp q16, q1, [sp]
4386 add sp, sp, x10
4387 ldp q17, q2, [sp]
4388 add sp, sp, x10
4389 ldp q18, q3, [sp]
4390 add sp, sp, x10
4391 ldp q19, q4, [sp]
4392 add sp, sp, x10
4393 ldp q20, q5, [sp]
4394 add sp, sp, x10
4395 ldp q21, q6, [sp]
4396 add sp, sp, x10
4397 ldp q22, q7, [sp]
4398 add sp, sp, x10
43991:
4400 ldp q23, q31, [sp]
4401 add sp, sp, x10
4402 QPEL_FILTER_H v24, v16, v17, v18, v19, v20, v21, v22, v23
4403 QPEL_FILTER_H2 v25, v16, v17, v18, v19, v20, v21, v22, v23
4404 QPEL_FILTER_H v26, v1, v2, v3, v4, v5, v6, v7, v31
4405 QPEL_FILTER_H2 v27, v1, v2, v3, v4, v5, v6, v7, v31
4406 QPEL_UNI_W_HV_16
4407 subs w22, w22, #1
4408 b.eq 2f
4409
4410 ldp q16, q1, [sp]
4411 add sp, sp, x10
4412 QPEL_FILTER_H v24, v17, v18, v19, v20, v21, v22, v23, v16
4413 QPEL_FILTER_H2 v25, v17, v18, v19, v20, v21, v22, v23, v16
4414 QPEL_FILTER_H v26, v2, v3, v4, v5, v6, v7, v31, v1
4415 QPEL_FILTER_H2 v27, v2, v3, v4, v5, v6, v7, v31, v1
4416 QPEL_UNI_W_HV_16
4417 subs w22, w22, #1
4418 b.eq 2f
4419
4420 ldp q17, q2, [sp]
4421 add sp, sp, x10
4422 QPEL_FILTER_H v24, v18, v19, v20, v21, v22, v23, v16, v17
4423 QPEL_FILTER_H2 v25, v18, v19, v20, v21, v22, v23, v16, v17
4424 QPEL_FILTER_H v26, v3, v4, v5, v6, v7, v31, v1, v2
4425 QPEL_FILTER_H2 v27, v3, v4, v5, v6, v7, v31, v1, v2
4426 QPEL_UNI_W_HV_16
4427 subs w22, w22, #1
4428 b.eq 2f
4429
4430 ldp q18, q3, [sp]
4431 add sp, sp, x10
4432 QPEL_FILTER_H v24, v19, v20, v21, v22, v23, v16, v17, v18
4433 QPEL_FILTER_H2 v25, v19, v20, v21, v22, v23, v16, v17, v18
4434 QPEL_FILTER_H v26, v4, v5, v6, v7, v31, v1, v2, v3
4435 QPEL_FILTER_H2 v27, v4, v5, v6, v7, v31, v1, v2, v3
4436 QPEL_UNI_W_HV_16
4437 subs w22, w22, #1
4438 b.eq 2f
4439
4440 ldp q19, q4, [sp]
4441 add sp, sp, x10
4442 QPEL_FILTER_H v24, v20, v21, v22, v23, v16, v17, v18, v19
4443 QPEL_FILTER_H2 v25, v20, v21, v22, v23, v16, v17, v18, v19
4444 QPEL_FILTER_H v26, v5, v6, v7, v31, v1, v2, v3, v4
4445 QPEL_FILTER_H2 v27, v5, v6, v7, v31, v1, v2, v3, v4
4446 QPEL_UNI_W_HV_16
4447 subs w22, w22, #1
4448 b.eq 2f
4449
4450 ldp q20, q5, [sp]
4451 add sp, sp, x10
4452 QPEL_FILTER_H v24, v21, v22, v23, v16, v17, v18, v19, v20
4453 QPEL_FILTER_H2 v25, v21, v22, v23, v16, v17, v18, v19, v20
4454 QPEL_FILTER_H v26, v6, v7, v31, v1, v2, v3, v4, v5
4455 QPEL_FILTER_H2 v27, v6, v7, v31, v1, v2, v3, v4, v5
4456 QPEL_UNI_W_HV_16
4457 subs w22, w22, #1
4458 b.eq 2f
4459
4460 ldp q21, q6, [sp]
4461 add sp, sp, x10
4462 QPEL_FILTER_H v24, v22, v23, v16, v17, v18, v19, v20, v21
4463 QPEL_FILTER_H2 v25, v22, v23, v16, v17, v18, v19, v20, v21
4464 QPEL_FILTER_H v26, v7, v31, v1, v2, v3, v4, v5, v6
4465 QPEL_FILTER_H2 v27, v7, v31, v1, v2, v3, v4, v5, v6
4466 QPEL_UNI_W_HV_16
4467 subs w22, w22, #1
4468 b.eq 2f
4469
4470 ldp q22, q7, [sp]
4471 add sp, sp, x10
4472 QPEL_FILTER_H v24, v23, v16, v17, v18, v19, v20, v21, v22
4473 QPEL_FILTER_H2 v25, v23, v16, v17, v18, v19, v20, v21, v22
4474 QPEL_FILTER_H v26, v31, v1, v2, v3, v4, v5, v6, v7
4475 QPEL_FILTER_H2 v27, v31, v1, v2, v3, v4, v5, v6, v7
4476 QPEL_UNI_W_HV_16
4477 subs w22, w22, #1
4478 b.hi 1b
4479
44802:
4481 QPEL_UNI_W_HV_END
4482 ret
4483endfunc
4484
4485
4486function ff_hevc_put_hevc_qpel_uni_w_hv32_8_neon_i8mm, export=14384function ff_hevc_put_hevc_qpel_uni_w_hv32_8_neon_i8mm, export=1
4487 QPEL_UNI_W_HV_HEADER 324385 QPEL_UNI_W_HV_HEADER 32
4488 b hevc_put_hevc_qpel_uni_w_hv32_8_end_neon4386 b hevc_put_hevc_qpel_uni_w_hv16_8_end_neon
4489endfunc
4490
4491function hevc_put_hevc_qpel_uni_w_hv32_8_end_neon
4492 mov x11, sp
4493 mov w12, w22
4494 mov x13, x20
4495 mov x14, sp
44963:
4497 ldp q16, q1, [x11]
4498 add x11, x11, x10
4499 ldp q17, q2, [x11]
4500 add x11, x11, x10
4501 ldp q18, q3, [x11]
4502 add x11, x11, x10
4503 ldp q19, q4, [x11]
4504 add x11, x11, x10
4505 ldp q20, q5, [x11]
4506 add x11, x11, x10
4507 ldp q21, q6, [x11]
4508 add x11, x11, x10
4509 ldp q22, q7, [x11]
4510 add x11, x11, x10
45111:
4512 ldp q23, q31, [x11]
4513 add x11, x11, x10
4514 QPEL_FILTER_H v24, v16, v17, v18, v19, v20, v21, v22, v23
4515 QPEL_FILTER_H2 v25, v16, v17, v18, v19, v20, v21, v22, v23
4516 QPEL_FILTER_H v26, v1, v2, v3, v4, v5, v6, v7, v31
4517 QPEL_FILTER_H2 v27, v1, v2, v3, v4, v5, v6, v7, v31
4518 QPEL_UNI_W_HV_16
4519 subs w22, w22, #1
4520 b.eq 2f
4521
4522 ldp q16, q1, [x11]
4523 add x11, x11, x10
4524 QPEL_FILTER_H v24, v17, v18, v19, v20, v21, v22, v23, v16
4525 QPEL_FILTER_H2 v25, v17, v18, v19, v20, v21, v22, v23, v16
4526 QPEL_FILTER_H v26, v2, v3, v4, v5, v6, v7, v31, v1
4527 QPEL_FILTER_H2 v27, v2, v3, v4, v5, v6, v7, v31, v1
4528 QPEL_UNI_W_HV_16
4529 subs w22, w22, #1
4530 b.eq 2f
4531
4532 ldp q17, q2, [x11]
4533 add x11, x11, x10
4534 QPEL_FILTER_H v24, v18, v19, v20, v21, v22, v23, v16, v17
4535 QPEL_FILTER_H2 v25, v18, v19, v20, v21, v22, v23, v16, v17
4536 QPEL_FILTER_H v26, v3, v4, v5, v6, v7, v31, v1, v2
4537 QPEL_FILTER_H2 v27, v3, v4, v5, v6, v7, v31, v1, v2
4538 QPEL_UNI_W_HV_16
4539 subs w22, w22, #1
4540 b.eq 2f
4541
4542 ldp q18, q3, [x11]
4543 add x11, x11, x10
4544 QPEL_FILTER_H v24, v19, v20, v21, v22, v23, v16, v17, v18
4545 QPEL_FILTER_H2 v25, v19, v20, v21, v22, v23, v16, v17, v18
4546 QPEL_FILTER_H v26, v4, v5, v6, v7, v31, v1, v2, v3
4547 QPEL_FILTER_H2 v27, v4, v5, v6, v7, v31, v1, v2, v3
4548 QPEL_UNI_W_HV_16
4549 subs w22, w22, #1
4550 b.eq 2f
4551
4552 ldp q19, q4, [x11]
4553 add x11, x11, x10
4554 QPEL_FILTER_H v24, v20, v21, v22, v23, v16, v17, v18, v19
4555 QPEL_FILTER_H2 v25, v20, v21, v22, v23, v16, v17, v18, v19
4556 QPEL_FILTER_H v26, v5, v6, v7, v31, v1, v2, v3, v4
4557 QPEL_FILTER_H2 v27, v5, v6, v7, v31, v1, v2, v3, v4
4558 QPEL_UNI_W_HV_16
4559 subs w22, w22, #1
4560 b.eq 2f
4561
4562 ldp q20, q5, [x11]
4563 add x11, x11, x10
4564 QPEL_FILTER_H v24, v21, v22, v23, v16, v17, v18, v19, v20
4565 QPEL_FILTER_H2 v25, v21, v22, v23, v16, v17, v18, v19, v20
4566 QPEL_FILTER_H v26, v6, v7, v31, v1, v2, v3, v4, v5
4567 QPEL_FILTER_H2 v27, v6, v7, v31, v1, v2, v3, v4, v5
4568 QPEL_UNI_W_HV_16
4569 subs w22, w22, #1
4570 b.eq 2f
4571
4572 ldp q21, q6, [x11]
4573 add x11, x11, x10
4574 QPEL_FILTER_H v24, v22, v23, v16, v17, v18, v19, v20, v21
4575 QPEL_FILTER_H2 v25, v22, v23, v16, v17, v18, v19, v20, v21
4576 QPEL_FILTER_H v26, v7, v31, v1, v2, v3, v4, v5, v6
4577 QPEL_FILTER_H2 v27, v7, v31, v1, v2, v3, v4, v5, v6
4578 QPEL_UNI_W_HV_16
4579 subs w22, w22, #1
4580 b.eq 2f
4581
4582 ldp q22, q7, [x11]
4583 add x11, x11, x10
4584 QPEL_FILTER_H v24, v23, v16, v17, v18, v19, v20, v21, v22
4585 QPEL_FILTER_H2 v25, v23, v16, v17, v18, v19, v20, v21, v22
4586 QPEL_FILTER_H v26, v31, v1, v2, v3, v4, v5, v6, v7
4587 QPEL_FILTER_H2 v27, v31, v1, v2, v3, v4, v5, v6, v7
4588 QPEL_UNI_W_HV_16
4589 subs w22, w22, #1
4590 b.hi 1b
45912:
4592 subs w27, w27, #16
4593 add x11, x14, #32
4594 add x20, x13, #16
4595 mov w22, w12
4596 mov x14, x11
4597 mov x13, x20
4598 b.hi 3b
4599 QPEL_UNI_W_HV_END
4600 ret
4601endfunc4387endfunc
4602 4388
4603function ff_hevc_put_hevc_qpel_uni_w_hv64_8_neon_i8mm, export=14389function ff_hevc_put_hevc_qpel_uni_w_hv64_8_neon_i8mm, export=1
4604 QPEL_UNI_W_HV_HEADER 644390 QPEL_UNI_W_HV_HEADER 64
4605 b hevc_put_hevc_qpel_uni_w_hv64_8_end_neon4391 b hevc_put_hevc_qpel_uni_w_hv16_8_end_neon
4606endfunc4392endfunc
4607 4393
4608function hevc_put_hevc_qpel_uni_w_hv64_8_end_neon4394function hevc_put_hevc_qpel_uni_w_hv16_8_end_neon
4609 mov x11, sp4395 mov x11, sp
4610 mov w12, w224396 mov w12, w22
4611 mov x13, x204397 mov x13, x20

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