From 0884b73c69cdee104e7d87d16eb1fac14a2de650 Mon Sep 17 00:00:00 2001 From: wernsaar Date: Thu, 10 Jul 2014 11:01:47 +0200 Subject: [PATCH] Lapack-test Windows 32bit now error free --- kernel/x86/KERNEL | 233 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 156 insertions(+), 77 deletions(-) diff --git a/kernel/x86/KERNEL b/kernel/x86/KERNEL index 924d869..8b30355 100644 --- a/kernel/x86/KERNEL +++ b/kernel/x86/KERNEL @@ -1,89 +1,168 @@ -#SAMAXKERNEL = ../arm/amax.c -#DAMAXKERNEL = ../arm/amax.c -#CAMAXKERNEL = ../arm/zamax.c -#ZAMAXKERNEL = ../arm/zamax.c - -SAMINKERNEL = ../arm/amin.c -DAMINKERNEL = ../arm/amin.c -CAMINKERNEL = ../arm/zamin.c -ZAMINKERNEL = ../arm/zamin.c - -SMAXKERNEL = ../arm/max.c -DMAXKERNEL = ../arm/max.c - -SMINKERNEL = ../arm/min.c -DMINKERNEL = ../arm/min.c - -#ISAMAXKERNEL = ../arm/iamax.c -#IDAMAXKERNEL = ../arm/iamax.c -#ICAMAXKERNEL = ../arm/izamax.c -#IZAMAXKERNEL = ../arm/izamax.c - -ISAMINKERNEL = ../arm/iamin.c -IDAMINKERNEL = ../arm/iamin.c -ICAMINKERNEL = ../arm/izamin.c -IZAMINKERNEL = ../arm/izamin.c - -#ISMAXKERNEL = ../arm/imax.c -#IDMAXKERNEL = ../arm/imax.c - -ISMINKERNEL = ../arm/imin.c -IDMINKERNEL = ../arm/imin.c - -#SASUMKERNEL = ../arm/asum.c -#DASUMKERNEL = ../arm/asum.c -#CASUMKERNEL = ../arm/zasum.c -#ZASUMKERNEL = ../arm/zasum.c - -#SAXPYKERNEL = ../arm/axpy.c -#DAXPYKERNEL = ../arm/axpy.c -#CAXPYKERNEL = ../arm/zaxpy.c -#ZAXPYKERNEL = ../arm/zaxpy.c - -#SCOPYKERNEL = ../arm/copy.c -#DCOPYKERNEL = ../arm/copy.c -#CCOPYKERNEL = ../arm/zcopy.c -#ZCOPYKERNEL = ../arm/zcopy.c - -#SDOTKERNEL = ../arm/dot.c -#DDOTKERNEL = ../arm/dot.c -#CDOTKERNEL = ../arm/zdot.c -#ZDOTKERNEL = ../arm/zdot.c +ifndef SAMINKERNEL +SAMINKERNEL = amax.S +endif -DSDOTKERNEL = ../arm/dot.c - -#SNRM2KERNEL = ../arm/nrm2.c -#DNRM2KERNEL = ../arm/nrm2.c -#CNRM2KERNEL = ../arm/znrm2.c -# Bug in znrm2 assembler kernel -ZNRM2KERNEL = ../arm/znrm2.c +ifndef DAMINKERNEL +DAMINKERNEL = amax.S +endif +ifndef QAMINKERNEL +QAMINKERNEL = amax.S +endif -#SROTKERNEL = ../arm/rot.c -#DROTKERNEL = ../arm/rot.c -#CROTKERNEL = ../arm/zrot.c -#ZROTKERNEL = ../arm/zrot.c +ifndef CAMINKERNEL +CAMINKERNEL = zamax.S +endif -#SSCALKERNEL = ../arm/scal.c -#DSCALKERNEL = ../arm/scal.c -#CSCALKERNEL = ../arm/zscal.c -#ZSCALKERNEL = ../arm/zscal.c +ifndef ZAMINKERNEL +ZAMINKERNEL = zamax.S +endif + +ifndef XAMINKERNEL +XAMINKERNEL = zamax.S +endif + +ifndef SMAXKERNEL +SMAXKERNEL = amax.S +endif + +ifndef DMAXKERNEL +DMAXKERNEL = amax.S +endif + +ifndef QMAXKERNEL +QMAXKERNEL = amax.S +endif + +ifndef SMINKERNEL +SMINKERNEL = amax.S +endif + +ifndef DMINKERNEL +DMINKERNEL = amax.S +endif + +ifndef QMINKERNEL +QMINKERNEL = amax.S +endif + +ifndef ISAMINKERNEL +ISAMINKERNEL = iamax.S +endif + +ifndef IDAMINKERNEL +IDAMINKERNEL = iamax.S +endif + +ifndef IQAMINKERNEL +IQAMINKERNEL = iamax.S +endif + +ifndef ICAMINKERNEL +ICAMINKERNEL = izamax.S +endif + +ifndef IZAMINKERNEL +IZAMINKERNEL = izamax.S +endif + +ifndef IXAMINKERNEL +IXAMINKERNEL = izamax.S +endif + +ifndef ISMINKERNEL +ISMINKERNEL = iamax.S +endif + +ifndef IDMINKERNEL +IDMINKERNEL = iamax.S +endif + +ifndef IQMINKERNEL +IQMINKERNEL = iamax.S +endif + +ifndef QDOTKERNEL +QDOTKERNEL = qdot.S +endif + +ifndef XDOTKERNEL +XDOTKERNEL = xdot.S +endif + +ifndef QAXPYKERNEL +QAXPYKERNEL = qaxpy.S +endif + +ifndef XAXPYKERNEL +XAXPYKERNEL = xaxpy.S +endif + +ifndef QGEMVNKERNEL +QGEMVNKERNEL = qgemv_n.S +endif + +ifndef QGEMVTKERNEL +QGEMVTKERNEL = qgemv_t.S +endif + +ifndef XGEMVNKERNEL +XGEMVNKERNEL = xgemv_n.S +endif + +ifndef XGEMVTKERNEL +XGEMVTKERNEL = xgemv_t.S +endif + +QGEMMKERNEL = qgemm_kernel_2x2.S +QGEMMINCOPY = +QGEMMITCOPY = +QGEMMONCOPY = ../generic/gemm_ncopy_2.c +QGEMMOTCOPY = ../generic/gemm_tcopy_2.c +QGEMMINCOPYOBJ = +QGEMMITCOPYOBJ = +QGEMMONCOPYOBJ = qgemm_oncopy$(TSUFFIX).$(SUFFIX) +QGEMMOTCOPYOBJ = qgemm_otcopy$(TSUFFIX).$(SUFFIX) + +XGEMMKERNEL = xgemm_kernel_1x1.S +XGEMMINCOPY = +XGEMMITCOPY = +XGEMMONCOPY = ../generic/zgemm_ncopy_1.c +XGEMMOTCOPY = ../generic/zgemm_tcopy_1.c +XGEMMINCOPYOBJ = +XGEMMITCOPYOBJ = +XGEMMONCOPYOBJ = xgemm_oncopy$(TSUFFIX).$(SUFFIX) +XGEMMOTCOPYOBJ = xgemm_otcopy$(TSUFFIX).$(SUFFIX) + +QTRSMKERNEL_LN = qtrsm_kernel_LN_2x2.S +QTRSMKERNEL_LT = qtrsm_kernel_LT_2x2.S +QTRSMKERNEL_RN = qtrsm_kernel_LT_2x2.S +QTRSMKERNEL_RT = qtrsm_kernel_RT_2x2.S + +XTRSMKERNEL_LN = xtrsm_kernel_LT_1x1.S +XTRSMKERNEL_LT = xtrsm_kernel_LT_1x1.S +XTRSMKERNEL_RN = xtrsm_kernel_LT_1x1.S +XTRSMKERNEL_RT = xtrsm_kernel_LT_1x1.S + +XGEMM3MKERNEL = xgemm3m_kernel_2x2.S + + +# bug in zdot assembler kernel +ifndef ZDOTKERNEL +ZDOTKERNEL = ../arm/zdot.c +endif -#SSWAPKERNEL = ../arm/swap.c -#DSWAPKERNEL = ../arm/swap.c -#CSWAPKERNEL = ../arm/zswap.c -#ZSWAPKERNEL = ../arm/zswap.c +DSDOTKERNEL = ../arm/dot.c -#SGEMVNKERNEL = ../arm/gemv_n.c -#DGEMVNKERNEL = ../arm/gemv_n.c -#CGEMVNKERNEL = ../arm/zgemv_n.c -#ZGEMVNKERNEL = ../arm/zgemv_n.c +# Bug in znrm2 assembler kernel +ifndef ZNRM2KERNEL +ZNRM2KERNEL = ../arm/znrm2.c +endif -#SGEMVTKERNEL = ../arm/gemv_t.c -#DGEMVTKERNEL = ../arm/gemv_t.c -#CGEMVTKERNEL = ../arm/zgemv_t.c # Bug in zgemv_t assembler kernel +ifndef ZGEMVTKERNEL ZGEMVTKERNEL = ../arm/zgemv_t.c +endif SGEMM_BETA = ../generic/gemm_beta.c DGEMM_BETA = ../generic/gemm_beta.c -- 2.7.4