From 84b92e6373193e8c33348f61dd33358110307c6a Mon Sep 17 00:00:00 2001 From: Werner Saar Date: Sun, 20 Mar 2016 11:06:06 +0100 Subject: [PATCH 1/2] added optimized ddot kernel for POWER8 --- kernel/power/KERNEL.POWER8 | 2 +- kernel/power/ddot.c | 132 +++++++++++++++++++++++ kernel/power/ddot_microk_power8.c | 170 ++++++++++++++++++++++++++++++ 3 files changed, 303 insertions(+), 1 deletion(-) create mode 100644 kernel/power/ddot.c create mode 100644 kernel/power/ddot_microk_power8.c diff --git a/kernel/power/KERNEL.POWER8 b/kernel/power/KERNEL.POWER8 index eaa9f26ed..1e0c6a595 100644 --- a/kernel/power/KERNEL.POWER8 +++ b/kernel/power/KERNEL.POWER8 @@ -121,7 +121,7 @@ ZTRSMKERNEL_RT = ../generic/trsm_kernel_RT.c #ZCOPYKERNEL = ../arm/zcopy.c # #SDOTKERNEL = ../arm/dot.c -#DDOTKERNEL = ../arm/dot.c +DDOTKERNEL = ddot.c #CDOTKERNEL = ../arm/zdot.c #ZDOTKERNEL = ../arm/zdot.c # diff --git a/kernel/power/ddot.c b/kernel/power/ddot.c new file mode 100644 index 000000000..488d2a7b3 --- /dev/null +++ b/kernel/power/ddot.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. +*****************************************************************************/ + + +#include "common.h" + + +#if defined(POWER8) +#include "ddot_microk_power8.c" +#endif + + +#ifndef HAVE_KERNEL_8 + +static void ddot_kernel_8(BLASLONG n, FLOAT *x, FLOAT *y, FLOAT *d) +{ + BLASLONG register i = 0; + FLOAT dot = 0.0; + + while(i < n) + { + dot += y[i] * x[i] + + y[i+1] * x[i+1] + + y[i+2] * x[i+2] + + y[i+3] * x[i+3] + + y[i+4] * x[i+4] + + y[i+5] * x[i+5] + + y[i+6] * x[i+6] + + y[i+7] * x[i+7] ; + + i+=8 ; + + } + *d += dot; + +} + +#endif + +FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y) +{ + BLASLONG i=0; + BLASLONG ix=0,iy=0; + + FLOAT dot = 0.0 ; + + if ( n <= 0 ) return(dot); + + if ( (inc_x == 1) && (inc_y == 1) ) + { + + BLASLONG n1 = n & -16; + + if ( n1 ) + ddot_kernel_8(n1, x, y , &dot ); + + i = n1; + while(i < n) + { + + dot += y[i] * x[i] ; + i++ ; + + } + return(dot); + + + } + + FLOAT temp1 = 0.0; + FLOAT temp2 = 0.0; + + BLASLONG n1 = n & -4; + + while(i < n1) + { + + FLOAT m1 = y[iy] * x[ix] ; + FLOAT m2 = y[iy+inc_y] * x[ix+inc_x] ; + + FLOAT m3 = y[iy+2*inc_y] * x[ix+2*inc_x] ; + FLOAT m4 = y[iy+3*inc_y] * x[ix+3*inc_x] ; + + ix += inc_x*4 ; + iy += inc_y*4 ; + + temp1 += m1+m3; + temp2 += m2+m4; + + i+=4 ; + + } + + while(i < n) + { + + temp1 += y[iy] * x[ix] ; + ix += inc_x ; + iy += inc_y ; + i++ ; + + } + dot = temp1 + temp2; + return(dot); + +} + + diff --git a/kernel/power/ddot_microk_power8.c b/kernel/power/ddot_microk_power8.c new file mode 100644 index 000000000..085c163d4 --- /dev/null +++ b/kernel/power/ddot_microk_power8.c @@ -0,0 +1,170 @@ +/*************************************************************************** +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 ddot_kernel_8( BLASLONG n, FLOAT *x, FLOAT *y , FLOAT *dot) __attribute__ ((noinline)); + +static void ddot_kernel_8( BLASLONG n, FLOAT *x, FLOAT *y, FLOAT *dot) +{ + + + BLASLONG i = n; + BLASLONG o16 = 16; + BLASLONG o32 = 32; + BLASLONG o48 = 48; + BLASLONG o64 = 64; + BLASLONG o80 = 80; + BLASLONG o96 = 96; + BLASLONG o112 = 112; + FLOAT *x1=x; + FLOAT *y1=y; + BLASLONG pre = 384; + + __asm__ __volatile__ + ( + "xxlxor 32,32,32 \n\t" + "xxlxor 33,33,33 \n\t" + "xxlxor 34,34,34 \n\t" + "xxlxor 35,35,35 \n\t" + "xxlxor 36,36,36 \n\t" + "xxlxor 37,37,37 \n\t" + "xxlxor 38,38,38 \n\t" + "xxlxor 39,39,39 \n\t" + + "dcbt %2, %12 \n\t" + "dcbt %3, %12 \n\t" + + "lxvd2x 40, 0, %2 \n\t" + "lxvd2x 48, 0, %3 \n\t" + "lxvd2x 41, %5, %2 \n\t" + "lxvd2x 49, %5, %3 \n\t" + "lxvd2x 42, %6, %2 \n\t" + "lxvd2x 50, %6, %3 \n\t" + "lxvd2x 43, %7, %2 \n\t" + "lxvd2x 51, %7, %3 \n\t" + "lxvd2x 44, %8, %2 \n\t" + "lxvd2x 52, %8, %3 \n\t" + "lxvd2x 45, %9, %2 \n\t" + "lxvd2x 53, %9, %3 \n\t" + "lxvd2x 46, %10, %2 \n\t" + "lxvd2x 54, %10, %3 \n\t" + "lxvd2x 47, %11, %2 \n\t" + "lxvd2x 55, %11, %3 \n\t" + + "addi %2, %2, 128 \n\t" + "addi %3, %3, 128 \n\t" + + "addic. %0 , %0 , -16 \n\t" + "ble 2f \n\t" + + ".align 5 \n\t" + "1: \n\t" + + "dcbt %2, %12 \n\t" + "dcbt %3, %12 \n\t" + + "xvmaddadp 32, 40, 48 \n\t" + "lxvd2x 40, 0, %2 \n\t" + "lxvd2x 48, 0, %3 \n\t" + "xvmaddadp 33, 41, 49 \n\t" + "lxvd2x 41, %5, %2 \n\t" + "lxvd2x 49, %5, %3 \n\t" + "xvmaddadp 34, 42, 50 \n\t" + "lxvd2x 42, %6, %2 \n\t" + "lxvd2x 50, %6, %3 \n\t" + "xvmaddadp 35, 43, 51 \n\t" + "lxvd2x 43, %7, %2 \n\t" + "lxvd2x 51, %7, %3 \n\t" + "xvmaddadp 36, 44, 52 \n\t" + "lxvd2x 44, %8, %2 \n\t" + "lxvd2x 52, %8, %3 \n\t" + "xvmaddadp 37, 45, 53 \n\t" + "lxvd2x 45, %9, %2 \n\t" + "lxvd2x 53, %9, %3 \n\t" + "xvmaddadp 38, 46, 54 \n\t" + "lxvd2x 46, %10, %2 \n\t" + "lxvd2x 54, %10, %3 \n\t" + "xvmaddadp 39, 47, 55 \n\t" + + "lxvd2x 47, %11, %2 \n\t" + "lxvd2x 55, %11, %3 \n\t" + + + "addi %2, %2, 128 \n\t" + "addi %3, %3, 128 \n\t" + + "addic. %0 , %0 , -16 \n\t" + "bgt 1b \n\t" + + "2: \n\t" + + "xvmaddadp 32, 40, 48 \n\t" + "xvmaddadp 33, 41, 49 \n\t" + "xvmaddadp 34, 42, 50 \n\t" + "xvmaddadp 35, 43, 51 \n\t" + "xvmaddadp 36, 44, 52 \n\t" + "xvmaddadp 37, 45, 53 \n\t" + "xvmaddadp 38, 46, 54 \n\t" + "xvmaddadp 39, 47, 55 \n\t" + + "xvadddp 32, 32, 33 \n\t" + "xvadddp 34, 34, 35 \n\t" + "xvadddp 36, 36, 37 \n\t" + "xvadddp 38, 38, 39 \n\t" + + "xvadddp 32, 32, 34 \n\t" + "xvadddp 36, 36, 38 \n\t" + + "xvadddp 32, 32, 36 \n\t" + + "xxswapd 33, 32 \n\t" + + "xsadddp 32, 32, 33 \n\t" + + "stxsdx 32, 0, %4 \n\t" + + : + : + "r" (i), // 0 + "r" (n), // 1 + "r" (x1), // 2 + "r" (y1), // 3 + "r" (dot), // 4 + "r" (o16), // 5 + "r" (o32), // 6 + "r" (o48), // 7 + "r" (o64), // 8 + "r" (o80), // 9 + "r" (o96), // 10 + "r" (o112), // 11 + "r" (pre) // 12 + : "cr0", "%0", "%2" , "%3", "memory" + ); + +} + + From cd9fafc054e767433f15a036be69cab0eae56a40 Mon Sep 17 00:00:00 2001 From: Werner Saar Date: Sun, 20 Mar 2016 11:19:27 +0100 Subject: [PATCH 2/2] ddot for POWER8: updated licence information --- kernel/power/ddot.c | 9 ++++++++- kernel/power/ddot_microk_power8.c | 10 +++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/kernel/power/ddot.c b/kernel/power/ddot.c index 488d2a7b3..cef60a2e5 100644 --- a/kernel/power/ddot.c +++ b/kernel/power/ddot.c @@ -1,5 +1,5 @@ /*************************************************************************** -Copyright (c) 2014, The OpenBLAS Project +Copyright (c) 2013-2016, 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 @@ -25,6 +25,13 @@ 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. *****************************************************************************/ +/************************************************************************************** +* 2016/03/20 Werner Saar (wernsaar@googlemail.com) +* BLASTEST : OK +* CTEST : OK +* TEST : OK +* LAPACK-TEST : OK +**************************************************************************************/ #include "common.h" diff --git a/kernel/power/ddot_microk_power8.c b/kernel/power/ddot_microk_power8.c index 085c163d4..b88049212 100644 --- a/kernel/power/ddot_microk_power8.c +++ b/kernel/power/ddot_microk_power8.c @@ -1,5 +1,5 @@ /*************************************************************************** -Copyright (c) 2014, The OpenBLAS Project +Copyright (c) 2013-2016, 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 @@ -25,6 +25,14 @@ 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. *****************************************************************************/ +/************************************************************************************** +* 2016/03/20 Werner Saar (wernsaar@googlemail.com) +* BLASTEST : OK +* CTEST : OK +* TEST : OK +* LAPACK-TEST : OK +**************************************************************************************/ + #define HAVE_KERNEL_8 1 static void ddot_kernel_8( BLASLONG n, FLOAT *x, FLOAT *y , FLOAT *dot) __attribute__ ((noinline));