Merge pull request #5756 from OpenMathLib/issue5267

Work around miscompilation of the AVX512 ?GEMM kernels by Windows LLVM

Author: martin-frbg

kernel/x86_64/KERNEL.SKYLAKEX

@@ -1,7 +1,12 @@
 include $(KERNELDIR)/KERNEL.HASWELL
 
+ifeq ($(C_COMPILER)$(OSNAME), CLANGWINNT)
+SGEMMKERNEL    = sgemm_kernel_16x4_skylakex.S
+STRMMKERNEL    = sgemm_kernel_16x4_skylakex.S
+else
 SGEMMKERNEL    =  sgemm_kernel_16x4_skylakex_3.c
 STRMMKERNEL    =  sgemm_kernel_16x4_skylakex_2.c
+endif
 SGEMMINCOPY    =  ../generic/gemm_ncopy_16.c
 SGEMMITCOPY    =  sgemm_tcopy_16_skylakex.c
 SGEMMONCOPY    =  sgemm_ncopy_4_skylakex.c
@@ -20,8 +25,13 @@ SGEMM_SMALL_K_B0_TN = sgemm_small_kernel_tn_skylakex.c
 SGEMM_SMALL_K_TT = sgemm_small_kernel_tt_skylakex.c
 SGEMM_SMALL_K_B0_TT = sgemm_small_kernel_tt_skylakex.c
 
+ifeq ($(C_COMPILER)$(OSNAME), CLANGWINNT)
+DGEMMKERNEL    =  dgemm_kernel_16x2_skylakex.S
+DTRMMKERNEL    =  dgemm_kernel_16x2_skylakex.S
+else
 DGEMMKERNEL    =  dgemm_kernel_16x2_skylakex.c
 DTRMMKERNEL    =  dgemm_kernel_16x2_skylakex.c
+endif
 DGEMMINCOPY    =  ../generic/gemm_ncopy_16.c
 DGEMMITCOPY    =  dgemm_tcopy_16_skylakex.c
 DGEMMONCOPY    =  ../generic/gemm_ncopy_2.c
@@ -41,8 +51,13 @@ DGEMM_SMALL_K_B0_TT = dgemm_small_kernel_tt_skylakex.c
 SGEMM_BETA = sgemm_beta_skylakex.c
 DGEMM_BETA = dgemm_beta_skylakex.c
 
+ifeq ($(C_COMPILER)$(OSNAME), CLANGWINNT)
+CGEMMKERNEL    =  cgemm_kernel_8x2_haswell.c
+ZGEMMKERNEL    =  zgemm_kernel_4x2_haswell.c
+else
 CGEMMKERNEL    =  cgemm_kernel_8x2_skylakex.c
 ZGEMMKERNEL    =  zgemm_kernel_4x2_skylakex.c
+endif
 
 CASUMKERNEL = casum.c
 ZASUMKERNEL = zasum.c

test/CMakeLists.txt

@@ -66,7 +66,8 @@ FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_helper.ps1
 "$ErrorActionPreference = \"Stop\"\n"
 "Get-Content $args[1] | & $args[0]\n" 
 "If ((Get-Content $args[2] | %{$_ -match \"FATAL\"}) -contains $true) {\n"
-"echo Error\n"
+"echo Error in $args[1]:\n"
+"Get-Content $args[2] \n"
 "exit 1\n"
 "} else {\n"
 "exit 0\n"