Skip to content

Commit 63d7bad

Browse files
martin-frbgmartin-frbg
authored
Merge pull request #2010 from martin-frbg/issue2009
 Fix declaration of input arguments in x86_64 GEMV, SYMV and DSCAL
2 parents 03a2bf2 + ab1630f commit 63d7bad

21 files changed

+73
-73
lines changed

‎kernel/x86_64/dgemv_n_4.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ static void dgemv_kernel_4x2( BLASLONG n, FLOAT **ap, FLOAT *x, FLOAT *y, FLOAT
111111
"jnz 1b \n\t"
112112

113113
:
114-
:
115-
"r" (i), // 0
116-
"r" (n), // 1
114+
"+r" (i), // 0
115+
"+r" (n) // 1
116+
:
117117
"r" (x), // 2
118118
"r" (y), // 3
119119
"r" (ap[0]), // 4
@@ -166,9 +166,9 @@ static void dgemv_kernel_4x1(BLASLONG n, FLOAT *ap, FLOAT *x, FLOAT *y, FLOAT *a
166166
"jnz 1b \n\t"
167167

168168
:
169+
"+r" (i), // 0
170+
"+r" (n) // 1
169171
:
170-
"r" (i), // 0
171-
"r" (n), // 1
172172
"r" (x), // 2
173173
"r" (y), // 3
174174
"r" (ap), // 4

‎kernel/x86_64/dgemv_t_4.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ static void dgemv_kernel_4x2(BLASLONG n, FLOAT *ap0, FLOAT *ap1, FLOAT *x, FLOAT
127127
"movsd %%xmm11,8(%2) \n\t"
128128

129129
:
130-
:
131-
"r" (i), // 0
132-
"r" (n), // 1
130+
"+r" (i), // 0
131+
"+r" (n) // 1
132+
:
133133
"r" (y), // 2
134134
"r" (ap0), // 3
135135
"r" (ap1), // 4
@@ -195,9 +195,9 @@ static void dgemv_kernel_4x1(BLASLONG n, FLOAT *ap, FLOAT *x, FLOAT *y)
195195
"movsd %%xmm10, (%2) \n\t"
196196

197197
:
198-
:
199-
"r" (i), // 0
200-
"r" (n), // 1
198+
"+r" (i), // 0
199+
"+r" (n) // 1
200+
:
201201
"r" (y), // 2
202202
"r" (ap), // 3
203203
"r" (x) // 4
@@ -259,9 +259,9 @@ static void add_y(BLASLONG n, FLOAT da , FLOAT *src, FLOAT *dest, BLASLONG inc_d
259259
"jnz 1b \n\t"
260260

261261
:
262-
:
263-
"r" (i), // 0
264-
"r" (n), // 1
262+
"+r" (i), // 0
263+
"+r" (n) // 1
264+
:
265265
"r" (&da), // 2
266266
"r" (src), // 3
267267
"r" (dest) // 4

‎kernel/x86_64/dscal.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ static void dscal_kernel_inc_8(BLASLONG n, FLOAT *alpha, FLOAT *x, BLASLONG inc_
136136
"jnz 1b \n\t"
137137

138138
:
139+
"+r" (n) // 0
139140
:
140-
"r" (n), // 0
141141
"r" (x), // 1
142142
"r" (x1), // 2
143143
"r" (alpha), // 3

‎kernel/x86_64/dsymv_L_microk_bulldozer-2.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ static void dsymv_kernel_4x4(BLASLONG from, BLASLONG to, FLOAT **a, FLOAT *x, FL
113113
"vmovsd %%xmm3 ,24(%9) \n\t" // save temp2
114114

115115
:
116-
:
117-
"r" (from), // 0
116+
"+r" (from) // 0
117+
:
118118
"r" (to), // 1
119119
"r" (x), // 2
120120
"r" (y), // 3

‎kernel/x86_64/dsymv_L_microk_haswell-2.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ static void dsymv_kernel_4x4(BLASLONG from, BLASLONG to, FLOAT **a, FLOAT *x, FL
105105
"vzeroupper \n\t"
106106

107107
:
108-
:
109-
"r" (from), // 0
108+
"+r" (from) // 0
109+
:
110110
"r" (to), // 1
111111
"r" (x), // 2
112112
"r" (y), // 3

‎kernel/x86_64/dsymv_L_microk_nehalem-2.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ static void dsymv_kernel_4x4(BLASLONG from, BLASLONG to, FLOAT **a, FLOAT *x, FL
108108
"movsd %%xmm3 , 24(%9) \n\t" // save temp2
109109

110110
:
111-
:
112-
"r" (from), // 0
111+
"+r" (from) // 0
112+
:
113113
"r" (to), // 1
114114
"r" (x), // 2
115115
"r" (y), // 3

‎kernel/x86_64/dsymv_L_microk_sandy-2.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ static void dsymv_kernel_4x4(BLASLONG from, BLASLONG to, FLOAT **a, FLOAT *x, FL
114114
"vzeroupper \n\t"
115115

116116
:
117-
:
118-
"r" (from), // 0
117+
"+r" (from) // 0
118+
:
119119
"r" (to), // 1
120120
"r" (x), // 2
121121
"r" (y), // 3

‎kernel/x86_64/dsymv_U_microk_bulldozer-2.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ static void dsymv_kernel_4x4(BLASLONG n, FLOAT *a0, FLOAT *a1, FLOAT *a2, FLOAT
106106
"vmovsd %%xmm3 ,24(%9) \n\t" // save temp2
107107

108108
:
109-
:
110-
"r" (i), // 0
111-
"r" (n), // 1
109+
"+r" (i), // 0
110+
"+r" (n) // 1
111+
:
112112
"r" (x), // 2
113113
"r" (y), // 3
114114
"r" (a0), // 4

‎kernel/x86_64/dsymv_U_microk_haswell-2.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ static void dsymv_kernel_4x4(BLASLONG n, FLOAT *a0, FLOAT *a1, FLOAT *a2, FLOAT
107107
"vzeroupper \n\t"
108108

109109
:
110-
:
111-
"r" (i), // 0
112-
"r" (n), // 1
110+
"+r" (i), // 0
111+
"+r" (n) // 1
112+
:
113113
"r" (x), // 2
114114
"r" (y), // 3
115115
"r" (a0), // 4

‎kernel/x86_64/dsymv_U_microk_nehalem-2.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ static void dsymv_kernel_4x4(BLASLONG n, FLOAT *a0, FLOAT *a1, FLOAT *a2, FLOAT
101101
"movsd %%xmm3 , 24(%9) \n\t" // save temp2
102102

103103
:
104-
:
105-
"r" (i), // 0
106-
"r" (n), // 1
104+
"+r" (i), // 0
105+
"+r" (n) // 1
106+
:
107107
"r" (x), // 2
108108
"r" (y), // 3
109109
"r" (a0), // 4

‎kernel/x86_64/dsymv_U_microk_sandy-2.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ static void dsymv_kernel_4x4(BLASLONG n, FLOAT *a0, FLOAT *a1, FLOAT *a2, FLOAT
116116
"vzeroupper \n\t"
117117

118118
:
119-
:
120-
"r" (i), // 0
121-
"r" (n), // 1
119+
"+r" (i), // 0
120+
"+r" (n) // 1
121+
:
122122
"r" (x), // 2
123123
"r" (y), // 3
124124
"r" (a0), // 4

‎kernel/x86_64/sgemv_n_4.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ static void sgemv_kernel_4x2( BLASLONG n, FLOAT **ap, FLOAT *x, FLOAT *y, FLOAT
149149
"jnz 1b \n\t"
150150

151151
:
152-
:
153-
"r" (i), // 0
154-
"r" (n), // 1
152+
"+r" (i), // 0
153+
"+r" (n) // 1
154+
:
155155
"r" (x), // 2
156156
"r" (y), // 3
157157
"r" (ap[0]), // 4
@@ -223,9 +223,9 @@ static void sgemv_kernel_4x1(BLASLONG n, FLOAT *ap, FLOAT *x, FLOAT *y, FLOAT *a
223223

224224
"3: \n\t"
225225
:
226+
"+r" (i), // 0
227+
"+r" (n1) // 1
226228
:
227-
"r" (i), // 0
228-
"r" (n1), // 1
229229
"r" (x), // 2
230230
"r" (y), // 3
231231
"r" (ap), // 4
@@ -277,9 +277,9 @@ static void add_y(BLASLONG n, FLOAT *src, FLOAT *dest, BLASLONG inc_dest)
277277
"jnz 1b \n\t"
278278

279279
:
280+
"+r" (i), // 0
281+
"+r" (n) // 1
280282
:
281-
"r" (i), // 0
282-
"r" (n), // 1
283283
"r" (src), // 2
284284
"r" (dest) // 3
285285
: "cc",

‎kernel/x86_64/sgemv_t_4.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ static void sgemv_kernel_4x2(BLASLONG n, FLOAT *ap0, FLOAT *ap1, FLOAT *x, FLOAT
139139
"movss %%xmm11,4(%2) \n\t"
140140

141141
:
142-
:
143-
"r" (i), // 0
144-
"r" (n), // 1
142+
"+r" (i), // 0
143+
"+r" (n) // 1
144+
:
145145
"r" (y), // 2
146146
"r" (ap0), // 3
147147
"r" (ap1), // 4
@@ -208,9 +208,9 @@ static void sgemv_kernel_4x1(BLASLONG n, FLOAT *ap, FLOAT *x, FLOAT *y)
208208
"movss %%xmm10, (%2) \n\t"
209209

210210
:
211-
:
212-
"r" (i), // 0
213-
"r" (n), // 1
211+
"+r" (i), // 0
212+
"+r" (n) // 1
213+
:
214214
"r" (y), // 2
215215
"r" (ap), // 3
216216
"r" (x) // 4
@@ -272,9 +272,9 @@ static void add_y(BLASLONG n, FLOAT da , FLOAT *src, FLOAT *dest, BLASLONG inc_d
272272
"jnz 1b \n\t"
273273

274274
:
275-
:
276-
"r" (i), // 0
277-
"r" (n), // 1
275+
"+r" (i), // 0
276+
"+r" (n) // 1
277+
:
278278
"r" (&da), // 2
279279
"r" (src), // 3
280280
"r" (dest) // 4

‎kernel/x86_64/ssymv_L_microk_bulldozer-2.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ static void ssymv_kernel_4x4(BLASLONG from, BLASLONG to, FLOAT **a, FLOAT *x, FL
9898
"vmovss %%xmm3 ,12(%9) \n\t" // save temp2
9999

100100
:
101-
:
102-
"r" (from), // 0
101+
"+r" (from) // 0
102+
:
103103
"r" (to), // 1
104104
"r" (x), // 2
105105
"r" (y), // 3

‎kernel/x86_64/ssymv_L_microk_haswell-2.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ static void ssymv_kernel_4x4(BLASLONG from, BLASLONG to, FLOAT **a, FLOAT *x, FL
9999
"vzeroupper \n\t"
100100

101101
:
102-
:
103-
"r" (from), // 0
102+
"+r" (from) // 0
103+
:
104104
"r" (to), // 1
105105
"r" (x), // 2
106106
"r" (y), // 3

‎kernel/x86_64/ssymv_L_microk_nehalem-2.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ static void ssymv_kernel_4x4(BLASLONG from, BLASLONG to, FLOAT **a, FLOAT *x, F
113113
"movss %%xmm3 , 12(%9) \n\t" // save temp2
114114

115115
:
116-
:
117-
"r" (from), // 0
116+
"+r" (from) // 0
117+
:
118118
"r" (to), // 1
119119
"r" (x), // 2
120120
"r" (y), // 3

‎kernel/x86_64/ssymv_L_microk_sandy-2.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ static void ssymv_kernel_4x4(BLASLONG from, BLASLONG to, FLOAT **a, FLOAT *x, FL
109109
"vzeroupper \n\t"
110110

111111
:
112-
:
113-
"r" (from), // 0
112+
"+r" (from) // 0
113+
:
114114
"r" (to), // 1
115115
"r" (x), // 2
116116
"r" (y), // 3
@@ -217,8 +217,8 @@ static void ssymv_kernel_4x4(BLASLONG from, BLASLONG to, FLOAT **a, FLOAT *x, FL
217217
"vzeroupper \n\t"
218218

219219
:
220-
:
221-
"r" (from), // 0
220+
"+r" (from) // 0
221+
:
222222
"r" (to), // 1
223223
"r" (x), // 2
224224
"r" (y), // 3

‎kernel/x86_64/ssymv_U_microk_bulldozer-2.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ static void ssymv_kernel_4x4(BLASLONG n, FLOAT *a0, FLOAT *a1, FLOAT *a2, FLOAT
9090
"vmovss %%xmm3 ,12(%9) \n\t" // save temp2
9191

9292
:
93-
:
94-
"r" (i), // 0
95-
"r" (n), // 1
93+
"+r" (i), // 0
94+
"+r" (n) // 1
95+
:
9696
"r" (x), // 2
9797
"r" (y), // 3
9898
"r" (a0), // 4

‎kernel/x86_64/ssymv_U_microk_haswell-2.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ static void ssymv_kernel_4x4(BLASLONG n, FLOAT *a0, FLOAT *a1, FLOAT *a2, FLOAT
112112
"vzeroupper \n\t"
113113

114114
:
115-
:
116-
"r" (i), // 0
117-
"r" (n), // 1
115+
"+r" (i), // 0
116+
"+r" (n) // 1
117+
:
118118
"r" (x), // 2
119119
"r" (y), // 3
120120
"r" (a0), // 4

‎kernel/x86_64/ssymv_U_microk_nehalem-2.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ static void ssymv_kernel_4x4(BLASLONG n, FLOAT *a0, FLOAT *a1, FLOAT *a2, FLOAT
106106
"movss %%xmm3 , 12(%9) \n\t" // save temp2
107107

108108
:
109-
:
110-
"r" (i), // 0
111-
"r" (n), // 1
109+
"+r" (i), // 0
110+
"+r" (n) // 1
111+
:
112112
"r" (x), // 2
113113
"r" (y), // 3
114114
"r" (a0), // 4

‎kernel/x86_64/ssymv_U_microk_sandy-2.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ static void ssymv_kernel_4x4(BLASLONG n, FLOAT *a0, FLOAT *a1, FLOAT *a2, FLOAT
120120
"vzeroupper \n\t"
121121

122122
:
123-
:
124-
"r" (i), // 0
125-
"r" (n), // 1
123+
"+r" (i), // 0
124+
"+r" (n) // 1
125+
:
126126
"r" (x), // 2
127127
"r" (y), // 3
128128
"r" (a0), // 4

0 commit comments

Comments
 (0)