Optimize scopy/ccopy for POWER10
authorRajalakshmi Srinivasaraghavan <rajis@linux.ibm.com>
Wed, 21 Oct 2020 14:53:45 +0000 (09:53 -0500)
committerRajalakshmi Srinivasaraghavan <rajis@linux.ibm.com>
Wed, 21 Oct 2020 14:53:45 +0000 (09:53 -0500)
This patch makes use of new POWER10 vector pair instructions for
loads and stores. Also reorganized all variants of copy functions
to make use of same kernel.

kernel/power/KERNEL.POWER10
kernel/power/ccopy_power10.c [new file with mode: 0644]
kernel/power/copy_microk_power10.c [moved from kernel/power/dcopy_microk_power10.c with 91% similarity]
kernel/power/dcopy_power10.c
kernel/power/scopy_power10.c [new file with mode: 0644]
kernel/power/zcopy_microk_power10.c [deleted file]
kernel/power/zcopy_power10.c

index 031d965..86df7e3 100644 (file)
@@ -150,9 +150,9 @@ CAXPYKERNEL  = caxpy.c
 endif
 ZAXPYKERNEL  = zaxpy_power10.c
 #
-SCOPYKERNEL  = scopy.c
+SCOPYKERNEL  = scopy_power10.c
 DCOPYKERNEL  = dcopy_power10.c
-CCOPYKERNEL  = ccopy.c
+CCOPYKERNEL  = ccopy_power10.c
 ZCOPYKERNEL  = zcopy_power10.c
 #
 SDOTKERNEL   =  sdot.c
