Skip to content

Commit 413e609

Browse files
authored
Merge pull request #5618 from vtjnash/jn/zdot_thunderx2t99-ICE
arm64: fix clang ICE on Windows for thunderx2t kernels
2 parents a10f535 + a18a4ee commit 413e609

File tree

4 files changed

+11
-1
lines changed

4 files changed

+11
-1
lines changed

kernel/arm64/dznrm2_thunderx2t99_fast.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,10 @@ static double nrm2_compute(BLASLONG n, FLOAT *x, BLASLONG inc_x)
155155
" cmp "J", xzr \n"
156156
" beq .Lnrm2_kernel_F1 \n"
157157

158+
/* https://github.com/llvm/llvm-project/issues/149547 */
159+
#if !(defined(__clang__) && defined(OS_WINDOWS))
158160
" .align 5 \n"
161+
#endif
159162
".Lnrm2_kernel_F: \n"
160163
" "KERNEL_F" \n"
161164
" subs "J", "J", #1 \n"

kernel/arm64/scnrm2_thunderx2t99.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,10 @@ static double nrm2_compute(BLASLONG n, FLOAT *x, BLASLONG inc_x)
238238
" cmp "J", xzr \n"
239239
" beq 5f //nrm2_kernel_S_BEGIN \n"
240240

241+
/* https://github.com/llvm/llvm-project/issues/149547 */
242+
#if !(defined(__clang__) && defined(OS_WINDOWS))
241243
" .align 5 \n"
244+
#endif
242245
"2: //nrm2_kernel_F: \n"
243246
" "KERNEL_F" \n"
244247
" subs "J", "J", #1 \n"

kernel/arm64/zdot_thunderx2t99.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,8 @@ static void zdot_compute(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLON
243243
" asr "J", "N", #"N_DIV_SHIFT" \n"
244244
" cmp "J", xzr \n"
245245
" beq 3f //dot_kernel_F1 \n"
246-
#ifndef _MSC_VER
246+
/* https://github.com/llvm/llvm-project/issues/149547 */
247+
#if !(defined(__clang__) && defined(OS_WINDOWS))
247248
" .align 5 \n"
248249
#endif
249250
"2: //dot_kernel_F: \n"

kernel/arm64/zsum_thunderx2t99.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,10 @@ static FLOAT zasum_compute(BLASLONG n, FLOAT *x, BLASLONG inc_x)
136136
" cmp "J", xzr \n"
137137
" beq 3f //asum_kernel_F1 \n"
138138

139+
/* https://github.com/llvm/llvm-project/issues/149547 */
140+
#if !(defined(__clang__) && defined(OS_WINDOWS))
139141
".align 5 \n"
142+
#endif
140143
"2: //asum_kernel_F16: \n"
141144
" "KERNEL_F16" \n"
142145
" subs "J", "J", #1 \n"

0 commit comments

Comments
 (0)