added optimized caxpy-kernel for haswell

diff --git a/kernel/x86_64/KERNEL.HASWELL b/kernel/x86_64/KERNEL.HASWELL
index a6e085d..9cce777 100644 (file)
--- a/kernel/x86_64/KERNEL.HASWELL
+++ b/kernel/x86_64/KERNEL.HASWELL
@@ -15,9 +15,9 @@ DDOTKERNEL = ddot.c
 CDOTKERNEL = cdot.c
 ZDOTKERNEL = zdot.c
 
-
-DAXPYKERNEL = daxpy.c
 SAXPYKERNEL = saxpy.c
+DAXPYKERNEL = daxpy.c
+CAXPYKERNEL = caxpy.c
 
 SGEMMKERNEL    =  sgemm_kernel_16x4_haswell.S
 SGEMMINCOPY    =  ../generic/gemm_ncopy_16.c

diff --git a/kernel/x86_64/caxpy.c b/kernel/x86_64/caxpy.c
index 80d3a76..ce174c5 100644 (file)
--- a/kernel/x86_64/caxpy.c
+++ b/kernel/x86_64/caxpy.c
@@ -33,6 +33,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "caxpy_microk_steamroller-2.c"
 #elif defined(BULLDOZER)
 #include "caxpy_microk_bulldozer-2.c"
+#elif defined(HASWELL)
+#include "caxpy_microk_haswell-2.c"
 #endif
 
 
