Skip to content

Commit a1616a0

Browse files
committed
s390x: replace nop with "nop 0" in inline assembly
... as a bandaid for building with clang until LLVM's internal assembler supports nops without operand. Signed-off-by: Marius Hillenbrand <[email protected]>
1 parent 60ef193 commit a1616a0

File tree

16 files changed

+20
-20
lines changed

16 files changed

+20
-20
lines changed

kernel/zarch/dgemv_n_4.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ static void dgemv_kernel_4x4(BLASLONG n, FLOAT **ap, FLOAT *x, FLOAT *y,
169169
"agfi %%r1,32\n\t"
170170
"brctg %%r0,2b\n\t"
171171
"3:\n\t"
172-
"nop"
172+
"nop 0"
173173
: "+m"(*(struct { FLOAT x[n]; } *) y)
174174
: [y] "a"(y), "m"(*(const struct { FLOAT x[n]; } *) ap0),[ap0] "a"(ap0),
175175
"m"(*(const struct { FLOAT x[n]; } *) ap1),[ap1] "a"(ap1),
@@ -274,7 +274,7 @@ static void dgemv_kernel_4x2(BLASLONG n, FLOAT **ap, FLOAT *x, FLOAT *y,
274274
"agfi %%r1,32\n\t"
275275
"brctg %%r0,2b\n\t"
276276
"3:\n\t"
277-
"nop"
277+
"nop 0"
278278
: "+m"(*(struct { FLOAT x[n]; } *) y)
279279
: [y] "a"(y), "m"(*(const struct { FLOAT x[n]; } *) ap0),[ap0] "a"(ap0),
280280
"m"(*(const struct { FLOAT x[n]; } *) ap1),[ap1] "a"(ap1),
@@ -351,7 +351,7 @@ static void dgemv_kernel_4x1(BLASLONG n, FLOAT *a0, FLOAT *x, FLOAT *y,
351351
"agfi %%r1,32\n\t"
352352
"brctg %%r0,2b\n\t"
353353
"3:\n\t"
354-
"nop"
354+
"nop 0"
355355
: "+m"(*(struct { FLOAT x[n]; } *) y)
356356
: [y] "a"(y), "m"(*(const struct { FLOAT x[n]; } *) a0),[a0] "a"(a0),
357357
"m"(*(const FLOAT (*)[1]) x),[x] "a"(x),[alpha] "Q"(*alpha),

kernel/zarch/dgemv_t_4.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ static void add_y_kernel_4(BLASLONG n, FLOAT da, FLOAT *src, FLOAT *dest) {
438438
"agfi %%r1,32\n\t"
439439
"brctg %%r0,2b\n\t"
440440
"3:\n\t"
441-
"nop"
441+
"nop 0"
442442
: "+m"(*(struct { FLOAT x[n]; } *) dest)
443443
: [dest] "a"(dest),[da] "Q"(da), "m"(*(const struct { FLOAT x[n]; } *) src),
444444
[src] "a"(src),[n] "r"(n)

kernel/zarch/icamax.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ static BLASLONG icamax_kernel_32(BLASLONG n, FLOAT *x, FLOAT *amax) {
213213
"ste %%f0,%[amax]\n\t"
214214
"vlgvg %[iamax],%%v1,0\n\t"
215215
"2:\n\t"
216-
"nop"
216+
"nop 0"
217217
: [iamax] "=r"(iamax),[amax] "=Q"(*amax),[n] "+&r"(n)
218218
: "m"(*(const struct { FLOAT x[n * 2]; } *) x),[x] "a"(x)
219219
: "cc", "r1", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8",

kernel/zarch/icamin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ static BLASLONG icamin_kernel_32(BLASLONG n, FLOAT *x, FLOAT *amin) {
213213
"ste %%f0,%[amin]\n\t"
214214
"vlgvg %[iamin],%%v1,0\n\t"
215215
"2:\n\t"
216-
"nop"
216+
"nop 0"
217217
: [iamin] "=r"(iamin),[amin] "=Q"(*amin),[n] "+&r"(n)
218218
: "m"(*(const struct { FLOAT x[n * 2]; } *) x),[x] "a"(x)
219219
: "cc", "r1", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8",

kernel/zarch/idamax.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ static BLASLONG idamax_kernel_32(BLASLONG n, FLOAT *x, FLOAT *amax) {
160160
"std %%f0,%[amax]\n\t"
161161
"vlgvg %[iamax],%%v1,0\n\t"
162162
"2:\n\t"
163-
"nop"
163+
"nop 0"
164164
: [iamax] "=r"(iamax),[amax] "=Q"(*amax),[n] "+&r"(n)
165165
: "m"(*(const struct { FLOAT x[n]; } *) x),[x] "a"(x)
166166
: "cc", "r1", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v16",

kernel/zarch/idamin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ static BLASLONG idamin_kernel_32(BLASLONG n, FLOAT *x, FLOAT *amin) {
160160
"std %%f0,%[amin]\n\t"
161161
"vlgvg %[iamin],%%v1,0\n\t"
162162
"2:\n\t"
163-
"nop"
163+
"nop 0"
164164
: [iamin] "=r"(iamin),[amin] "=Q"(*amin),[n] "+&r"(n)
165165
: "m"(*(const struct { FLOAT x[n]; } *) x),[x] "a"(x)
166166
: "cc", "r1", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v16",

kernel/zarch/idmax.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ static BLASLONG idmax_kernel_32(BLASLONG n, FLOAT *x, FLOAT *max) {
140140
"std %%f0,%[max]\n\t"
141141
"vlgvg %[imax],%%v1,0\n\t"
142142
"2:\n\t"
143-
"nop"
143+
"nop 0"
144144
: [imax] "=r"(imax),[max] "=Q"(*max),[n] "+&r"(n)
145145
: "m"(*(const struct { FLOAT x[n]; } *) x),[x] "a"(x)
146146
: "cc", "r1", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v16",

kernel/zarch/idmin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ static BLASLONG idmin_kernel_32(BLASLONG n, FLOAT *x, FLOAT *min) {
140140
"std %%f0,%[min]\n\t"
141141
"vlgvg %[imin],%%v1,0\n\t"
142142
"2:\n\t"
143-
"nop"
143+
"nop 0"
144144
: [imin] "=r"(imin),[min] "=Q"(*min),[n] "+&r"(n)
145145
: "m"(*(const struct { FLOAT x[n]; } *) x),[x] "a"(x)
146146
: "cc", "r1", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v16",

kernel/zarch/isamax.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ static BLASLONG isamax_kernel_64(BLASLONG n, FLOAT *x, FLOAT *amax) {
204204
"ste %%f0,%[amax]\n\t"
205205
"vlgvg %[iamax],%%v1,0\n\t"
206206
"2:\n\t"
207-
"nop"
207+
"nop 0"
208208
: [iamax] "=r"(iamax),[amax] "=Q"(*amax),[n] "+&r"(n)
209209
: "m"(*(const struct { FLOAT x[n]; } *) x),[x] "a"(x)
210210
: "cc", "r1", "v0", "v1", "v2", "v4", "v5", "v6", "v7", "v8", "v16",

kernel/zarch/isamin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ static BLASLONG isamin_kernel_64(BLASLONG n, FLOAT *x, FLOAT *amin) {
204204
"ste %%f0,%[amin]\n\t"
205205
"vlgvg %[iamin],%%v1,0\n\t"
206206
"2:\n\t"
207-
"nop"
207+
"nop 0"
208208
: [iamin] "=r"(iamin),[amin] "=Q"(*amin),[n] "+&r"(n)
209209
: "m"(*(const struct { FLOAT x[n]; } *) x),[x] "a"(x)
210210
: "cc", "r1", "v0", "v1", "v2", "v4", "v5", "v6", "v7", "v8", "v16",

0 commit comments

Comments
 (0)