From 53bb9242873919a6f0951bbef06eceafa27f8408 Mon Sep 17 00:00:00 2001 From: Werner Saar Date: Mon, 6 Apr 2015 12:33:16 +0200 Subject: [PATCH 1/4] added optimized saxpy- and daxpy-kernel for haswell --- kernel/x86_64/KERNEL.HASWELL | 2 + kernel/x86_64/daxpy.c | 4 +- kernel/x86_64/daxpy_microk_haswell-2.c | 78 ++++++++++++++++++++++++++ kernel/x86_64/saxpy.c | 4 +- kernel/x86_64/saxpy_microk_haswell-2.c | 78 ++++++++++++++++++++++++++ 5 files changed, 164 insertions(+), 2 deletions(-) create mode 100644 kernel/x86_64/daxpy_microk_haswell-2.c create mode 100644 kernel/x86_64/saxpy_microk_haswell-2.c diff --git a/kernel/x86_64/KERNEL.HASWELL b/kernel/x86_64/KERNEL.HASWELL index c8fb7da24..ea3d95872 100644 --- a/kernel/x86_64/KERNEL.HASWELL +++ b/kernel/x86_64/KERNEL.HASWELL @@ -13,6 +13,8 @@ CGEMVTKERNEL = cgemv_t_4.c SDOTKERNEL = sdot.c DDOTKERNEL = ddot.c +DAXPYKERNEL = daxpy.c +SAXPYKERNEL = saxpy.c SGEMMKERNEL = sgemm_kernel_16x4_haswell.S SGEMMINCOPY = ../generic/gemm_ncopy_16.c diff --git a/kernel/x86_64/daxpy.c b/kernel/x86_64/daxpy.c index fd5343eba..753b6b445 100644 --- a/kernel/x86_64/daxpy.c +++ b/kernel/x86_64/daxpy.c @@ -33,6 +33,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "daxpy_microk_nehalem-2.c" #elif defined(BULLDOZER) || defined(PILEDRIVER) || defined(STEAMROLLER) #include "daxpy_microk_bulldozer-2.c" +#elif defined(HASWELL) +#include "daxpy_microk_haswell-2.c" #endif @@ -71,7 +73,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da, FLOAT *x, BLAS if ( (inc_x == 1) && (inc_y == 1) ) { - int n1 = n & -8; + int n1 = n & -16; if ( n1 ) daxpy_kernel_8(n1, x, y , &da ); diff --git a/kernel/x86_64/daxpy_microk_haswell-2.c b/kernel/x86_64/daxpy_microk_haswell-2.c new file mode 100644 index 000000000..db117a8ba --- /dev/null +++ b/kernel/x86_64/daxpy_microk_haswell-2.c @@ -0,0 +1,78 @@ +/*************************************************************************** +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 daxpy_kernel_8( BLASLONG n, FLOAT *x, FLOAT *y , FLOAT *alpha) __attribute__ ((noinline)); + +static void daxpy_kernel_8( BLASLONG n, FLOAT *x, FLOAT *y, FLOAT *alpha) +{ + + + BLASLONG register i = 0; + + __asm__ __volatile__ + ( + "vbroadcastsd (%4), %%ymm0 \n\t" // alpha + + ".align 16 \n\t" + "1: \n\t" + + "vmovups (%3,%0,8), %%ymm12 \n\t" // 4 * y + "vmovups 32(%3,%0,8), %%ymm13 \n\t" // 4 * y + "vmovups 64(%3,%0,8), %%ymm14 \n\t" // 4 * y + "vmovups 96(%3,%0,8), %%ymm15 \n\t" // 4 * y + "vfmadd231pd (%2,%0,8), %%ymm0 , %%ymm12 \n\t" // y += alpha * x + "vfmadd231pd 32(%2,%0,8), %%ymm0 , %%ymm13 \n\t" // y += alpha * x + "vfmadd231pd 64(%2,%0,8), %%ymm0 , %%ymm14 \n\t" // y += alpha * x + "vfmadd231pd 96(%2,%0,8), %%ymm0 , %%ymm15 \n\t" // y += alpha * x + "vmovups %%ymm12, (%3,%0,8) \n\t" + "vmovups %%ymm13, 32(%3,%0,8) \n\t" + "vmovups %%ymm14, 64(%3,%0,8) \n\t" + "vmovups %%ymm15, 96(%3,%0,8) \n\t" + + "addq $16, %0 \n\t" + "subq $16, %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 + : "cc", + "%xmm0", + "%xmm8", "%xmm9", "%xmm10", "%xmm11", + "%xmm12", "%xmm13", "%xmm14", "%xmm15", + "memory" + ); + +} + + diff --git a/kernel/x86_64/saxpy.c b/kernel/x86_64/saxpy.c index da81f1354..ea83ddbaa 100644 --- a/kernel/x86_64/saxpy.c +++ b/kernel/x86_64/saxpy.c @@ -31,6 +31,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #if defined(NEHALEM) #include "saxpy_microk_nehalem-2.c" +#elif defined(HASWELL) +#include "saxpy_microk_haswell-2.c" #endif @@ -69,7 +71,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da, FLOAT *x, BLAS if ( (inc_x == 1) && (inc_y == 1) ) { - int n1 = n & -16; + int n1 = n & -32; if ( n1 ) saxpy_kernel_16(n1, x, y , &da ); diff --git a/kernel/x86_64/saxpy_microk_haswell-2.c b/kernel/x86_64/saxpy_microk_haswell-2.c new file mode 100644 index 000000000..496424207 --- /dev/null +++ b/kernel/x86_64/saxpy_microk_haswell-2.c @@ -0,0 +1,78 @@ +/*************************************************************************** +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_16 1 +static void saxpy_kernel_16( BLASLONG n, FLOAT *x, FLOAT *y , FLOAT *alpha) __attribute__ ((noinline)); + +static void saxpy_kernel_16( BLASLONG n, FLOAT *x, FLOAT *y, FLOAT *alpha) +{ + + + BLASLONG register i = 0; + + __asm__ __volatile__ + ( + "vbroadcastss (%4), %%ymm0 \n\t" // alpha + + ".align 16 \n\t" + "1: \n\t" + + "vmovups (%3,%0,4), %%ymm12 \n\t" // 8 * y + "vmovups 32(%3,%0,4), %%ymm13 \n\t" // 8 * y + "vmovups 64(%3,%0,4), %%ymm14 \n\t" // 8 * y + "vmovups 96(%3,%0,4), %%ymm15 \n\t" // 8 * y + "vfmadd231ps (%2,%0,4), %%ymm0 , %%ymm12 \n\t" // y += alpha * x + "vfmadd231ps 32(%2,%0,4), %%ymm0 , %%ymm13 \n\t" // y += alpha * x + "vfmadd231ps 64(%2,%0,4), %%ymm0 , %%ymm14 \n\t" // y += alpha * x + "vfmadd231ps 96(%2,%0,4), %%ymm0 , %%ymm15 \n\t" // y += alpha * x + "vmovups %%ymm12, (%3,%0,4) \n\t" + "vmovups %%ymm13, 32(%3,%0,4) \n\t" + "vmovups %%ymm14, 64(%3,%0,4) \n\t" + "vmovups %%ymm15, 96(%3,%0,4) \n\t" + + "addq $32, %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 + : "cc", + "%xmm0", + "%xmm8", "%xmm9", "%xmm10", "%xmm11", + "%xmm12", "%xmm13", "%xmm14", "%xmm15", + "memory" + ); + +} + + From 47898cca352d4d9448c13acce3870fd2c2390013 Mon Sep 17 00:00:00 2001 From: Werner Saar Date: Mon, 6 Apr 2015 16:05:16 +0200 Subject: [PATCH 2/4] added optimized saxpy- and daxpy-kernel for sandybridge --- kernel/x86_64/KERNEL.SANDYBRIDGE | 3 + kernel/x86_64/daxpy.c | 6 ++ kernel/x86_64/daxpy_microk_sandy-2.c | 100 +++++++++++++++++++++++++++ kernel/x86_64/saxpy.c | 6 ++ kernel/x86_64/saxpy_microk_sandy-2.c | 100 +++++++++++++++++++++++++++ 5 files changed, 215 insertions(+) create mode 100644 kernel/x86_64/daxpy_microk_sandy-2.c create mode 100644 kernel/x86_64/saxpy_microk_sandy-2.c diff --git a/kernel/x86_64/KERNEL.SANDYBRIDGE b/kernel/x86_64/KERNEL.SANDYBRIDGE index ac41d2772..b0b6c6c84 100644 --- a/kernel/x86_64/KERNEL.SANDYBRIDGE +++ b/kernel/x86_64/KERNEL.SANDYBRIDGE @@ -6,6 +6,9 @@ ZGEMVNKERNEL = zgemv_n_4.c SDOTKERNEL = sdot.c DDOTKERNEL = ddot.c +SAXPYKERNEL = saxpy.c +DAXPYKERNEL = daxpy.c + SGEMMKERNEL = sgemm_kernel_16x4_sandy.S SGEMMINCOPY = ../generic/gemm_ncopy_16.c SGEMMITCOPY = ../generic/gemm_tcopy_16.c diff --git a/kernel/x86_64/daxpy.c b/kernel/x86_64/daxpy.c index 753b6b445..c07b5ca15 100644 --- a/kernel/x86_64/daxpy.c +++ b/kernel/x86_64/daxpy.c @@ -35,6 +35,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "daxpy_microk_bulldozer-2.c" #elif defined(HASWELL) #include "daxpy_microk_haswell-2.c" +#elif defined(SANDYBRIDGE) +#include "daxpy_microk_sandy-2.c" #endif @@ -73,7 +75,11 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da, FLOAT *x, BLAS if ( (inc_x == 1) && (inc_y == 1) ) { +#if defined(SANDYBRIDGE) + int n1 = n & -32; +#else int n1 = n & -16; +#endif if ( n1 ) daxpy_kernel_8(n1, x, y , &da ); diff --git a/kernel/x86_64/daxpy_microk_sandy-2.c b/kernel/x86_64/daxpy_microk_sandy-2.c new file mode 100644 index 000000000..963ad322d --- /dev/null +++ b/kernel/x86_64/daxpy_microk_sandy-2.c @@ -0,0 +1,100 @@ +/*************************************************************************** +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 daxpy_kernel_8( BLASLONG n, FLOAT *x, FLOAT *y , FLOAT *alpha) __attribute__ ((noinline)); + +static void daxpy_kernel_8( BLASLONG n, FLOAT *x, FLOAT *y, FLOAT *alpha) +{ + + + BLASLONG register i = 0; + + __asm__ __volatile__ + ( + "vbroadcastsd (%4), %%ymm0 \n\t" // alpha + + ".align 16 \n\t" + "1: \n\t" + "vmovups (%3,%0,8), %%ymm8 \n\t" + "vmovups 32(%3,%0,8), %%ymm9 \n\t" + "vmovups 64(%3,%0,8), %%ymm10 \n\t" + "vmovups 96(%3,%0,8), %%ymm11 \n\t" + "vmovups 128(%3,%0,8), %%ymm12 \n\t" + "vmovups 160(%3,%0,8), %%ymm13 \n\t" + "vmovups 192(%3,%0,8), %%ymm14 \n\t" + "vmovups 224(%3,%0,8), %%ymm15 \n\t" + + "vmulpd (%2,%0,8), %%ymm0, %%ymm1 \n\t" + "vmulpd 32(%2,%0,8), %%ymm0, %%ymm2 \n\t" + "vaddpd %%ymm8 , %%ymm1, %%ymm8 \n\t" + "vmulpd 64(%2,%0,8), %%ymm0, %%ymm3 \n\t" + "vaddpd %%ymm9 , %%ymm2, %%ymm9 \n\t" + "vmulpd 96(%2,%0,8), %%ymm0, %%ymm4 \n\t" + "vaddpd %%ymm10, %%ymm3, %%ymm10 \n\t" + "vmulpd 128(%2,%0,8), %%ymm0, %%ymm5 \n\t" + "vaddpd %%ymm11, %%ymm4, %%ymm11 \n\t" + "vmulpd 160(%2,%0,8), %%ymm0, %%ymm6 \n\t" + "vaddpd %%ymm12, %%ymm5, %%ymm12 \n\t" + "vmulpd 192(%2,%0,8), %%ymm0, %%ymm7 \n\t" + "vmulpd 224(%2,%0,8), %%ymm0, %%ymm1 \n\t" + + "vaddpd %%ymm13, %%ymm6, %%ymm13 \n\t" + "vmovups %%ymm8 , (%3,%0,8) \n\t" + "vaddpd %%ymm14, %%ymm7, %%ymm14 \n\t" + "vmovups %%ymm9 , 32(%3,%0,8) \n\t" + "vaddpd %%ymm15, %%ymm1, %%ymm15 \n\t" + "vmovups %%ymm10, 64(%3,%0,8) \n\t" + "vmovups %%ymm11, 96(%3,%0,8) \n\t" + "vmovups %%ymm12,128(%3,%0,8) \n\t" + "vmovups %%ymm13,160(%3,%0,8) \n\t" + "vmovups %%ymm14,192(%3,%0,8) \n\t" + "vmovups %%ymm15,224(%3,%0,8) \n\t" + + "addq $32, %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 + : "cc", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7", + "%xmm8", "%xmm9", "%xmm10", "%xmm11", + "%xmm12", "%xmm13", "%xmm14", "%xmm15", + "memory" + ); + +} + + diff --git a/kernel/x86_64/saxpy.c b/kernel/x86_64/saxpy.c index ea83ddbaa..bb24d3cf5 100644 --- a/kernel/x86_64/saxpy.c +++ b/kernel/x86_64/saxpy.c @@ -33,6 +33,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "saxpy_microk_nehalem-2.c" #elif defined(HASWELL) #include "saxpy_microk_haswell-2.c" +#elif defined(SANDYBRIDGE) +#include "saxpy_microk_sandy-2.c" #endif @@ -71,7 +73,11 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da, FLOAT *x, BLAS if ( (inc_x == 1) && (inc_y == 1) ) { +#if defined(SANDYBRIDGE) + int n1 = n & -64; +#else int n1 = n & -32; +#endif if ( n1 ) saxpy_kernel_16(n1, x, y , &da ); diff --git a/kernel/x86_64/saxpy_microk_sandy-2.c b/kernel/x86_64/saxpy_microk_sandy-2.c new file mode 100644 index 000000000..8a4392d37 --- /dev/null +++ b/kernel/x86_64/saxpy_microk_sandy-2.c @@ -0,0 +1,100 @@ +/*************************************************************************** +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_16 1 +static void saxpy_kernel_16( BLASLONG n, FLOAT *x, FLOAT *y , FLOAT *alpha) __attribute__ ((noinline)); + +static void saxpy_kernel_16( BLASLONG n, FLOAT *x, FLOAT *y, FLOAT *alpha) +{ + + + BLASLONG register i = 0; + + __asm__ __volatile__ + ( + "vbroadcastss (%4), %%ymm0 \n\t" // alpha + + ".align 16 \n\t" + "1: \n\t" + "vmovups (%3,%0,4), %%ymm8 \n\t" + "vmovups 32(%3,%0,4), %%ymm9 \n\t" + "vmovups 64(%3,%0,4), %%ymm10 \n\t" + "vmovups 96(%3,%0,4), %%ymm11 \n\t" + "vmovups 128(%3,%0,4), %%ymm12 \n\t" + "vmovups 160(%3,%0,4), %%ymm13 \n\t" + "vmovups 192(%3,%0,4), %%ymm14 \n\t" + "vmovups 224(%3,%0,4), %%ymm15 \n\t" + + "vmulps (%2,%0,4), %%ymm0, %%ymm1 \n\t" + "vmulps 32(%2,%0,4), %%ymm0, %%ymm2 \n\t" + "vaddps %%ymm8 , %%ymm1, %%ymm8 \n\t" + "vmulps 64(%2,%0,4), %%ymm0, %%ymm3 \n\t" + "vaddps %%ymm9 , %%ymm2, %%ymm9 \n\t" + "vmulps 96(%2,%0,4), %%ymm0, %%ymm4 \n\t" + "vaddps %%ymm10, %%ymm3, %%ymm10 \n\t" + "vmulps 128(%2,%0,4), %%ymm0, %%ymm5 \n\t" + "vaddps %%ymm11, %%ymm4, %%ymm11 \n\t" + "vmulps 160(%2,%0,4), %%ymm0, %%ymm6 \n\t" + "vaddps %%ymm12, %%ymm5, %%ymm12 \n\t" + "vmulps 192(%2,%0,4), %%ymm0, %%ymm7 \n\t" + "vmulps 224(%2,%0,4), %%ymm0, %%ymm1 \n\t" + + "vaddps %%ymm13, %%ymm6, %%ymm13 \n\t" + "vmovups %%ymm8 , (%3,%0,4) \n\t" + "vaddps %%ymm14, %%ymm7, %%ymm14 \n\t" + "vmovups %%ymm9 , 32(%3,%0,4) \n\t" + "vaddps %%ymm15, %%ymm1, %%ymm15 \n\t" + "vmovups %%ymm10, 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 $64, %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 + : "cc", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7", + "%xmm8", "%xmm9", "%xmm10", "%xmm11", + "%xmm12", "%xmm13", "%xmm14", "%xmm15", + "memory" + ); + +} + + From 60c6dec6e629a9d79c4ce97ce4662848ae856bea Mon Sep 17 00:00:00 2001 From: Werner Saar Date: Mon, 6 Apr 2015 18:47:16 +0200 Subject: [PATCH 3/4] updated some lines for bulldozer --- kernel/x86_64/KERNEL.PILEDRIVER | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel/x86_64/KERNEL.PILEDRIVER b/kernel/x86_64/KERNEL.PILEDRIVER index 55285e3d3..ec70253b8 100644 --- a/kernel/x86_64/KERNEL.PILEDRIVER +++ b/kernel/x86_64/KERNEL.PILEDRIVER @@ -1,3 +1,7 @@ +DAXPYKERNEL = daxpy.c +CAXPYKERNEL = caxpy.c +ZAXPYKERNEL = zaxpy.c + SGEMVNKERNEL = sgemv_n_4.c SGEMVTKERNEL = sgemv_t_4.c @@ -7,6 +11,7 @@ ZGEMVTKERNEL = zgemv_t_4.c DGEMVNKERNEL = dgemv_n_bulldozer.S DGEMVTKERNEL = dgemv_t_bulldozer.S +SDOTKERNEL = sdot.c DDOTKERNEL = ddot_bulldozer.S DCOPYKERNEL = dcopy_bulldozer.S From ba926e807c6b384ab92a560f9962e001bdfcec6e Mon Sep 17 00:00:00 2001 From: Werner Saar Date: Tue, 7 Apr 2015 11:56:06 +0200 Subject: [PATCH 4/4] added cdot- and zdot benchmark --- benchmark/Makefile | 48 +++++++++- benchmark/zdot-intel.c | 196 +++++++++++++++++++++++++++++++++++++++++ benchmark/zdot.c | 195 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 435 insertions(+), 4 deletions(-) create mode 100644 benchmark/zdot-intel.c create mode 100644 benchmark/zdot.c diff --git a/benchmark/Makefile b/benchmark/Makefile index b5eaa9343..f76c56a26 100644 --- a/benchmark/Makefile +++ b/benchmark/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/Makefile.system #LIBACML = -fopenmp $(ACML)/libacml_mp.a -lgfortran -lm # ACML 6.1 custom -ACML=/home/werner/project/acml6.1/gfortran64_mp/lib +ACML=/home/saar/acml6.1/gfortran64_mp/lib LIBACML = -fopenmp $(ACML)/libacml_mp.so -lgfortran -lm @@ -40,7 +40,7 @@ goto :: slinpack.goto dlinpack.goto clinpack.goto zlinpack.goto \ ssyrk.goto dsyrk.goto csyrk.goto zsyrk.goto \ ssyr2k.goto dsyr2k.goto csyr2k.goto zsyr2k.goto \ sger.goto dger.goto \ - sdot.goto ddot.goto \ + sdot.goto ddot.goto cdot.goto zdot.goto \ saxpy.goto daxpy.goto caxpy.goto zaxpy.goto \ ssymv.goto dsymv.goto csymv.goto zsymv.goto \ chemv.goto zhemv.goto \ @@ -61,7 +61,7 @@ acml :: slinpack.acml dlinpack.acml clinpack.acml zlinpack.acml \ ssyrk.acml dsyrk.acml csyrk.acml zsyrk.acml \ ssyr2k.acml dsyr2k.acml csyr2k.acml zsyr2k.acml \ sger.acml dger.acml \ - sdot.acml ddot.acml \ + sdot.acml ddot.acml cdot.acml zdot.acml \ saxpy.acml daxpy.acml caxpy.acml zaxpy.acml \ ssymv.acml dsymv.acml csymv.acml zsymv.acml \ chemv.acml zhemv.acml \ @@ -104,7 +104,7 @@ mkl :: slinpack.mkl dlinpack.mkl clinpack.mkl zlinpack.mkl \ ssyrk.mkl dsyrk.mkl csyrk.mkl zsyrk.mkl \ ssyr2k.mkl dsyr2k.mkl csyr2k.mkl zsyr2k.mkl \ sger.mkl dger.mkl \ - sdot.mkl ddot.mkl \ + sdot.mkl ddot.mkl cdot.mkl zdot.mkl \ saxpy.mkl daxpy.mkl caxpy.mkl zaxpy.mkl \ ssymv.mkl dsymv.mkl csymv.mkl zsymv.mkl \ chemv.mkl zhemv.mkl \ @@ -998,6 +998,32 @@ ddot.atlas : ddot.$(SUFFIX) ddot.mkl : ddot.$(SUFFIX) $(CC) $(CFLAGS) -o $(@F) $^ $(LIBMKL) $(CEXTRALIB) $(EXTRALIB) $(FEXTRALIB) +##################################### Cdot #################################################### +cdot.goto : cdot.$(SUFFIX) ../$(LIBNAME) + $(CC) $(CFLAGS) -o $(@F) $^ $(CEXTRALIB) $(EXTRALIB) -lm + +cdot.acml : cdot.$(SUFFIX) + $(CC) $(CFLAGS) -o $(@F) $^ $(LIBACML) $(CEXTRALIB) $(EXTRALIB) $(FEXTRALIB) + +cdot.atlas : cdot.$(SUFFIX) + $(CC) $(CFLAGS) -o $(@F) $^ $(LIBATLAS) $(CEXTRALIB) $(EXTRALIB) $(FEXTRALIB) + +cdot.mkl : cdot-intel.$(SUFFIX) + $(CC) $(CFLAGS) -o $(@F) $^ $(LIBMKL) $(CEXTRALIB) $(EXTRALIB) $(FEXTRALIB) + +##################################### Zdot #################################################### +zdot.goto : zdot.$(SUFFIX) ../$(LIBNAME) + $(CC) $(CFLAGS) -o $(@F) $^ $(CEXTRALIB) $(EXTRALIB) -lm + +zdot.acml : zdot.$(SUFFIX) + $(CC) $(CFLAGS) -o $(@F) $^ $(LIBACML) $(CEXTRALIB) $(EXTRALIB) $(FEXTRALIB) + +zdot.atlas : zdot.$(SUFFIX) + $(CC) $(CFLAGS) -o $(@F) $^ $(LIBATLAS) $(CEXTRALIB) $(EXTRALIB) $(FEXTRALIB) + +zdot.mkl : zdot-intel.$(SUFFIX) + $(CC) $(CFLAGS) -o $(@F) $^ $(LIBMKL) $(CEXTRALIB) $(EXTRALIB) $(FEXTRALIB) + ##################################### Saxpy #################################################### saxpy.goto : saxpy.$(SUFFIX) ../$(LIBNAME) $(CC) $(CFLAGS) -o $(@F) $^ $(CEXTRALIB) $(EXTRALIB) -lm @@ -1264,6 +1290,20 @@ sdot.$(SUFFIX) : dot.c ddot.$(SUFFIX) : dot.c $(CC) $(CFLAGS) -c -UCOMPLEX -DDOUBLE -o $(@F) $^ +cdot.$(SUFFIX) : zdot.c + $(CC) $(CFLAGS) -c -DCOMPLEX -UDOUBLE -o $(@F) $^ + +zdot.$(SUFFIX) : zdot.c + $(CC) $(CFLAGS) -c -DCOMPLEX -DDOUBLE -o $(@F) $^ + +cdot-intel.$(SUFFIX) : zdot-intel.c + $(CC) $(CFLAGS) -c -DCOMPLEX -UDOUBLE -o $(@F) $^ + +zdot-intel.$(SUFFIX) : zdot-intel.c + $(CC) $(CFLAGS) -c -DCOMPLEX -DDOUBLE -o $(@F) $^ + + + saxpy.$(SUFFIX) : axpy.c $(CC) $(CFLAGS) -c -UCOMPLEX -UDOUBLE -o $(@F) $^ diff --git a/benchmark/zdot-intel.c b/benchmark/zdot-intel.c new file mode 100644 index 000000000..bb2c40f38 --- /dev/null +++ b/benchmark/zdot-intel.c @@ -0,0 +1,196 @@ +/*************************************************************************** +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. +*****************************************************************************/ + +#include +#include +#ifdef __CYGWIN32__ +#include +#endif +#define RETURN_BY_STACK 1 +#include "common.h" + + +#undef DOT + + +#ifdef DOUBLE +#define DOT BLASFUNC(zdotu) +#else +#define DOT BLASFUNC(cdotu) +#endif + + +#if defined(__WIN32__) || defined(__WIN64__) + +#ifndef DELTA_EPOCH_IN_MICROSECS +#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL +#endif + +int gettimeofday(struct timeval *tv, void *tz){ + + FILETIME ft; + unsigned __int64 tmpres = 0; + static int tzflag; + + if (NULL != tv) + { + GetSystemTimeAsFileTime(&ft); + + tmpres |= ft.dwHighDateTime; + tmpres <<= 32; + tmpres |= ft.dwLowDateTime; + + /*converting file time to unix epoch*/ + tmpres /= 10; /*convert into microseconds*/ + tmpres -= DELTA_EPOCH_IN_MICROSECS; + tv->tv_sec = (long)(tmpres / 1000000UL); + tv->tv_usec = (long)(tmpres % 1000000UL); + } + + return 0; +} + +#endif + +#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0 + +static void *huge_malloc(BLASLONG size){ + int shmid; + void *address; + +#ifndef SHM_HUGETLB +#define SHM_HUGETLB 04000 +#endif + + if ((shmid =shmget(IPC_PRIVATE, + (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1), + SHM_HUGETLB | IPC_CREAT |0600)) < 0) { + printf( "Memory allocation failed(shmget).\n"); + exit(1); + } + + address = shmat(shmid, NULL, SHM_RND); + + if ((BLASLONG)address == -1){ + printf( "Memory allocation failed(shmat).\n"); + exit(1); + } + + shmctl(shmid, IPC_RMID, 0); + + return address; +} + +#define malloc huge_malloc + +#endif + +int main(int argc, char *argv[]){ + + FLOAT *x, *y; + FLOAT _Complex result; + blasint m, i; + blasint inc_x=1,inc_y=1; + int loops = 1; + int l; + char *p; + + int from = 1; + int to = 200; + int step = 1; + + struct timeval start, stop; + double time1,timeg; + + argc--;argv++; + + if (argc > 0) { from = atol(*argv); argc--; argv++;} + if (argc > 0) { to = MAX(atol(*argv), from); argc--; argv++;} + if (argc > 0) { step = atol(*argv); argc--; argv++;} + + if ((p = getenv("OPENBLAS_LOOPS"))) loops = atoi(p); + if ((p = getenv("OPENBLAS_INCX"))) inc_x = atoi(p); + if ((p = getenv("OPENBLAS_INCY"))) inc_y = atoi(p); + + fprintf(stderr, "From : %3d To : %3d Step = %3d Inc_x = %d Inc_y = %d Loops = %d\n", from, to, step,inc_x,inc_y,loops); + + if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){ + fprintf(stderr,"Out of Memory!!\n");exit(1); + } + + if (( y = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_y) * COMPSIZE)) == NULL){ + fprintf(stderr,"Out of Memory!!\n");exit(1); + } + +#ifdef linux + srandom(getpid()); +#endif + + fprintf(stderr, " SIZE Flops\n"); + + for(m = from; m <= to; m += step) + { + + timeg=0; + + fprintf(stderr, " %6d : ", (int)m); + + + for (l=0; l +#include +#ifdef __CYGWIN32__ +#include +#endif +#include "common.h" + + +#undef DOT + + +#ifdef DOUBLE +#define DOT BLASFUNC(zdotu) +#else +#define DOT BLASFUNC(cdotu) +#endif + + +#if defined(__WIN32__) || defined(__WIN64__) + +#ifndef DELTA_EPOCH_IN_MICROSECS +#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL +#endif + +int gettimeofday(struct timeval *tv, void *tz){ + + FILETIME ft; + unsigned __int64 tmpres = 0; + static int tzflag; + + if (NULL != tv) + { + GetSystemTimeAsFileTime(&ft); + + tmpres |= ft.dwHighDateTime; + tmpres <<= 32; + tmpres |= ft.dwLowDateTime; + + /*converting file time to unix epoch*/ + tmpres /= 10; /*convert into microseconds*/ + tmpres -= DELTA_EPOCH_IN_MICROSECS; + tv->tv_sec = (long)(tmpres / 1000000UL); + tv->tv_usec = (long)(tmpres % 1000000UL); + } + + return 0; +} + +#endif + +#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0 + +static void *huge_malloc(BLASLONG size){ + int shmid; + void *address; + +#ifndef SHM_HUGETLB +#define SHM_HUGETLB 04000 +#endif + + if ((shmid =shmget(IPC_PRIVATE, + (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1), + SHM_HUGETLB | IPC_CREAT |0600)) < 0) { + printf( "Memory allocation failed(shmget).\n"); + exit(1); + } + + address = shmat(shmid, NULL, SHM_RND); + + if ((BLASLONG)address == -1){ + printf( "Memory allocation failed(shmat).\n"); + exit(1); + } + + shmctl(shmid, IPC_RMID, 0); + + return address; +} + +#define malloc huge_malloc + +#endif + +int main(int argc, char *argv[]){ + + FLOAT *x, *y; + FLOAT _Complex result; + blasint m, i; + blasint inc_x=1,inc_y=1; + int loops = 1; + int l; + char *p; + + int from = 1; + int to = 200; + int step = 1; + + struct timeval start, stop; + double time1,timeg; + + argc--;argv++; + + if (argc > 0) { from = atol(*argv); argc--; argv++;} + if (argc > 0) { to = MAX(atol(*argv), from); argc--; argv++;} + if (argc > 0) { step = atol(*argv); argc--; argv++;} + + if ((p = getenv("OPENBLAS_LOOPS"))) loops = atoi(p); + if ((p = getenv("OPENBLAS_INCX"))) inc_x = atoi(p); + if ((p = getenv("OPENBLAS_INCY"))) inc_y = atoi(p); + + fprintf(stderr, "From : %3d To : %3d Step = %3d Inc_x = %d Inc_y = %d Loops = %d\n", from, to, step,inc_x,inc_y,loops); + + if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){ + fprintf(stderr,"Out of Memory!!\n");exit(1); + } + + if (( y = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_y) * COMPSIZE)) == NULL){ + fprintf(stderr,"Out of Memory!!\n");exit(1); + } + +#ifdef linux + srandom(getpid()); +#endif + + fprintf(stderr, " SIZE Flops\n"); + + for(m = from; m <= to; m += step) + { + + timeg=0; + + fprintf(stderr, " %6d : ", (int)m); + + + for (l=0; l