1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
|
From 02a138f0b247fb08b799f32c49b35912b2921321 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 12 Feb 2019 11:38:46 -0800
Subject: [PATCH] math_vfp_asm.S: Convert fldmia/fstmia instructions to UAL
syntax for clang
This is flagged with clang internal assembler, since it does not allow
non UAL syntax
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
liboil/arm/math_vfp_asm.S | 94 +++++++++++++++++++--------------------
1 file changed, 47 insertions(+), 47 deletions(-)
diff --git a/liboil/arm/math_vfp_asm.S b/liboil/arm/math_vfp_asm.S
index ae5c803..3dd14d9 100644
--- a/liboil/arm/math_vfp_asm.S
+++ b/liboil/arm/math_vfp_asm.S
@@ -25,7 +25,7 @@
*/
#if defined(__VFP_FP__) && !defined(__SOFTFP__)
-/*
+/*
** compile with -mcpu=arm1136j-s -mfpu=vfp -mfloat-abi=softfp
**
** void vfp_add_f32 (float *d, const float *s1, const float *s2, int n);
@@ -48,10 +48,10 @@
ands ip, r3, #7; /* ip = n % 8 */ \
beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \
vfp_ ## fname ## _loop1: \
- fldmias r1!, {s0}; \
- fldmias r2!, {s1}; \
+ vldmia.f32 r1!, {s0}; \
+ vldmia.f32 r2!, {s1}; \
## finst ##s s2, s0, s1; \
- fstmias r0!, {s2}; \
+ vstmia.f32 r0!, {s2}; \
subs ip, ip, #1; \
bne vfp_ ## fname ## _loop1; \
vfp_ ## fname ## _unroll: /* unroll by 8 */ \
@@ -62,15 +62,15 @@
orr fp, lr, fp, lsl #16; /* set vector lenght to 8 */ \
fmxr fpscr, fp; \
vfp_ ## fname ## _loop2: \
- fldmias r1!, {s8, s9, s10, s11, s12, s13, s14, s15}; \
- fldmias r2!, {s16, s17, s18, s19, s20, s21, s22, s23}; \
+ vldmia.f32 r1!, {s8, s9, s10, s11, s12, s13, s14, s15}; \
+ vldmia.f32 r2!, {s16, s17, s18, s19, s20, s21, s22, s23}; \
## finst ##s s24, s8, s16; \
- fstmias r0!, {s24, s25, s26, s27, s28, s29, s30, s31}; \
+ vstmia.f32 r0!, {s24, s25, s26, s27, s28, s29, s30, s31}; \
subs ip, ip, #1; \
bne vfp_ ## fname ## _loop2; \
fmxr fpscr, lr; /* restore original fpscr */ \
vfp_ ## fname ## _end: \
- ldmia sp!, {fp, pc}; /* recovering from stack and return */
+ ldmia sp!, {fp, pc}; /* recovering from stack and return */
#define UNROLL_F64_TEMPLATE(fname,finst) \
.global vfp_ ## fname ## ; \
@@ -79,10 +79,10 @@
ands ip, r3, #3; /* ip = n % 3 */ \
beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \
vfp_ ## fname ## _loop1: \
- fldmiad r1!, {d0}; \
- fldmiad r2!, {d1}; \
+ vldmia.f64 r1!, {d0}; \
+ vldmia.f64 r2!, {d1}; \
## finst ##d d2, d0, d1; \
- fstmiad r0!, {d2}; \
+ vstmia.f64 r0!, {d2}; \
subs ip, ip, #1; \
bne vfp_ ## fname ## _loop1; \
vfp_ ## fname ## _unroll: /* unroll by 4 */ \
@@ -93,15 +93,15 @@
orr fp, lr, fp, lsl #16; /* set vector lenght to 8 */ \
fmxr fpscr, fp; \
vfp_ ## fname ## _loop2: \
- fldmiad r1!, {d4, d5, d6, d7}; \
- fldmiad r2!, {d8, d9, d10, d11}; \
+ vldmia.f64 r1!, {d4, d5, d6, d7}; \
+ vldmia.f64 r2!, {d8, d9, d10, d11}; \
## finst ##d d12, d4, d8; \
- fstmiad r0!, {d12, d13, d14, d15}; \
+ vstmia.f64 r0!, {d12, d13, d14, d15}; \
subs ip, ip, #1; \
bne vfp_ ## fname ## _loop2; \
fmxr fpscr, lr; /* restore original fpscr */ \
vfp_ ## fname ## _end: \
- ldmia sp!, {fp, pc}; /* recovering from stack and return */
+ ldmia sp!, {fp, pc}; /* recovering from stack and return */
.align 2
UNROLL_F32_TEMPLATE(add_f32,fadd);
@@ -119,7 +119,7 @@ UNROLL_F64_TEMPLATE(subtract_f64,fsub);
#undef UNROLL_F32_TEMPLATE
#undef UNROLL_F64_TEMPLATE
-/*
+/*
**
** void vfp_scalaradd_f32_ns (float *d, const float *s1, const float *s2_1, int n);
** void vfp_scalaradd_f64_ns (double *d, const double *s1, const double *s2_1, int n);
@@ -133,13 +133,13 @@ UNROLL_F64_TEMPLATE(subtract_f64,fsub);
.global vfp_ ## fname ## ; \
vfp_ ## fname ## : \
stmdb sp!, {fp, lr}; /* save registers to stack */ \
- fldmias r2, {s1}; /* load scalar value */ \
+ vldmia.f32 r2, {s1}; /* load scalar value */ \
ands ip, r3, #7; /* ip = n % 8 */ \
beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \
vfp_ ## fname ## _loop1: \
- fldmias r1!, {s0}; \
+ vldmia.f32 r1!, {s0}; \
## finst ##s s2, s0, s1; \
- fstmias r0!, {s2}; \
+ vstmia.f32 r0!, {s2}; \
subs ip, ip, #1; \
bne vfp_ ## fname ## _loop1; \
vfp_ ## fname ## _unroll: /* unroll by 8 */ \
@@ -150,26 +150,26 @@ UNROLL_F64_TEMPLATE(subtract_f64,fsub);
orr fp, lr, fp, lsl #16; /* set vector lenght to 8 */ \
fmxr fpscr, fp; \
vfp_ ## fname ## _loop2: \
- fldmias r1!, {s8, s9, s10, s11, s12, s13, s14, s15}; \
+ vldmia.f32 r1!, {s8, s9, s10, s11, s12, s13, s14, s15}; \
## finst ##s s24, s8, s1; \
- fstmias r0!, {s24, s25, s26, s27, s28, s29, s30, s31}; \
+ vstmia.f32 r0!, {s24, s25, s26, s27, s28, s29, s30, s31}; \
subs ip, ip, #1; \
bne vfp_ ## fname ## _loop2; \
fmxr fpscr, lr; /* restore original fpscr */ \
vfp_ ## fname ## _end: \
- ldmia sp!, {fp, pc}; /* recovering from stack and return */
+ ldmia sp!, {fp, pc}; /* recovering from stack and return */
#define UNROLL_F64_TEMPLATE(fname,finst) \
.global vfp_ ## fname ## ; \
vfp_ ## fname ## : \
stmdb sp!, {fp, lr}; /* save registers to stack */ \
- fldmiad r2, {d1}; /* load scalar value */ \
+ vldmia.f64 r2, {d1}; /* load scalar value */ \
ands ip, r3, #3; /* ip = n % 3 */ \
beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \
vfp_ ## fname ## _loop1: \
- fldmiad r1!, {d0}; \
+ vldmia.f64 r1!, {d0}; \
## finst ##d d2, d0, d1; \
- fstmiad r0!, {d2}; \
+ vstmia.f64 r0!, {d2}; \
subs ip, ip, #1; \
bne vfp_ ## fname ## _loop1; \
vfp_ ## fname ## _unroll: /* unroll by 4 */ \
@@ -180,14 +180,14 @@ UNROLL_F64_TEMPLATE(subtract_f64,fsub);
orr fp, lr, fp, lsl #16; /* set vector lenght to 4 */ \
fmxr fpscr, fp; \
vfp_ ## fname ## _loop2: \
- fldmiad r1!, {d4, d5, d6, d7}; \
+ vldmia.f64 r1!, {d4, d5, d6, d7}; \
## finst ##d d12, d4, d1; \
- fstmiad r0!, {d12, d13, d14, d15}; \
+ vstmia.f64 r0!, {d12, d13, d14, d15}; \
subs ip, ip, #1; \
bne vfp_ ## fname ## _loop2; \
fmxr fpscr, lr; /* restore original fpscr */ \
vfp_ ## fname ## _end: \
- ldmia sp!, {fp, pc}; /* recovering from stack and return */
+ ldmia sp!, {fp, pc}; /* recovering from stack and return */
UNROLL_F32_TEMPLATE(scalaradd_f32_ns,fadd);
UNROLL_F64_TEMPLATE(scalaradd_f64_ns,fadd);
@@ -198,7 +198,7 @@ UNROLL_F64_TEMPLATE(scalarmultiply_f64_ns,fmul);
#undef UNROLL_F32_TEMPLATE
#undef UNROLL_F64_TEMPLATE
-/*
+/*
**
** void vfp_abs_f32_f32_ns(float *d, const float *s, int n);
** void vfp_abs_f64_f64_ns(double *d, const double *s, int n);
@@ -215,9 +215,9 @@ UNROLL_F64_TEMPLATE(scalarmultiply_f64_ns,fmul);
ands ip, r2, #7; /* ip = n % 8 */ \
beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \
vfp_ ## fname ## _loop1: \
- fldmias r1!, {s0}; \
- ## finst ##s s2, s0; \
- fstmias r0!, {s2}; \
+ vldmia.f32 r1!, {s0}; \
+ ## finst ##.f32 s2, s0; \
+ vstmia.f32 r0!, {s2}; \
subs ip, ip, #1; \
bne vfp_ ## fname ## _loop1; \
vfp_ ## fname ## _unroll: /* unroll by 8 */ \
@@ -228,14 +228,14 @@ UNROLL_F64_TEMPLATE(scalarmultiply_f64_ns,fmul);
orr fp, lr, fp, lsl #16; /* set vector lenght to 8 */ \
fmxr fpscr, fp; \
vfp_ ## fname ## _loop2: \
- fldmias r1!, {s8, s9, s10, s11, s12, s13, s14, s15}; \
- ## finst ##s s24, s8; \
- fstmias r0!, {s24, s25, s26, s27, s28, s29, s30, s31}; \
+ vldmia.f32 r1!, {s8, s9, s10, s11, s12, s13, s14, s15}; \
+ ## finst ##.f32 s24, s8; \
+ vstmia.f32 r0!, {s24, s25, s26, s27, s28, s29, s30, s31}; \
subs ip, ip, #1; \
bne vfp_ ## fname ## _loop2; \
fmxr fpscr, lr; /* restore original fpscr */ \
vfp_ ## fname ## _end: \
- ldmia sp!, {fp, pc}; /* recovering from stack and return */
+ ldmia sp!, {fp, pc}; /* recovering from stack and return */
#define UNROLL_F64_TEMPLATE(fname,finst) \
.global vfp_ ## fname ## ; \
@@ -244,9 +244,9 @@ UNROLL_F64_TEMPLATE(scalarmultiply_f64_ns,fmul);
ands ip, r2, #3; /* ip = n % 3 */ \
beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \
vfp_ ## fname ## _loop1: \
- fldmiad r1!, {d0}; \
- ## finst ##d d2, d0; \
- fstmiad r0!, {d2}; \
+ vldmia.f64 r1!, {d0}; \
+ ## finst ##.f64 d2, d0; \
+ vstmia.f64 r0!, {d2}; \
subs ip, ip, #1; \
bne vfp_ ## fname ## _loop1; \
vfp_ ## fname ## _unroll: /* unroll by 4 */ \
@@ -257,20 +257,20 @@ UNROLL_F64_TEMPLATE(scalarmultiply_f64_ns,fmul);
orr fp, lr, fp, lsl #16; /* set vector lenght to 4 */ \
fmxr fpscr, fp; \
vfp_ ## fname ## _loop2: \
- fldmiad r1!, {d4, d5, d6, d7}; \
- ## finst ##d d12, d4; \
- fstmiad r0!, {d12, d13, d14, d15}; \
+ vldmia.f64 r1!, {d4, d5, d6, d7}; \
+ ## finst ##.f64 d12, d4; \
+ vstmia.f64 r0!, {d12, d13, d14, d15}; \
subs ip, ip, #1; \
bne vfp_ ## fname ## _loop2; \
fmxr fpscr, lr; /* restore original fpscr */ \
vfp_ ## fname ## _end: \
- ldmia sp!, {fp, pc}; /* recovering from stack and return */
+ ldmia sp!, {fp, pc}; /* recovering from stack and return */
-UNROLL_F32_TEMPLATE(abs_f32_f32_ns,fabs);
-UNROLL_F64_TEMPLATE(abs_f64_f64_ns,fabs);
+UNROLL_F32_TEMPLATE(abs_f32_f32_ns,vabs);
+UNROLL_F64_TEMPLATE(abs_f64_f64_ns,vabs);
-UNROLL_F32_TEMPLATE(negative_f32,fneg);
-UNROLL_F64_TEMPLATE(negative_f64,fneg);
+UNROLL_F32_TEMPLATE(negative_f32,vneg);
+UNROLL_F64_TEMPLATE(negative_f64,vneg);
#undef UNROLL_F32_TEMPLATE
#undef UNROLL_F64_TEMPLATE
|
