added optimized dsymv kernels for haswell

Makefile

@@ -20,6 +20,8 @@ ifneq ($(NO_LAPACK), 1)
 SUBDIRS	+= lapack
 endif
 
+LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast,$(LAPACK_FFLAGS))
+
 SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench
 
 .PHONY : all libs netlib test ctest shared install
@@ -231,7 +233,7 @@ ifndef NOFORTRAN
 	-@echo "FORTRAN     = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "OPTS        = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "POPTS       = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
-	-@echo "NOOPT       = $(LAPACK_FFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc
+	-@echo "NOOPT       = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "PNOOPT      = $(LAPACK_FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "LOADOPTS    = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "CC          = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc

common_arm.h

@@ -71,8 +71,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef COMMON_ARM
 #define COMMON_ARM
 
-#define MB
-#define WMB
+#define MB   __asm__ __volatile__ ("dmb  ish" : : : "memory")
+#define WMB  __asm__ __volatile__ ("dmb  ishst" : : : "memory")
 
 #define INLINE inline
 
@@ -88,9 +88,12 @@ static void __inline blas_lock(volatile BLASULONG *address){
     while (*address) {YIELDING;};
 
     __asm__ __volatile__(
+			 "1:								\n\t"
                          "ldrex r2, [%1]                                                \n\t"
                          "mov   r2, #0                                                  \n\t"
                          "strex r3, r2, [%1]                                            \n\t"
+			 "cmp	r3, #0							\n\t"
+			 "bne	1b							\n\t"
 			 "mov	%0 , r3							\n\t"
                          : "=r"(ret), "=r"(address)
                          : "1"(address)

kernel/x86_64/KERNEL.HASWELL

@@ -10,6 +10,9 @@ ZGEMVTKERNEL = zgemv_t_4.c
 CGEMVNKERNEL = cgemv_n_4.c
 CGEMVTKERNEL = cgemv_t_4.c
 
+DSYMV_L_KERNEL = dsymv_L.c
+DSYMV_U_KERNEL = dsymv_U.c
+
 SDOTKERNEL = sdot.c
 DDOTKERNEL = ddot.c
 CDOTKERNEL = cdot.c

kernel/x86_64/dsymv_L.c

@@ -30,6 +30,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if defined(BULLDOZER) || defined(PILEDRIVER) || defined(STEAMROLLER)
 #include "dsymv_L_microk_bulldozer-2.c"
+#elif defined(HASWELL)
+#include "dsymv_L_microk_haswell-2.c"
 #elif defined(NEHALEM)
 #include "dsymv_L_microk_nehalem-2.c"
 #endif

kernel/x86_64/dsymv_L_microk_haswell-2.c

@@ -0,0 +1,129 @@
+/***************************************************************************
+Copyright (c) 2014, The OpenBLAS Project
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in
+the documentation and/or other materials provided with the
+distribution.
+3. Neither the name of the OpenBLAS project nor the names of
+its contributors may be used to endorse or promote products
+derived from this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*****************************************************************************/
+
+#define HAVE_KERNEL_4x4 1
+static void dsymv_kernel_4x4( BLASLONG from, BLASLONG to, FLOAT **a, FLOAT *x, FLOAT *y, FLOAT *temp1, FLOAT *temp2) __attribute__ ((noinline));
+
+static void dsymv_kernel_4x4(BLASLONG from, BLASLONG to, FLOAT **a, FLOAT *x, FLOAT *y, FLOAT *temp1, FLOAT *temp2)
+{
+
+
+	__asm__  __volatile__
+	(
+	"vzeroupper				     \n\t"
+	"vxorpd		%%ymm0 , %%ymm0 , %%ymm0     \n\t"	// temp2[0]
+	"vxorpd		%%ymm1 , %%ymm1 , %%ymm1     \n\t"	// temp2[1]
+	"vxorpd		%%ymm2 , %%ymm2 , %%ymm2     \n\t"	// temp2[2]
+	"vxorpd		%%ymm3 , %%ymm3 , %%ymm3     \n\t"	// temp2[3]
+	"vbroadcastsd   (%8),    %%ymm4	             \n\t"	// temp1[0]
+	"vbroadcastsd  8(%8),    %%ymm5	             \n\t"	// temp1[1]
+	"vbroadcastsd 16(%8),    %%ymm6	             \n\t"	// temp1[1]
+	"vbroadcastsd 24(%8),    %%ymm7	             \n\t"	// temp1[1]
+
+	".align 16				     \n\t"
+	"1:				     \n\t"
+
+	"vmovups	(%3,%0,8), %%ymm9	           \n\t"  // 2 * y
+	"vmovups	(%2,%0,8), %%ymm8	           \n\t"  // 2 * x
+
+	"vmovups	(%4,%0,8), %%ymm12	           \n\t"  // 2 * a
+	"vmovups	(%5,%0,8), %%ymm13	           \n\t"  // 2 * a
+	"vmovups	(%6,%0,8), %%ymm14	           \n\t"  // 2 * a
+	"vmovups	(%7,%0,8), %%ymm15	           \n\t"  // 2 * a
+
+	"vfmadd231pd	%%ymm4, %%ymm12 , %%ymm9  \n\t"  // y     += temp1 * a
+	"vfmadd231pd	%%ymm8, %%ymm12 , %%ymm0  \n\t"  // temp2 += x * a
+
+	"vfmadd231pd	%%ymm5, %%ymm13 , %%ymm9  \n\t"  // y     += temp1 * a
+	"vfmadd231pd	%%ymm8, %%ymm13 , %%ymm1  \n\t"  // temp2 += x * a
+
+	"vfmadd231pd	%%ymm6, %%ymm14 , %%ymm9  \n\t"  // y     += temp1 * a
+	"vfmadd231pd	%%ymm8, %%ymm14 , %%ymm2  \n\t"  // temp2 += x * a
+
+	"vfmadd231pd	%%ymm7, %%ymm15 , %%ymm9  \n\t"  // y     += temp1 * a
+	"vfmadd231pd	%%ymm8, %%ymm15 , %%ymm3  \n\t"  // temp2 += x * a
+	"addq		$4 , %0	  	 	      \n\t"
+
+	"vmovups	%%ymm9 ,  -32(%3,%0,8)		   \n\t"
+
+	"cmpq		%0 , %1			      \n\t"
+	"jnz		1b		      \n\t"
+
+	"vmovsd		  (%9), %%xmm4		      \n\t"
+	"vmovsd		 8(%9), %%xmm5		      \n\t"
+	"vmovsd		16(%9), %%xmm6		      \n\t"
+	"vmovsd		24(%9), %%xmm7		      \n\t"
+
+	"vextractf128 $0x01, %%ymm0 , %%xmm12	      \n\t"
+	"vextractf128 $0x01, %%ymm1 , %%xmm13	      \n\t"
+	"vextractf128 $0x01, %%ymm2 , %%xmm14	      \n\t"
+	"vextractf128 $0x01, %%ymm3 , %%xmm15	      \n\t"
+
+	"vaddpd	        %%xmm0, %%xmm12, %%xmm0	      \n\t"
+	"vaddpd	        %%xmm1, %%xmm13, %%xmm1	      \n\t"
+	"vaddpd	        %%xmm2, %%xmm14, %%xmm2	      \n\t"
+	"vaddpd	        %%xmm3, %%xmm15, %%xmm3	      \n\t"
+
+	"vhaddpd        %%xmm0, %%xmm0, %%xmm0  \n\t"
+	"vhaddpd        %%xmm1, %%xmm1, %%xmm1  \n\t"
+	"vhaddpd        %%xmm2, %%xmm2, %%xmm2  \n\t"
+	"vhaddpd        %%xmm3, %%xmm3, %%xmm3  \n\t"
+
+	"vaddsd		%%xmm4, %%xmm0, %%xmm0  \n\t"
+	"vaddsd		%%xmm5, %%xmm1, %%xmm1  \n\t"
+	"vaddsd		%%xmm6, %%xmm2, %%xmm2  \n\t"
+	"vaddsd		%%xmm7, %%xmm3, %%xmm3  \n\t"
+
+	"vmovsd         %%xmm0 ,  (%9)		\n\t"	// save temp2
+	"vmovsd         %%xmm1 , 8(%9)		\n\t"	// save temp2
+	"vmovsd         %%xmm2 ,16(%9)		\n\t"	// save temp2
+	"vmovsd         %%xmm3 ,24(%9)		\n\t"	// save temp2
+	"vzeroupper				     \n\t"
+
+	:
+        : 
+          "r" (from),	// 0	
+	  "r" (to),  	// 1
+          "r" (x),      // 2
+          "r" (y),      // 3
+          "r" (a[0]),	// 4
+          "r" (a[1]),	// 5
+          "r" (a[2]),	// 6
+          "r" (a[3]),	// 8
+          "r" (temp1),  // 8
+          "r" (temp2)   // 9
+	: "cc", 
+	  "%xmm0", "%xmm1", "%xmm2", "%xmm3", 
+	  "%xmm4", "%xmm5", "%xmm6", "%xmm7", 
+	  "%xmm8", "%xmm9", "%xmm10", "%xmm11", 
+	  "%xmm12", "%xmm13", "%xmm14", "%xmm15",
+	  "memory"
+	);
+
+} 
+
+

kernel/x86_64/dsymv_U.c

@@ -31,6 +31,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if defined(BULLDOZER) || defined(PILEDRIVER) || defined(STEAMROLLER)
 #include "dsymv_U_microk_bulldozer-2.c"
+#elif defined(HASWELL)
+#include "dsymv_U_microk_haswell-2.c"
 #elif defined(NEHALEM)
 #include "dsymv_U_microk_nehalem-2.c"
 #endif

kernel/x86_64/dsymv_U_microk_haswell-2.c

@@ -0,0 +1,131 @@
+/***************************************************************************
+Copyright (c) 2014, The OpenBLAS Project
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in
+the documentation and/or other materials provided with the
+distribution.
+3. Neither the name of the OpenBLAS project nor the names of
+its contributors may be used to endorse or promote products
+derived from this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*****************************************************************************/
+
+#define HAVE_KERNEL_4x4 1
+static void dsymv_kernel_4x4(BLASLONG n, FLOAT *a0, FLOAT *a1, FLOAT *a2, FLOAT *a3, FLOAT *x, FLOAT *y, FLOAT *temp1, FLOAT *temp2) __attribute__ ((noinline));
+
+static void dsymv_kernel_4x4(BLASLONG n, FLOAT *a0, FLOAT *a1, FLOAT *a2, FLOAT *a3, FLOAT *x, FLOAT *y, FLOAT *temp1, FLOAT *temp2)
+{
+
+	BLASLONG register i = 0;
+
+	__asm__  __volatile__
+	(
+	"vzeroupper				     \n\t"
+	"vxorpd		%%ymm0 , %%ymm0 , %%ymm0     \n\t"	// temp2[0]
+	"vxorpd		%%ymm1 , %%ymm1 , %%ymm1     \n\t"	// temp2[1]
+	"vxorpd		%%ymm2 , %%ymm2 , %%ymm2     \n\t"	// temp2[2]
+	"vxorpd		%%ymm3 , %%ymm3 , %%ymm3     \n\t"	// temp2[3]
+	"vbroadcastsd   (%8),    %%ymm4	             \n\t"	// temp1[0]
+	"vbroadcastsd  8(%8),    %%ymm5	             \n\t"	// temp1[1]
+	"vbroadcastsd 16(%8),    %%ymm6	             \n\t"	// temp1[1]
+	"vbroadcastsd 24(%8),    %%ymm7	             \n\t"	// temp1[1]
+	"xorq           %0,%0                        \n\t"
+
+	".align 16				     \n\t"
+	"1:				     \n\t"
+
+	"vmovups	(%3,%0,8), %%ymm9	           \n\t"  // 2 * y
+	"vmovups	(%2,%0,8), %%ymm8	           \n\t"  // 2 * x
+
+	"vmovups	(%4,%0,8), %%ymm12	           \n\t"  // 2 * a
+	"vmovups	(%5,%0,8), %%ymm13	           \n\t"  // 2 * a
+	"vmovups	(%6,%0,8), %%ymm14	           \n\t"  // 2 * a
+	"vmovups	(%7,%0,8), %%ymm15	           \n\t"  // 2 * a
+
+	"vfmadd231pd	%%ymm4, %%ymm12 , %%ymm9  \n\t"  // y     += temp1 * a
+	"vfmadd231pd	%%ymm8, %%ymm12 , %%ymm0  \n\t"  // temp2 += x * a
+
+	"vfmadd231pd	%%ymm5, %%ymm13 , %%ymm9  \n\t"  // y     += temp1 * a
+	"vfmadd231pd	%%ymm8, %%ymm13 , %%ymm1  \n\t"  // temp2 += x * a
+
+	"vfmadd231pd	%%ymm6, %%ymm14 , %%ymm9  \n\t"  // y     += temp1 * a
+	"vfmadd231pd	%%ymm8, %%ymm14 , %%ymm2  \n\t"  // temp2 += x * a
+
+	"vfmadd231pd	%%ymm7, %%ymm15 , %%ymm9  \n\t"  // y     += temp1 * a
+	"vfmadd231pd	%%ymm8, %%ymm15 , %%ymm3  \n\t"  // temp2 += x * a
+	"addq		$4 , %0	  	 	      \n\t"
+	"subq		$4 , %1	  	 	      \n\t"
+
+	"vmovups	%%ymm9 ,  -32(%3,%0,8)		   \n\t"
+
+	"jnz		1b		      \n\t"
+
+	"vmovsd		  (%9), %%xmm4		      \n\t"
+	"vmovsd		 8(%9), %%xmm5		      \n\t"
+	"vmovsd		16(%9), %%xmm6		      \n\t"
+	"vmovsd		24(%9), %%xmm7		      \n\t"
+
+	"vextractf128 $0x01, %%ymm0 , %%xmm12	      \n\t"
+	"vextractf128 $0x01, %%ymm1 , %%xmm13	      \n\t"
+	"vextractf128 $0x01, %%ymm2 , %%xmm14	      \n\t"
+	"vextractf128 $0x01, %%ymm3 , %%xmm15	      \n\t"
+
+	"vaddpd	        %%xmm0, %%xmm12, %%xmm0	      \n\t"
+	"vaddpd	        %%xmm1, %%xmm13, %%xmm1	      \n\t"
+	"vaddpd	        %%xmm2, %%xmm14, %%xmm2	      \n\t"
+	"vaddpd	        %%xmm3, %%xmm15, %%xmm3	      \n\t"
+
+	"vhaddpd        %%xmm0, %%xmm0, %%xmm0  \n\t"
+	"vhaddpd        %%xmm1, %%xmm1, %%xmm1  \n\t"
+	"vhaddpd        %%xmm2, %%xmm2, %%xmm2  \n\t"
+	"vhaddpd        %%xmm3, %%xmm3, %%xmm3  \n\t"
+
+	"vaddsd		%%xmm4, %%xmm0, %%xmm0  \n\t"
+	"vaddsd		%%xmm5, %%xmm1, %%xmm1  \n\t"
+	"vaddsd		%%xmm6, %%xmm2, %%xmm2  \n\t"
+	"vaddsd		%%xmm7, %%xmm3, %%xmm3  \n\t"
+
+	"vmovsd         %%xmm0 ,  (%9)		\n\t"	// save temp2
+	"vmovsd         %%xmm1 , 8(%9)		\n\t"	// save temp2
+	"vmovsd         %%xmm2 ,16(%9)		\n\t"	// save temp2
+	"vmovsd         %%xmm3 ,24(%9)		\n\t"	// save temp2
+	"vzeroupper				     \n\t"
+
+	:
+        : 
+          "r" (i),	// 0	
+	  "r" (n),  	// 1
+          "r" (x),      // 2
+          "r" (y),      // 3
+          "r" (a0),	// 4
+          "r" (a1),	// 5
+          "r" (a2),	// 6
+          "r" (a3),	// 8
+          "r" (temp1),  // 8
+          "r" (temp2)   // 9
+	: "cc", 
+	  "%xmm0", "%xmm1", "%xmm2", "%xmm3", 
+	  "%xmm4", "%xmm5", "%xmm6", "%xmm7", 
+	  "%xmm8", "%xmm9", "%xmm10", "%xmm11", 
+	  "%xmm12", "%xmm13", "%xmm14", "%xmm15",
+	  "memory"
+	);
+
+} 
+
+

lapack-netlib/TESTING/EIG/Makefile

@@ -169,4 +169,4 @@ cchkee.o: cchkee.f
 zchkee.o: zchkee.f
 	$(FORTRAN) $(DRVOPTS) -c $< -o $@
 
-.f.o : ; $(FORTRAN) $(OPTS) -c $< -o $@
+.f.o : ; $(FORTRAN) $(DRVOPTS) -c $< -o $@

lapack-netlib/TESTING/LIN/Makefile

@@ -338,4 +338,4 @@ zchkaa.o: zchkaa.f
 	$(FORTRAN) $(DRVOPTS) -c $< -o $@
  
 .f.o: 
-	$(FORTRAN) $(OPTS) -c $< -o $@
+	$(FORTRAN) $(DRVOPTS) -c $< -o $@

make.inc

@@ -1,6 +1,6 @@
 SHELL = /bin/sh
 PLAT = _LINUX
-DRVOPTS  = $(OPTS)
+DRVOPTS  = $(NOOPT)
 ARCHFLAGS= -ru
 #RANLIB   = ranlib