History

aarch64: Reindent all assembly to 8/24 column indentation

libavcodec/aarch64/vc1dsp_neon.S is skipped here, as it intentionally uses a layered indentation style to visually show how different unrolled/interleaved phases fit together.

Martin Storsjö committed 3 years ago

Commit a76b4091 parent cada4596 files · +1600 −1600Browse files

Showing the changes to libavcodec (2 of 6 files). Show all

Unified · Split

2 files
  1. libavcodec/aarch64/aacpsdsp_neon.S +109 −109
  2. libavcodec/aarch64/opusdsp_neon.S +51 −51
libavcodec/aarch64/aacpsdsp_neon.S+109−109
@@ -19,130 +19,130 @@ · 18 unmodified lines
19#include "libavutil/aarch64/asm.S"19#include "libavutil/aarch64/asm.S"
20 20
21function ff_ps_add_squares_neon, export=121function ff_ps_add_squares_neon, export=1
221: ld1 {v0.4s,v1.4s}, [x1], #32221: ld1 {v0.4s,v1.4s}, [x1], #32
23 fmul v0.4s, v0.4s, v0.4s23 fmul v0.4s, v0.4s, v0.4s
24 fmul v1.4s, v1.4s, v1.4s24 fmul v1.4s, v1.4s, v1.4s
25 faddp v2.4s, v0.4s, v1.4s25 faddp v2.4s, v0.4s, v1.4s
26 ld1 {v3.4s}, [x0]26 ld1 {v3.4s}, [x0]
27 fadd v3.4s, v3.4s, v2.4s27 fadd v3.4s, v3.4s, v2.4s
28 st1 {v3.4s}, [x0], #1628 st1 {v3.4s}, [x0], #16
29 subs w2, w2, #429 subs w2, w2, #4
30 b.gt 1b30 b.gt 1b
31 ret31 ret
32endfunc32endfunc
33 33
34function ff_ps_mul_pair_single_neon, export=134function ff_ps_mul_pair_single_neon, export=1
351: ld1 {v0.4s,v1.4s}, [x1], #32351: ld1 {v0.4s,v1.4s}, [x1], #32
36 ld1 {v2.4s}, [x2], #1636 ld1 {v2.4s}, [x2], #16
37 zip1 v3.4s, v2.4s, v2.4s37 zip1 v3.4s, v2.4s, v2.4s
38 zip2 v4.4s, v2.4s, v2.4s38 zip2 v4.4s, v2.4s, v2.4s
39 fmul v0.4s, v0.4s, v3.4s39 fmul v0.4s, v0.4s, v3.4s
40 fmul v1.4s, v1.4s, v4.4s40 fmul v1.4s, v1.4s, v4.4s
41 st1 {v0.4s,v1.4s}, [x0], #3241 st1 {v0.4s,v1.4s}, [x0], #32
42 subs w3, w3, #442 subs w3, w3, #4
43 b.gt 1b43 b.gt 1b
44 ret44 ret
45endfunc45endfunc
46 46
47function ff_ps_stereo_interpolate_neon, export=147function ff_ps_stereo_interpolate_neon, export=1
48 ld1 {v0.4s}, [x2]48 ld1 {v0.4s}, [x2]
49 ld1 {v1.4s}, [x3]49 ld1 {v1.4s}, [x3]
50 zip1 v4.4s, v0.4s, v0.4s50 zip1 v4.4s, v0.4s, v0.4s
51 zip2 v5.4s, v0.4s, v0.4s51 zip2 v5.4s, v0.4s, v0.4s
52 zip1 v6.4s, v1.4s, v1.4s52 zip1 v6.4s, v1.4s, v1.4s
53 zip2 v7.4s, v1.4s, v1.4s53 zip2 v7.4s, v1.4s, v1.4s
541: ld1 {v2.2s}, [x0]541: ld1 {v2.2s}, [x0]
55 ld1 {v3.2s}, [x1]55 ld1 {v3.2s}, [x1]
56 fadd v4.4s, v4.4s, v6.4s56 fadd v4.4s, v4.4s, v6.4s
57 fadd v5.4s, v5.4s, v7.4s57 fadd v5.4s, v5.4s, v7.4s
58 mov v2.d[1], v2.d[0]58 mov v2.d[1], v2.d[0]
59 mov v3.d[1], v3.d[0]59 mov v3.d[1], v3.d[0]
60 fmul v2.4s, v2.4s, v4.4s60 fmul v2.4s, v2.4s, v4.4s
61 fmla v2.4s, v3.4s, v5.4s61 fmla v2.4s, v3.4s, v5.4s
62 st1 {v2.d}[0], [x0], #862 st1 {v2.d}[0], [x0], #8
63 st1 {v2.d}[1], [x1], #863 st1 {v2.d}[1], [x1], #8
64 subs w4, w4, #164 subs w4, w4, #1
65 b.gt 1b65 b.gt 1b
66 ret66 ret
67endfunc67endfunc
68 68
69function ff_ps_stereo_interpolate_ipdopd_neon, export=169function ff_ps_stereo_interpolate_ipdopd_neon, export=1
70 ld1 {v0.4s,v1.4s}, [x2]70 ld1 {v0.4s,v1.4s}, [x2]
71 ld1 {v6.4s,v7.4s}, [x3]71 ld1 {v6.4s,v7.4s}, [x3]
72 fneg v2.4s, v1.4s72 fneg v2.4s, v1.4s
73 fneg v3.4s, v7.4s73 fneg v3.4s, v7.4s
74 zip1 v16.4s, v0.4s, v0.4s74 zip1 v16.4s, v0.4s, v0.4s
75 zip2 v17.4s, v0.4s, v0.4s75 zip2 v17.4s, v0.4s, v0.4s
76 zip1 v18.4s, v2.4s, v1.4s76 zip1 v18.4s, v2.4s, v1.4s
77 zip2 v19.4s, v2.4s, v1.4s77 zip2 v19.4s, v2.4s, v1.4s
78 zip1 v20.4s, v6.4s, v6.4s78 zip1 v20.4s, v6.4s, v6.4s
79 zip2 v21.4s, v6.4s, v6.4s79 zip2 v21.4s, v6.4s, v6.4s
80 zip1 v22.4s, v3.4s, v7.4s80 zip1 v22.4s, v3.4s, v7.4s
81 zip2 v23.4s, v3.4s, v7.4s81 zip2 v23.4s, v3.4s, v7.4s
821: ld1 {v2.2s}, [x0]821: ld1 {v2.2s}, [x0]
83 ld1 {v3.2s}, [x1]83 ld1 {v3.2s}, [x1]
84 fadd v16.4s, v16.4s, v20.4s84 fadd v16.4s, v16.4s, v20.4s
85 fadd v17.4s, v17.4s, v21.4s85 fadd v17.4s, v17.4s, v21.4s
86 mov v2.d[1], v2.d[0]86 mov v2.d[1], v2.d[0]
87 mov v3.d[1], v3.d[0]87 mov v3.d[1], v3.d[0]
88 fmul v4.4s, v2.4s, v16.4s88 fmul v4.4s, v2.4s, v16.4s
89 fmla v4.4s, v3.4s, v17.4s89 fmla v4.4s, v3.4s, v17.4s
90 fadd v18.4s, v18.4s, v22.4s90 fadd v18.4s, v18.4s, v22.4s
91 fadd v19.4s, v19.4s, v23.4s91 fadd v19.4s, v19.4s, v23.4s
92 ext v2.16b, v2.16b, v2.16b, #492 ext v2.16b, v2.16b, v2.16b, #4
93 ext v3.16b, v3.16b, v3.16b, #493 ext v3.16b, v3.16b, v3.16b, #4
94 fmla v4.4s, v2.4s, v18.4s94 fmla v4.4s, v2.4s, v18.4s
95 fmla v4.4s, v3.4s, v19.4s95 fmla v4.4s, v3.4s, v19.4s
96 st1 {v4.d}[0], [x0], #896 st1 {v4.d}[0], [x0], #8
97 st1 {v4.d}[1], [x1], #897 st1 {v4.d}[1], [x1], #8
98 subs w4, w4, #198 subs w4, w4, #1
99 b.gt 1b99 b.gt 1b
100 ret100 ret
101endfunc101endfunc
102 102
103function ff_ps_hybrid_analysis_neon, export=1103function ff_ps_hybrid_analysis_neon, export=1
104 lsl x3, x3, #3104 lsl x3, x3, #3
105 ld2 {v0.4s,v1.4s}, [x1], #32105 ld2 {v0.4s,v1.4s}, [x1], #32
106 ld2 {v2.2s,v3.2s}, [x1], #16106 ld2 {v2.2s,v3.2s}, [x1], #16
107 ld1 {v24.2s}, [x1], #8107 ld1 {v24.2s}, [x1], #8
108 ld2 {v4.2s,v5.2s}, [x1], #16108 ld2 {v4.2s,v5.2s}, [x1], #16
109 ld2 {v6.4s,v7.4s}, [x1]109 ld2 {v6.4s,v7.4s}, [x1]
110 rev64 v6.4s, v6.4s110 rev64 v6.4s, v6.4s
111 rev64 v7.4s, v7.4s111 rev64 v7.4s, v7.4s
112 ext v6.16b, v6.16b, v6.16b, #8112 ext v6.16b, v6.16b, v6.16b, #8
113 ext v7.16b, v7.16b, v7.16b, #8113 ext v7.16b, v7.16b, v7.16b, #8
114 rev64 v4.2s, v4.2s114 rev64 v4.2s, v4.2s
115 rev64 v5.2s, v5.2s115 rev64 v5.2s, v5.2s
116 mov v2.d[1], v3.d[0]116 mov v2.d[1], v3.d[0]
117 mov v4.d[1], v5.d[0]117 mov v4.d[1], v5.d[0]
118 mov v5.d[1], v2.d[0]118 mov v5.d[1], v2.d[0]
119 mov v3.d[1], v4.d[0]119 mov v3.d[1], v4.d[0]
120 fadd v16.4s, v0.4s, v6.4s120 fadd v16.4s, v0.4s, v6.4s
121 fadd v17.4s, v1.4s, v7.4s121 fadd v17.4s, v1.4s, v7.4s
122 fsub v18.4s, v1.4s, v7.4s122 fsub v18.4s, v1.4s, v7.4s
123 fsub v19.4s, v0.4s, v6.4s123 fsub v19.4s, v0.4s, v6.4s
124 fadd v22.4s, v2.4s, v4.4s124 fadd v22.4s, v2.4s, v4.4s
125 fsub v23.4s, v5.4s, v3.4s125 fsub v23.4s, v5.4s, v3.4s
126 trn1 v20.2d, v22.2d, v23.2d // {re4+re8, re5+re7, im8-im4, im7-im5}126 trn1 v20.2d, v22.2d, v23.2d // {re4+re8, re5+re7, im8-im4, im7-im5}
127 trn2 v21.2d, v22.2d, v23.2d // {im4+im8, im5+im7, re4-re8, re5-re7}127 trn2 v21.2d, v22.2d, v23.2d // {im4+im8, im5+im7, re4-re8, re5-re7}
1281: ld2 {v2.4s,v3.4s}, [x2], #321281: ld2 {v2.4s,v3.4s}, [x2], #32
129 ld2 {v4.2s,v5.2s}, [x2], #16129 ld2 {v4.2s,v5.2s}, [x2], #16
130 ld1 {v6.2s}, [x2], #8130 ld1 {v6.2s}, [x2], #8
131 add x2, x2, #8131 add x2, x2, #8
132 mov v4.d[1], v5.d[0]132 mov v4.d[1], v5.d[0]
133 mov v6.s[1], v6.s[0]133 mov v6.s[1], v6.s[0]
134 fmul v6.2s, v6.2s, v24.2s134 fmul v6.2s, v6.2s, v24.2s
135 fmul v0.4s, v2.4s, v16.4s135 fmul v0.4s, v2.4s, v16.4s
136 fmul v1.4s, v2.4s, v17.4s136 fmul v1.4s, v2.4s, v17.4s
137 fmls v0.4s, v3.4s, v18.4s137 fmls v0.4s, v3.4s, v18.4s
138 fmla v1.4s, v3.4s, v19.4s138 fmla v1.4s, v3.4s, v19.4s
139 fmla v0.4s, v4.4s, v20.4s139 fmla v0.4s, v4.4s, v20.4s
140 fmla v1.4s, v4.4s, v21.4s140 fmla v1.4s, v4.4s, v21.4s
141 faddp v0.4s, v0.4s, v1.4s141 faddp v0.4s, v0.4s, v1.4s
142 faddp v0.4s, v0.4s, v0.4s142 faddp v0.4s, v0.4s, v0.4s
143 fadd v0.2s, v0.2s, v6.2s143 fadd v0.2s, v0.2s, v6.2s
144 st1 {v0.2s}, [x0], x3144 st1 {v0.2s}, [x0], x3
145 subs w4, w4, #1145 subs w4, w4, #1
146 b.gt 1b146 b.gt 1b
147 ret147 ret
148endfunc148endfunc
libavcodec/aarch64/opusdsp_neon.S+51−51
@@ -33,81 +33,81 @@ const tab_x2, align=4 · 32 unmodified lines
33endconst33endconst
34 34
35function ff_opus_deemphasis_neon, export=135function ff_opus_deemphasis_neon, export=1
36 movrel x4, tab_st36 movrel x4, tab_st
37 ld1 {v4.4s}, [x4]37 ld1 {v4.4s}, [x4]
38 movrel x4, tab_x038 movrel x4, tab_x0
39 ld1 {v5.4s}, [x4]39 ld1 {v5.4s}, [x4]
40 movrel x4, tab_x140 movrel x4, tab_x1
41 ld1 {v6.4s}, [x4]41 ld1 {v6.4s}, [x4]
42 movrel x4, tab_x242 movrel x4, tab_x2
43 ld1 {v7.4s}, [x4]43 ld1 {v7.4s}, [x4]
44 44
45 fmul v0.4s, v4.4s, v0.s[0]45 fmul v0.4s, v4.4s, v0.s[0]
46 46
471: ld1 {v1.4s, v2.4s}, [x1], #32471: ld1 {v1.4s, v2.4s}, [x1], #32
48 48
49 fmla v0.4s, v5.4s, v1.s[0]49 fmla v0.4s, v5.4s, v1.s[0]
50 fmul v3.4s, v7.4s, v2.s[2]50 fmul v3.4s, v7.4s, v2.s[2]
51 51
52 fmla v0.4s, v6.4s, v1.s[1]52 fmla v0.4s, v6.4s, v1.s[1]
53 fmla v3.4s, v6.4s, v2.s[1]53 fmla v3.4s, v6.4s, v2.s[1]
54 54
55 fmla v0.4s, v7.4s, v1.s[2]55 fmla v0.4s, v7.4s, v1.s[2]
56 fmla v3.4s, v5.4s, v2.s[0]56 fmla v3.4s, v5.4s, v2.s[0]
57 57
58 fadd v1.4s, v1.4s, v0.4s58 fadd v1.4s, v1.4s, v0.4s
59 fadd v2.4s, v2.4s, v3.4s59 fadd v2.4s, v2.4s, v3.4s
60 60
61 fmla v2.4s, v4.4s, v1.s[3]61 fmla v2.4s, v4.4s, v1.s[3]
62 62
63 st1 {v1.4s, v2.4s}, [x0], #3263 st1 {v1.4s, v2.4s}, [x0], #32
64 fmul v0.4s, v4.4s, v2.s[3]64 fmul v0.4s, v4.4s, v2.s[3]
65 65
66 subs w2, w2, #866 subs w2, w2, #8
67 b.gt 1b67 b.gt 1b
68 68
69 mov s0, v2.s[3]69 mov s0, v2.s[3]
70 70
71 ret71 ret
72endfunc72endfunc
73 73
74function ff_opus_postfilter_neon, export=174function ff_opus_postfilter_neon, export=1
75 ld1 {v0.4s}, [x2]75 ld1 {v0.4s}, [x2]
76 dup v1.4s, v0.s[1]76 dup v1.4s, v0.s[1]
77 dup v2.4s, v0.s[2]77 dup v2.4s, v0.s[2]
78 dup v0.4s, v0.s[0]78 dup v0.4s, v0.s[0]
79 79
80 add w1, w1, #280 add w1, w1, #2
81 sub x1, x0, x1, lsl #281 sub x1, x0, x1, lsl #2
82 82
83 ld1 {v3.4s}, [x1]83 ld1 {v3.4s}, [x1]
84 fmul v3.4s, v3.4s, v2.4s84 fmul v3.4s, v3.4s, v2.4s
85 85
861: add x1, x1, #4861: add x1, x1, #4
87 ld1 {v4.4s}, [x1]87 ld1 {v4.4s}, [x1]
88 add x1, x1, #488 add x1, x1, #4
89 ld1 {v5.4s}, [x1]89 ld1 {v5.4s}, [x1]
90 add x1, x1, #490 add x1, x1, #4
91 ld1 {v6.4s}, [x1]91 ld1 {v6.4s}, [x1]
92 add x1, x1, #492 add x1, x1, #4
93 ld1 {v7.4s}, [x1]93 ld1 {v7.4s}, [x1]
94 94
95 fmla v3.4s, v7.4s, v2.4s95 fmla v3.4s, v7.4s, v2.4s
96 fadd v6.4s, v6.4s, v4.4s96 fadd v6.4s, v6.4s, v4.4s
97 97
98 ld1 {v4.4s}, [x0]98 ld1 {v4.4s}, [x0]
99 fmla v4.4s, v5.4s, v0.4s99 fmla v4.4s, v5.4s, v0.4s
100 100
101 fmul v6.4s, v6.4s, v1.4s101 fmul v6.4s, v6.4s, v1.4s
102 fadd v6.4s, v6.4s, v3.4s102 fadd v6.4s, v6.4s, v3.4s
103 103
104 fadd v4.4s, v4.4s, v6.4s104 fadd v4.4s, v4.4s, v6.4s
105 fmul v3.4s, v7.4s, v2.4s105 fmul v3.4s, v7.4s, v2.4s
106 106
107 st1 {v4.4s}, [x0], #16107 st1 {v4.4s}, [x0], #16
108 108
109 subs w3, w3, #4109 subs w3, w3, #4
110 b.gt 1b110 b.gt 1b
111 111
112 ret112 ret
113endfunc113endfunc

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