History

aarch64: hevc: Split the qpel_*_hv functions into two parts

The first horizontal filter can use either i8mm or plain neon versions, while the second part is a pure neon implementation.

Martin Storsjö committed 2 years ago

Commit 4063e501 parent ad01d061 file · +86 −8Browse files

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

Unified · Split

libavcodec/aarch64/hevcdsp_qpel_neon.S+86−8
@@ -2166,6 +2166,10 @@ function ff_hevc_put_hevc_qpel_uni_hv4_8_neon_i8mm, export=1 · 2165 unmodified lines
21662166 ldp x4, x6, [sp, #16]
21672167 ldp x0, x1, [sp, #32]
21682168 ldr x30, [sp], #48
2169+ b hevc_put_hevc_qpel_uni_hv4_8_end_neon
2170+endfunc
2171+
2172+function hevc_put_hevc_qpel_uni_hv4_8_end_neon
21692173 mov x9, #(MAX_PB_SIZE * 2)
21702174 load_qpel_filterh x6, x5
21712175 ldr d16, [sp]
@@ -2208,6 +2212,10 @@ function ff_hevc_put_hevc_qpel_uni_hv6_8_neon_i8mm, export=1 · 36 unmodified lines
22082212 ldp x4, x6, [sp, #16]
22092213 ldp x0, x1, [sp, #32]
22102214 ldr x30, [sp], #48
2215+ b hevc_put_hevc_qpel_uni_hv6_8_end_neon
2216+endfunc
2217+
2218+function hevc_put_hevc_qpel_uni_hv6_8_end_neon
22112219 mov x9, #(MAX_PB_SIZE * 2)
22122220 load_qpel_filterh x6, x5
22132221 sub x1, x1, #4
@@ -2253,6 +2261,10 @@ function ff_hevc_put_hevc_qpel_uni_hv8_8_neon_i8mm, export=1 · 39 unmodified lines
22532261 ldp x4, x6, [sp, #16]
22542262 ldp x0, x1, [sp, #32]
22552263 ldr x30, [sp], #48
2264+ b hevc_put_hevc_qpel_uni_hv8_8_end_neon
2265+endfunc
2266+
2267+function hevc_put_hevc_qpel_uni_hv8_8_end_neon
22562268 mov x9, #(MAX_PB_SIZE * 2)
22572269 load_qpel_filterh x6, x5
22582270 ldr q16, [sp]
@@ -2296,6 +2308,10 @@ function ff_hevc_put_hevc_qpel_uni_hv12_8_neon_i8mm, export=1 · 37 unmodified lines
22962308 ldp x4, x6, [sp, #16]
22972309 ldp x0, x1, [sp, #32]
22982310 ldp x7, x30, [sp], #48
2311+ b hevc_put_hevc_qpel_uni_hv12_8_end_neon
2312+endfunc
2313+
2314+function hevc_put_hevc_qpel_uni_hv12_8_end_neon
22992315 mov x9, #(MAX_PB_SIZE * 2)
23002316 load_qpel_filterh x6, x5
23012317 sub x1, x1, #8
@@ -2339,7 +2355,10 @@ function ff_hevc_put_hevc_qpel_uni_hv16_8_neon_i8mm, export=1 · 37 unmodified lines
23392355 ldp x4, x6, [sp, #16]
23402356 ldp x0, x1, [sp, #32]
23412357 ldp x7, x30, [sp], #48
2342−.Lqpel_uni_hv16_loop:
2358+ b hevc_put_hevc_qpel_uni_hv16_8_end_neon
2359+endfunc
2360+
2361+function hevc_put_hevc_qpel_uni_hv16_8_end_neon
23432362 mov x9, #(MAX_PB_SIZE * 2)
23442363 load_qpel_filterh x6, x5
23452364 sub w12, w9, w7, lsl #1
@@ -2414,7 +2433,7 @@ function ff_hevc_put_hevc_qpel_uni_hv32_8_neon_i8mm, export=1 · 68 unmodified lines
24142433 ldp x4, x6, [sp, #16]
24152434 ldp x0, x1, [sp, #32]
24162435 ldp x7, x30, [sp], #48
2417− b .Lqpel_uni_hv16_loop
2436+ b hevc_put_hevc_qpel_uni_hv16_8_end_neon
24182437 endfunc
24192438
24202439 function ff_hevc_put_hevc_qpel_uni_hv48_8_neon_i8mm, export=1
@@ -2434,7 +2453,7 @@ function ff_hevc_put_hevc_qpel_uni_hv48_8_neon_i8mm, export=1 · 13 unmodified lines
24342453 ldp x4, x6, [sp, #16]
24352454 ldp x0, x1, [sp, #32]
24362455 ldp x7, x30, [sp], #48
2437− b .Lqpel_uni_hv16_loop
2456+ b hevc_put_hevc_qpel_uni_hv16_8_end_neon
24382457 endfunc
24392458
24402459 function ff_hevc_put_hevc_qpel_uni_hv64_8_neon_i8mm, export=1
@@ -2454,7 +2473,7 @@ function ff_hevc_put_hevc_qpel_uni_hv64_8_neon_i8mm, export=1 · 13 unmodified lines
24542473 ldp x4, x6, [sp, #16]
24552474 ldp x0, x1, [sp, #32]
24562475 ldp x7, x30, [sp], #48
2457− b .Lqpel_uni_hv16_loop
2476+ b hevc_put_hevc_qpel_uni_hv16_8_end_neon
24582477 endfunc
24592478 DISABLE_I8MM
24602479 #endif
@@ -3776,6 +3795,10 @@ function ff_hevc_put_hevc_qpel_hv4_8_neon_i8mm, export=1 · 1315 unmodified lines
37763795 bl X(ff_hevc_put_hevc_qpel_h4_8_neon_i8mm)
37773796 ldp x0, x3, [sp, #16]
37783797 ldp x5, x30, [sp], #32
3798+ b hevc_put_hevc_qpel_hv4_8_end_neon
3799+endfunc
3800+
3801+function hevc_put_hevc_qpel_hv4_8_end_neon
37793802 load_qpel_filterh x5, x4
37803803 ldr d16, [sp]
37813804 ldr d17, [sp, x7]
@@ -3813,6 +3836,10 @@ function ff_hevc_put_hevc_qpel_hv6_8_neon_i8mm, export=1 · 31 unmodified lines
38133836 bl X(ff_hevc_put_hevc_qpel_h6_8_neon_i8mm)
38143837 ldp x0, x3, [sp, #16]
38153838 ldp x5, x30, [sp], #32
3839+ b hevc_put_hevc_qpel_hv6_8_end_neon
3840+endfunc
3841+
3842+function hevc_put_hevc_qpel_hv6_8_end_neon
38163843 mov x8, #120
38173844 load_qpel_filterh x5, x4
38183845 ldr q16, [sp]
@@ -3852,6 +3879,10 @@ function ff_hevc_put_hevc_qpel_hv8_8_neon_i8mm, export=1 · 33 unmodified lines
38523879 bl X(ff_hevc_put_hevc_qpel_h8_8_neon_i8mm)
38533880 ldp x0, x3, [sp, #16]
38543881 ldp x5, x30, [sp], #32
3882+ b hevc_put_hevc_qpel_hv8_8_end_neon
3883+endfunc
3884+
3885+function hevc_put_hevc_qpel_hv8_8_end_neon
38553886 mov x7, #128
38563887 load_qpel_filterh x5, x4
38573888 ldr q16, [sp]
@@ -3890,6 +3921,10 @@ function ff_hevc_put_hevc_qpel_hv12_8_neon_i8mm, export=1 · 32 unmodified lines
38903921 bl X(ff_hevc_put_hevc_qpel_h12_8_neon_i8mm)
38913922 ldp x0, x3, [sp, #16]
38923923 ldp x5, x30, [sp], #32
3924+ b hevc_put_hevc_qpel_hv12_8_end_neon
3925+endfunc
3926+
3927+function hevc_put_hevc_qpel_hv12_8_end_neon
38933928 mov x7, #128
38943929 load_qpel_filterh x5, x4
38953930 mov x8, #112
@@ -3927,6 +3962,10 @@ function ff_hevc_put_hevc_qpel_hv16_8_neon_i8mm, export=1 · 31 unmodified lines
39273962 bl X(ff_hevc_put_hevc_qpel_h16_8_neon_i8mm)
39283963 ldp x0, x3, [sp, #16]
39293964 ldp x5, x30, [sp], #32
3965+ b hevc_put_hevc_qpel_hv16_8_end_neon
3966+endfunc
3967+
3968+function hevc_put_hevc_qpel_hv16_8_end_neon
39303969 mov x7, #128
39313970 load_qpel_filterh x5, x4
39323971 ld1 {v16.8h, v17.8h}, [sp], x7
@@ -3979,6 +4018,10 @@ function ff_hevc_put_hevc_qpel_hv32_8_neon_i8mm, export=1 · 46 unmodified lines
39794018 bl X(ff_hevc_put_hevc_qpel_h32_8_neon_i8mm)
39804019 ldp x0, x3, [sp, #16]
39814020 ldp x5, x30, [sp], #32
4021+ b hevc_put_hevc_qpel_hv32_8_end_neon
4022+endfunc
4023+
4024+function hevc_put_hevc_qpel_hv32_8_end_neon
39824025 mov x7, #128
39834026 load_qpel_filterh x5, x4
39844027 0: mov x8, sp // src
@@ -4127,6 +4170,10 @@ endfunc · 142 unmodified lines
41274170
41284171 function ff_hevc_put_hevc_qpel_uni_w_hv4_8_neon_i8mm, export=1
41294172 QPEL_UNI_W_HV_HEADER 4
4173+ b hevc_put_hevc_qpel_uni_w_hv4_8_end_neon
4174+endfunc
4175+
4176+function hevc_put_hevc_qpel_uni_w_hv4_8_end_neon
41304177 ldr d16, [sp]
41314178 ldr d17, [sp, x10]
41324179 add sp, sp, x10, lsl #1
@@ -4217,6 +4264,10 @@ endfunc · 84 unmodified lines
42174264
42184265 function ff_hevc_put_hevc_qpel_uni_w_hv8_8_neon_i8mm, export=1
42194266 QPEL_UNI_W_HV_HEADER 8
4267+ b hevc_put_hevc_qpel_uni_w_hv8_8_end_neon
4268+endfunc
4269+
4270+function hevc_put_hevc_qpel_uni_w_hv8_8_end_neon
42204271 ldr q16, [sp]
42214272 ldr q17, [sp, x10]
42224273 add sp, sp, x10, lsl #1
@@ -4327,6 +4378,10 @@ endfunc · 104 unmodified lines
43274378
43284379 function ff_hevc_put_hevc_qpel_uni_w_hv16_8_neon_i8mm, export=1
43294380 QPEL_UNI_W_HV_HEADER 16
4381+ b hevc_put_hevc_qpel_uni_w_hv16_8_end_neon
4382+endfunc
4383+
4384+function hevc_put_hevc_qpel_uni_w_hv16_8_end_neon
43304385 ldp q16, q1, [sp]
43314386 add sp, sp, x10
43324387 ldp q17, q2, [sp]
@@ -4430,6 +4485,10 @@ endfunc · 97 unmodified lines
44304485
44314486 function ff_hevc_put_hevc_qpel_uni_w_hv32_8_neon_i8mm, export=1
44324487 QPEL_UNI_W_HV_HEADER 32
4488+ b hevc_put_hevc_qpel_uni_w_hv32_8_end_neon
4489+endfunc
4490+
4491+function hevc_put_hevc_qpel_uni_w_hv32_8_end_neon
44334492 mov x11, sp
44344493 mov w12, w22
44354494 mov x13, x20
@@ -4543,6 +4602,10 @@ endfunc · 107 unmodified lines
45434602
45444603 function ff_hevc_put_hevc_qpel_uni_w_hv64_8_neon_i8mm, export=1
45454604 QPEL_UNI_W_HV_HEADER 64
4605+ b hevc_put_hevc_qpel_uni_w_hv64_8_end_neon
4606+endfunc
4607+
4608+function hevc_put_hevc_qpel_uni_w_hv64_8_end_neon
45464609 mov x11, sp
45474610 mov w12, w22
45484611 mov x13, x20
@@ -4671,6 +4734,10 @@ function ff_hevc_put_hevc_qpel_bi_hv4_8_neon_i8mm, export=1 · 122 unmodified lines
46714734 ldp x4, x5, [sp, #16]
46724735 ldp x0, x1, [sp, #32]
46734736 ldp x7, x30, [sp], #48
4737+ b hevc_put_hevc_qpel_bi_hv4_8_end_neon
4738+endfunc
4739+
4740+function hevc_put_hevc_qpel_bi_hv4_8_end_neon
46744741 mov x9, #(MAX_PB_SIZE * 2)
46754742 load_qpel_filterh x7, x6
46764743 ld1 {v16.4h}, [sp], x9
@@ -4712,6 +4779,10 @@ function ff_hevc_put_hevc_qpel_bi_hv6_8_neon_i8mm, export=1 · 35 unmodified lines
47124779 ldp x4, x5, [sp, #16]
47134780 ldp x0, x1, [sp, #32]
47144781 ldp x7, x30, [sp], #48
4782+ b hevc_put_hevc_qpel_bi_hv6_8_end_neon
4783+endfunc
4784+
4785+function hevc_put_hevc_qpel_bi_hv6_8_end_neon
47154786 mov x9, #(MAX_PB_SIZE * 2)
47164787 load_qpel_filterh x7, x6
47174788 sub x1, x1, #4
@@ -4758,6 +4829,10 @@ function ff_hevc_put_hevc_qpel_bi_hv8_8_neon_i8mm, export=1 · 40 unmodified lines
47584829 ldp x4, x5, [sp, #16]
47594830 ldp x0, x1, [sp, #32]
47604831 ldp x7, x30, [sp], #48
4832+ b hevc_put_hevc_qpel_bi_hv8_8_end_neon
4833+endfunc
4834+
4835+function hevc_put_hevc_qpel_bi_hv8_8_end_neon
47614836 mov x9, #(MAX_PB_SIZE * 2)
47624837 load_qpel_filterh x7, x6
47634838 ld1 {v16.8h}, [sp], x9
@@ -4822,7 +4897,10 @@ function ff_hevc_put_hevc_qpel_bi_hv16_8_neon_i8mm, export=1 · 58 unmodified lines
48224897 ldp x0, x1, [sp, #32]
48234898 ldp x7, x30, [sp], #48
48244899 mov x6, #16 // width
4825−.Lqpel_bi_hv16_loop:
4900+ b hevc_put_hevc_qpel_bi_hv16_8_end_neon
4901+endfunc
4902+
4903+function hevc_put_hevc_qpel_bi_hv16_8_end_neon
48264904 load_qpel_filterh x7, x8
48274905 mov x9, #(MAX_PB_SIZE * 2)
48284906 mov x10, x6
@@ -4908,7 +4986,7 @@ function ff_hevc_put_hevc_qpel_bi_hv32_8_neon_i8mm, export=1 · 79 unmodified lines
49084986 ldp x0, x1, [sp, #32]
49094987 ldp x7, x30, [sp], #48
49104988 mov x6, #32 // width
4911− b .Lqpel_bi_hv16_loop
4989+ b hevc_put_hevc_qpel_bi_hv16_8_end_neon
49124990 endfunc
49134991
49144992 function ff_hevc_put_hevc_qpel_bi_hv48_8_neon_i8mm, export=1
@@ -4929,7 +5007,7 @@ function ff_hevc_put_hevc_qpel_bi_hv48_8_neon_i8mm, export=1 · 14 unmodified lines
49295007 ldp x0, x1, [sp, #32]
49305008 ldp x7, x30, [sp], #48
49315009 mov x6, #48 // width
4932− b .Lqpel_bi_hv16_loop
5010+ b hevc_put_hevc_qpel_bi_hv16_8_end_neon
49335011 endfunc
49345012
49355013 function ff_hevc_put_hevc_qpel_bi_hv64_8_neon_i8mm, export=1
@@ -4950,7 +5028,7 @@ function ff_hevc_put_hevc_qpel_bi_hv64_8_neon_i8mm, export=1 · 14 unmodified lines
49505028 ldp x0, x1, [sp, #32]
49515029 ldp x7, x30, [sp], #48
49525030 mov x6, #64 // width
4953− b .Lqpel_bi_hv16_loop
5031+ b hevc_put_hevc_qpel_bi_hv16_8_end_neon
49545032 endfunc
49555033
49565034 DISABLE_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