@@ -80,7 +82,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da_r, FLOAT da_i,
        if ( (inc_x == 1) && (inc_y == 1) )
        {
 
-               int n1 = n & -16;
+               int n1 = n & -32;
 
                if ( n1 )
                {
@@ -89,6 +91,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da_r, FLOAT da_i,
                        caxpy_kernel_8(n1, x, y , da );
                        ix = 2 * n1;
                }
+
                i = n1;
                while(i < n)
                {

diff --git a/kernel/x86_64/caxpy_microk_haswell-2.c b/kernel/x86_64/caxpy_microk_haswell-2.c
new file mode 100644 (file)
index 0000000..7a9fc1b
--- /dev/null
+++ b/kernel/x86_64/caxpy_microk_haswell-2.c
@@ -0,0 +1,132 @@
+/***************************************************************************
+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_8 1
+static void caxpy_kernel_8( BLASLONG n, FLOAT *x, FLOAT *y , FLOAT *alpha) __attribute__ ((noinline));
+
+static void caxpy_kernel_8( BLASLONG n, FLOAT *x, FLOAT *y, FLOAT *alpha)
+{
+
+#if !defined(CONJ)
+       FLOAT mvec[8] = { -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0 };
+#else
+       FLOAT mvec[8] = { 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0 };
+#endif
+
+       BLASLONG register i = 0;
+
+       __asm__  __volatile__
+       (
+       "vzeroupper                                         \n\t"
+       "vbroadcastss           (%4), %%ymm0                \n\t"  // real part of alpha
+       "vbroadcastss          4(%4), %%ymm1                \n\t"  // imag part of alpha
+#if !defined(CONJ)
+       "vmulps         (%5), %%ymm1 , %%ymm1               \n\t"
+#else
+       "vmulps         (%5), %%ymm0 , %%ymm0               \n\t"
+#endif
+
+       ".align 16                                          \n\t"
+       "1:                                         \n\t"
+
+       "vmovups        (%2,%0,4), %%ymm5                   \n\t" // 4 complex values from x
+       ".align 2                                           \n\t"
+       "vmovups      32(%2,%0,4), %%ymm7                   \n\t" // 4 complex values from x
+       "vmovups      64(%2,%0,4), %%ymm9                   \n\t" // 4 complex values from x
+       "vmovups      96(%2,%0,4), %%ymm11                  \n\t" // 4 complex values from x
+
+       "vmovups     128(%2,%0,4), %%ymm12                  \n\t" // 4 complex values from x
+       "vmovups     160(%2,%0,4), %%ymm13                  \n\t" // 4 complex values from x
+       "vmovups     192(%2,%0,4), %%ymm14                  \n\t" // 4 complex values from x
+       "vmovups     224(%2,%0,4), %%ymm15                  \n\t" // 4 complex values from x
+
+       "vpermilps      $0xb1 , %%ymm5 , %%ymm4             \n\t"  // exchange real and imag part
+       "vpermilps      $0xb1 , %%ymm7 , %%ymm6             \n\t"  // exchange real and imag part
+       "vpermilps      $0xb1 , %%ymm9 , %%ymm8             \n\t"  // exchange real and imag part
+       "vpermilps      $0xb1 , %%ymm11, %%ymm10            \n\t"  // exchange real and imag part
+
+       "vfmadd213ps    (%3,%0,4), %%ymm0 , %%ymm5          \n\t"
+       ".align 2                                           \n\t"
+       "vfmadd213ps  32(%3,%0,4), %%ymm0 , %%ymm7          \n\t"
+       "vfmadd213ps  64(%3,%0,4), %%ymm0 , %%ymm9          \n\t"
+       "vfmadd213ps  96(%3,%0,4), %%ymm0 , %%ymm11         \n\t"
+
+       "vfmadd231ps    %%ymm1 , %%ymm4 , %%ymm5   \n\t"
+       "vfmadd231ps    %%ymm1 , %%ymm6 , %%ymm7   \n\t"
+       "vfmadd231ps    %%ymm1 , %%ymm8 , %%ymm9   \n\t"
+       "vfmadd231ps    %%ymm1 , %%ymm10, %%ymm11  \n\t"
+
+       "vpermilps      $0xb1 , %%ymm12, %%ymm4             \n\t"  // exchange real and imag part
+       "vpermilps      $0xb1 , %%ymm13, %%ymm6             \n\t"  // exchange real and imag part
+       "vpermilps      $0xb1 , %%ymm14, %%ymm8             \n\t"  // exchange real and imag part
+       "vpermilps      $0xb1 , %%ymm15, %%ymm10            \n\t"  // exchange real and imag part
+
+       "vfmadd213ps 128(%3,%0,4), %%ymm0 , %%ymm12         \n\t"
+       "vfmadd213ps 160(%3,%0,4), %%ymm0 , %%ymm13         \n\t"
+       "vfmadd213ps 192(%3,%0,4), %%ymm0 , %%ymm14         \n\t"
+       "vfmadd213ps 224(%3,%0,4), %%ymm0 , %%ymm15         \n\t"
+
+       "vfmadd231ps    %%ymm1 , %%ymm4 , %%ymm12  \n\t"
+       "vfmadd231ps    %%ymm1 , %%ymm6 , %%ymm13  \n\t"
+       "vfmadd231ps    %%ymm1 , %%ymm8 , %%ymm14  \n\t"
+       "vfmadd231ps    %%ymm1 , %%ymm10, %%ymm15  \n\t"
+
+       "vmovups        %%ymm5 ,   (%3,%0,4)                \n\t"
+       ".align 2                                           \n\t"
+       "vmovups        %%ymm7 , 32(%3,%0,4)                \n\t"
+       "vmovups        %%ymm9 , 64(%3,%0,4)                \n\t"
+       "vmovups        %%ymm11, 96(%3,%0,4)                \n\t"
+
+       "vmovups        %%ymm12,128(%3,%0,4)                \n\t"
+       "vmovups        %%ymm13,160(%3,%0,4)                \n\t"
+       "vmovups        %%ymm14,192(%3,%0,4)                \n\t"
+       "vmovups        %%ymm15,224(%3,%0,4)                \n\t"
+
+       "addq           $64, %0                              \n\t"
+       "subq           $32, %1                              \n\t"              
+       "jnz            1b                           \n\t"
+       "vzeroupper                                         \n\t"
+
+       :
+        : 
+          "r" (i),     // 0    
+         "r" (n),      // 1
+          "r" (x),      // 2
+          "r" (y),      // 3
+          "r" (alpha),  // 4
+          "r" (mvec)    // 5
+       : "cc", 
+         "%xmm0", "%xmm1",
+         "%xmm4", "%xmm5", "%xmm6", "%xmm7", 
+         "%xmm8", "%xmm9", "%xmm10", "%xmm11", 
+         "%xmm12", "%xmm13", "%xmm14", "%xmm15", 
+         "memory"
+       );
+
+
+} 
+