diff --git a/kernel/power/ccopy_power10.c b/kernel/power/ccopy_power10.c
new file mode 100644 (file)
index 0000000..a5877cd
--- /dev/null
@@ -0,0 +1,132 @@
+/***************************************************************************
+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
+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(__VEC__) || defined(__ALTIVEC__)
+#include "copy_microk_power10.c"
+#endif
+
+#ifndef HAVE_KERNEL
+
+static void copy_kernel(BLASLONG n, FLOAT *x, FLOAT *y)
+{
+
+       BLASLONG i=0;
+       FLOAT f0, f1, f2, f3, f4, f5, f6, f7;
+       FLOAT *x1=x;
+       FLOAT *y1=y;
+
+       while ( i<n )
+       {
+
+               f0 = x1[0];
+               f1 = x1[1];
+               f2 = x1[2];
+               f3 = x1[3];
+               f4 = x1[4];
+               f5 = x1[5];
+               f6 = x1[6];
+               f7 = x1[7];
+
+               y1[0] = f0;
+               y1[1] = f1;
+               y1[2] = f2;
+               y1[3] = f3;
+               y1[4] = f4;
+               y1[5] = f5;
+               y1[6] = f6;
+               y1[7] = f7;
+
+               x1 += 8;
+               y1 += 8;
+
+               i+=4;
+       }
+       return;
+
+}
+
+
+#endif
+
+
+
+int CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y)
+{
+       BLASLONG i=0;
+       BLASLONG ix=0,iy=0;
+
+       if ( n <= 0     )  return(0);
+
+       if ( (inc_x == 1) && (inc_y == 1 ))
+       {
+
+               BLASLONG n1 = n & -64;
+               if ( n1 > 0 )
+               {
+                       copy_kernel(n1, x, y);
+                       i=n1;
+                       ix=n1*2;
+                       iy=n1*2;
+               }
+
+               while(i < n)
+               {
+                       y[iy] = x[iy] ;
+                       y[iy+1] = x[ix+1] ;
+                       ix+=2;
+                       iy+=2;
+                       i++ ;
+
+               }
+
+
+       }
+       else
+       {
+
+               BLASLONG inc_x2 = 2 * inc_x;
+               BLASLONG inc_y2 = 2 * inc_y;
+
+               while(i < n)
+               {
+                       y[iy] = x[ix] ;
+                       y[iy+1] = x[ix+1] ;
+                       ix += inc_x2 ;
+                       iy += inc_y2 ;
+                       i++ ;
+
+               }
+
+       }
+       return(0);
+       
+
+}
+
+
similarity index 91%
rename from kernel/power/dcopy_microk_power10.c
rename to kernel/power/copy_microk_power10.c
index 8940e0d..c90dc37 100644 (file)
@@ -25,9 +25,9 @@ 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_64 1
+#define HAVE_KERNEL 1
 
-static void dcopy_kernel_64 (long n, double *x, double *y)
+static void copy_kernel (BLASLONG n, FLOAT *x, FLOAT *y)
 {
   __asm__
     (
@@ -49,8 +49,13 @@ static void dcopy_kernel_64 (long n, double *x, double *y)
        "lxvp           60, 448(%2)     \n\t"
        "lxvp           62, 480(%2)     \n\t"
        "addi           %2, %2, 512     \n\t"
-
+#if !defined(COMPLEX) && !defined(DOUBLE)
+       "addic.         %1, %1, -128    \n\t"
+#elif defined(COMPLEX) && defined(DOUBLE)
+       "addic.         %1, %1, -32     \n\t"
+#else
        "addic.         %1, %1, -64     \n\t"
+#endif
        "ble            two%=           \n\t"
 
        ".align 5               \n"
@@ -94,7 +99,13 @@ static void dcopy_kernel_64 (long n, double *x, double *y)
        "addi           %3, %3, 512     \n\t"
        "addi           %2, %2, 512     \n\t"
 
+#if !defined(COMPLEX) && !defined(DOUBLE)
+       "addic.         %1, %1, -128    \n\t"
+#elif defined(COMPLEX) && defined(DOUBLE)
+       "addic.         %1, %1, -32     \n\t"
+#else
        "addic.         %1, %1, -64     \n\t"
+#endif
        "bgt            one%=           \n"
 
      "two%=:                           \n\t"
@@ -121,7 +132,7 @@ static void dcopy_kernel_64 (long n, double *x, double *y)
        "=m" (*y),
        "+r" (n),       // 1
        "+b" (x),       // 2
-       "+b" (y)                // 3
+       "+b" (y)        // 3
      :
        "m" (*x)
      :
index 32530d5..cd10b71 100644 (file)
@@ -28,12 +28,12 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "common.h"
 
 #if defined(__VEC__) || defined(__ALTIVEC__)
-#include "dcopy_microk_power10.c"
+#include "copy_microk_power10.c"
 #endif
 
-#ifndef HAVE_KERNEL_64
+#ifndef HAVE_KERNEL
 
-static void dcopy_kernel_64(BLASLONG n, FLOAT *x, FLOAT *y)
+static void copy_kernel(BLASLONG n, FLOAT *x, FLOAT *y)
 {
 
        BLASLONG i=0;
@@ -89,7 +89,7 @@ int CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y)
                BLASLONG n1 = n & -64;
                if ( n1 > 0 )
                {
-                       dcopy_kernel_64(n1, x, y);
+                       copy_kernel(n1, x, y);
                        i=n1;
                }
 
diff --git a/kernel/power/scopy_power10.c b/kernel/power/scopy_power10.c
new file mode 100644 (file)
index 0000000..298a899
--- /dev/null
@@ -0,0 +1,123 @@
+/***************************************************************************
+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
+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(__VEC__) || defined(__ALTIVEC__)
+#include "copy_microk_power10.c"
+#endif
+
+#ifndef HAVE_KERNEL
+
+static void copy_kernel (BLASLONG n, FLOAT *x, FLOAT *y)
+{
+
+       BLASLONG i=0;
+       FLOAT f0, f1, f2, f3, f4, f5, f6, f7;
+       FLOAT *x1=x;
+       FLOAT *y1=y;
+
+       while ( i<n )
+       {
+
+               f0 = x1[0];
+               f1 = x1[1];
+               f2 = x1[2];
+               f3 = x1[3];
+               f4 = x1[4];
+               f5 = x1[5];
+               f6 = x1[6];
+               f7 = x1[7];
+
+               y1[0] = f0;
+               y1[1] = f1;
+               y1[2] = f2;
+               y1[3] = f3;
+               y1[4] = f4;
+               y1[5] = f5;
+               y1[6] = f6;
+               y1[7] = f7;
+
+               x1 += 8;
+               y1 += 8;
+
+               i+=8;
+       }
+       return;
+
+}
+
+
+#endif
+
+
+
+int CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y)
+{
+       BLASLONG i=0;
+       BLASLONG ix=0,iy=0;
+
+       if ( n <= 0     )  return(0);
+
+       if ( (inc_x == 1) && (inc_y == 1 ))
+       {
+
+               BLASLONG n1 = n & -128;
+               if ( n1 > 0 )
+               {
+                       copy_kernel (n1, x, y);
+                       i=n1;
+               }
+
+               while(i < n)
+               {
+                       y[i] = x[i] ;
+                       i++ ;
+
+               }
+
+
+       }
+       else
+       {
+
+               while(i < n)
+               {
+                       y[iy] = x[ix] ;
+                       ix += inc_x ;
+                       iy += inc_y ;
+                       i++ ;
+
+               }
+
+       }
+       return(0);
+       
+
+}
+
+
diff --git a/kernel/power/zcopy_microk_power10.c b/kernel/power/zcopy_microk_power10.c
deleted file mode 100644 (file)
index f2f2119..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-/***************************************************************************
-Copyright (c) 2020, 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_32 1
-
-static void zcopy_kernel_32 (long n, double *x, double *y)
-{
-  __asm__
-    (
-       "lxvp           32, 0(%2)       \n\t"
-       "lxvp           34, 32(%2)      \n\t"
-       "lxvp           36, 64(%2)      \n\t"
-       "lxvp           38, 96(%2)      \n\t"
-       "lxvp           40, 128(%2)     \n\t"
-       "lxvp           42, 160(%2)     \n\t"
-       "lxvp           44, 192(%2)     \n\t"
-       "lxvp           46, 224(%2)     \n\t"
-
-       "lxvp           48, 256(%2)     \n\t"
-       "lxvp           50, 288(%2)     \n\t"
-       "lxvp           52, 320(%2)     \n\t"
-       "lxvp           54, 352(%2)     \n\t"
-       "lxvp           56, 384(%2)     \n\t"
-       "lxvp           58, 416(%2)     \n\t"
-       "lxvp           60, 448(%2)     \n\t"
-       "lxvp           62, 480(%2)     \n\t"
-       "addi           %2, %2, 512     \n\t"
-
-       "addic.         %1, %1, -32     \n\t"
-       "ble            two%=           \n\t"
-
-       ".align 5               \n"
-     "one%=:                           \n\t"
-
-       "stxvp          32, 0(%3)       \n\t"
-       "lxvp           32, 0(%2)       \n\t"
-       "stxvp          34, 32(%3)      \n\t"
-       "lxvp           34, 32(%2)      \n\t"
-       "stxvp          36, 64(%3)      \n\t"
-       "lxvp           36, 64(%2)      \n\t"
-       "stxvp          38, 96(%3)      \n\t"
-       "lxvp           38, 96(%2)      \n\t"
-
-       "stxvp          40, 128(%3)     \n\t"
-       "lxvp           40, 128(%2)     \n\t"
-       "stxvp          42, 160(%3)     \n\t"
-       "lxvp           42, 160(%2)     \n\t"
-       "stxvp          44, 192(%3)     \n\t"
-       "lxvp           44, 192(%2)     \n\t"
-       "stxvp          46, 224(%3)     \n\t"
-       "lxvp           46, 224(%2)     \n\t"
-
-       "stxvp          48, 256(%3)     \n\t"
-       "lxvp           48, 256(%2)     \n\t"
-       "stxvp          50, 288(%3)     \n\t"
-       "lxvp           50, 288(%2)     \n\t"
-       "stxvp          52, 320(%3)     \n\t"
-       "lxvp           52, 320(%2)     \n\t"
-       "stxvp          54, 352(%3)     \n\t"
-       "lxvp           54, 352(%2)     \n\t"
-       "stxvp          56, 384(%3)     \n\t"
-       "lxvp           56, 384(%2)     \n\t"
-       "stxvp          58, 416(%3)     \n\t"
-       "lxvp           58, 416(%2)     \n\t"
-       "stxvp          60, 448(%3)     \n\t"
-       "lxvp           60, 448(%2)     \n\t"
-       "stxvp          62, 480(%3)     \n\t"
-       "lxvp           62, 480(%2)     \n\t"
-
-       "addi           %3, %3, 512     \n\t"
-       "addi           %2, %2, 512     \n\t"
-
-       "addic.         %1, %1, -32     \n\t"
-       "bgt            one%=           \n"
-
-     "two%=:                           \n\t"
-
-       "stxvp          32, 0(%3)       \n\t"
-       "stxvp          34, 32(%3)      \n\t"
-       "stxvp          36, 64(%3)      \n\t"
-       "stxvp          38, 96(%3)      \n\t"
-       "stxvp          40, 128(%3)     \n\t"
-       "stxvp          42, 160(%3)     \n\t"
-       "stxvp          44, 192(%3)     \n\t"
-       "stxvp          46, 224(%3)     \n\t"
-       "stxvp          48, 256(%3)     \n\t"
-       "stxvp          50, 288(%3)     \n\t"
-       "stxvp          52, 320(%3)     \n\t"
-       "stxvp          54, 352(%3)     \n\t"
-       "stxvp          56, 384(%3)     \n\t"
-       "stxvp          58, 416(%3)     \n\t"
-       "stxvp          60, 448(%3)     \n\t"
-       "stxvp          62, 480(%3)     \n\t"
-
-     "#n=%1 x=%4=%2 y=%0=%3"
-     :
-       "=m" (*y),
-       "+r" (n),       // 1
-       "+b" (x),       // 2
-       "+b" (y)                // 3
-     :
-       "m" (*x)
-     :
-       "cr0",
-       "vs32","vs33","vs34","vs35","vs36","vs37","vs38","vs39",
-       "vs40","vs41","vs42","vs43","vs44","vs45","vs46","vs47",
-       "vs48","vs49","vs50","vs51","vs52","vs53","vs54","vs55",
-       "vs56","vs57","vs58","vs59","vs60","vs61","vs62","vs63"
-     );
-}
index 99d463b..6b4e7a7 100644 (file)
@@ -28,12 +28,12 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "common.h"
 
 #if defined(__VEC__) || defined(__ALTIVEC__)
-#include "zcopy_microk_power10.c"
+#include "copy_microk_power10.c"
 #endif
 
-#ifndef HAVE_KERNEL_32
+#ifndef HAVE_KERNEL
 
-static void zcopy_kernel_32(BLASLONG n, FLOAT *x, FLOAT *y)
+static void copy_kernel(BLASLONG n, FLOAT *x, FLOAT *y)
 {
 
        BLASLONG i=0;
@@ -89,7 +89,7 @@ int CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y)
                BLASLONG n1 = n & -32;
                if ( n1 > 0 )
                {
-                       zcopy_kernel_32(n1, x, y);
+                       copy_kernel(n1, x, y);
                        i=n1;
                        ix=n1*2;
                        iy=n1*2;