File atlas.3.10.1-ppc64le_abiv2.patch of Package libatlas3

Overview Repositories Revisions Requests Users Attributes Meta

File atlas.3.10.1-ppc64le_abiv2.patch of Package libatlas3 (Revision 37a605917916ee9b0a6c453f8a958ebc)

Currently displaying revision 37a605917916ee9b0a6c453f8a958ebc , Show latest

From: Michel Normand <normand@linux.vnet.ibm.com>
Subject: atlas.ppc64le abiv2
Date: Mon, 14 Apr 2014 18:03:06 +0200
References: http://sourceforge.net/p/math-atlas/mailman/message/32471499/

atlas.ppc64le abiv2
* do not use opd section for ABI V2
* define TOC in r2 in function call
  TODO: may be not required everywhere.
based on work of Guy and Thierry

TODO: still have to work on stack FSIZE

TODO: for ATLAS/tune/blas/gemm/CASES/ATL_dmm4x4x80_ppc.c
    need to better understand the change about ld pC0

Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
---
 CONFIG/src/backend/probe_AltiVec.S       |    2 +-
 CONFIG/src/backend/probe_VSX.S           |    2 +-
 src/threads/ATL_DecAtomicCount_ppc.S     |    2 +-
 src/threads/ATL_ResetAtomicCount_ppc.S   |    2 +-
 tune/blas/gemm/CASES/ATL_cmm4x4x128_av.c |    9 ++++++++-
 tune/blas/gemm/CASES/ATL_dmm4x4x2pf_av.c |    9 ++++++++-
 tune/blas/gemm/CASES/ATL_dmm4x4x32_ppc.c |    9 ++++++++-
 tune/blas/gemm/CASES/ATL_dmm4x4x80_ppc.c |   20 ++++++++++++++++++--
 tune/blas/gemm/CASES/ATL_smm4x4x128_av.c |   23 ++++++++++++++++++++++-
 9 files changed, 68 insertions(+), 10 deletions(-)

Index: ATLAS/CONFIG/src/backend/probe_AltiVec.S
===================================================================
--- ATLAS.orig/CONFIG/src/backend/probe_AltiVec.S
+++ ATLAS/CONFIG/src/backend/probe_AltiVec.S
@@ -6,7 +6,7 @@
  *
  */
 .text
-#if defined(ATL_USE64BITS) && defined (ATL_OS_Linux)
+#if defined(ATL_USE64BITS) && defined (ATL_OS_Linux) && _CALL_ELF != 2
         .align 2
         .globl  ATL_asmdecor(do_vsum)
         .section        ".opd","aw"
Index: ATLAS/CONFIG/src/backend/probe_VSX.S
===================================================================
--- ATLAS.orig/CONFIG/src/backend/probe_VSX.S
+++ ATLAS/CONFIG/src/backend/probe_VSX.S
@@ -6,7 +6,7 @@
  *
  */
 .text
-#if defined(ATL_USE64BITS) && defined (ATL_OS_Linux)
+#if defined(ATL_USE64BITS) && defined (ATL_OS_Linux) && _CALL_ELF != 2
         .align 2
         .globl  ATL_asmdecor(do_vsum)
         .section        ".opd","aw"
Index: ATLAS/src/threads/ATL_DecAtomicCount_ppc.S
===================================================================
--- ATLAS.orig/src/threads/ATL_DecAtomicCount_ppc.S
+++ ATLAS/src/threads/ATL_DecAtomicCount_ppc.S
@@ -4,7 +4,7 @@
    .globl _ATL_DecAtomicCount
    _ATL_DecAtomicCount:
 #else
-   #if defined(ATL_USE64BITS)
+   #if defined(ATL_USE64BITS) && _CALL_ELF != 2
 /*
  *      Official Program Descripter section, seg fault w/o it on Linux/PPC64
  */
Index: ATLAS/src/threads/ATL_ResetAtomicCount_ppc.S
===================================================================
--- ATLAS.orig/src/threads/ATL_ResetAtomicCount_ppc.S
+++ ATLAS/src/threads/ATL_ResetAtomicCount_ppc.S
@@ -4,7 +4,7 @@
    .globl _ATL_ResetAtomicCount
    _ATL_ResetAtomicCount:
 #else
-   #if defined(ATL_USE64BITS)
+   #if defined(ATL_USE64BITS) && _CALL_ELF != 2
 /*
  *      Official Program Descripter section, seg fault w/o it on Linux/PPC64
  */
Index: ATLAS/tune/blas/gemm/CASES/ATL_cmm4x4x128_av.c
===================================================================
--- ATLAS.orig/tune/blas/gemm/CASES/ATL_cmm4x4x128_av.c
+++ ATLAS/tune/blas/gemm/CASES/ATL_cmm4x4x128_av.c
@@ -181,7 +181,7 @@ void ATL_USERMM(const int M, const int N
 	.globl  Mjoin(_,ATL_USERMM)
 Mjoin(_,ATL_USERMM):
 #else
-   #if defined(ATL_USE64BITS)
+   #if defined(ATL_USE64BITS) && _CALL_ELF != 2
 /*
  *      Official Program Descripter section, seg fault w/o it on Linux/PPC64
  */
@@ -258,8 +258,15 @@ ATL_USERMM:
         eqv     r0, r0, r0      /* all 1s */
         ATL_WriteVRSAVE(r0)     /* signal we use all vector regs */
 #if defined (ATL_USE64BITS)
+#if _CALL_ELF == 2
+/* ABIv2 */
+        ld      pC0, FSIZE+104(r1)
+        ld      ldc, FSIZE+112(r1)
+#else
+/* ABIv1 */
         ld      pC0, FSIZE+120(r1)
         ld      ldc, FSIZE+128(r1)
+#endif
 #elif defined(ATL_AS_OSX_PPC)
         lwz     pC0, FSIZE+60(r1)
         lwz     ldc,  FSIZE+64(r1)
Index: ATLAS/tune/blas/gemm/CASES/ATL_dmm4x4x2pf_av.c
===================================================================
--- ATLAS.orig/tune/blas/gemm/CASES/ATL_dmm4x4x2pf_av.c
+++ ATLAS/tune/blas/gemm/CASES/ATL_dmm4x4x2pf_av.c
@@ -279,7 +279,7 @@ void ATL_USERMM(const int M, const int N
 #endif
 .text
 #ifdef ATL_GAS_LINUX_PPC
-   #if defined(ATL_USE64BITS)
+   #if defined(ATL_USE64BITS) && _CALL_ELF != 2
 /*
  *       No idea what this does, but seg fault without it (I think it is
  *       partially resp for making code callable from both static & PIC code)
@@ -405,8 +405,15 @@ Mjoin(_,ATL_USERMM):
  */
 #ifdef ATL_GAS_LINUX_PPC
    #ifdef ATL_USE64BITS
+      #if _CALL_ELF == 2
+      /* ABIv2 */
+        ld      pC0, 104(r1)
+        ld      incCn, 112(r1)
+      #else
+      /* ABIv1 */
 	ld 	pC0, 120(r1)
 	ld 	incCn, 128(r1)
+      #endif
    #else
 	lwz	incCn, FSIZE+8(r1)
    #endif
Index: ATLAS/tune/blas/gemm/CASES/ATL_dmm4x4x32_ppc.c
===================================================================
--- ATLAS.orig/tune/blas/gemm/CASES/ATL_dmm4x4x32_ppc.c
+++ ATLAS/tune/blas/gemm/CASES/ATL_dmm4x4x32_ppc.c
@@ -268,7 +268,7 @@ Mjoin(.,ATL_USERMM):
 	.globl  Mjoin(_,ATL_USERMM)
 Mjoin(_,ATL_USERMM):
    #else
-      #if defined(ATL_USE64BITS)
+      #if defined(ATL_USE64BITS) && _CALL_ELF != 2
 /*
  *      Official Program Descripter section, seg fault w/o it on Linux/PPC64
  */
@@ -324,8 +324,15 @@ ATL_USERMM:
 #endif
 
 #ifdef ATL_USE64BITS
+#if _CALL_ELF == 2
+/* ABIv2 */
+        ld      pC0, 104(r1)
+        ld      incCn, 112(r1)
+#else
+/* ABIv1 */
         ld      pC0, 120(r1)
         ld      incCn, 128(r1)
+#endif
 #elif defined(ATL_AS_OSX_PPC) || defined(ATL_AS_AIX_PPC)
         lwz     pC0, 68(r1)
         lwz     incCn,  72(r1)
Index: ATLAS/tune/blas/gemm/CASES/ATL_dmm4x4x80_ppc.c
===================================================================
--- ATLAS.orig/tune/blas/gemm/CASES/ATL_dmm4x4x80_ppc.c
+++ ATLAS/tune/blas/gemm/CASES/ATL_dmm4x4x80_ppc.c
@@ -170,13 +170,21 @@ void ATL_USERMM(const int M, const int N
                 const TYPE beta, TYPE *C, const int ldc)
                                   (r10)    8(r1)
 *******************************************************************************
-64 bit ABIs:
+64 bit ABIv1s:
                          r3           r4           r5             r6/f1
 void ATL_USERMM(const int M, const int N, const int K, const TYPE alpha,
                            r7             r8             r9            r10
                 const TYPE *A, const int lda, const TYPE *B, const int ldb,
                              f2   120(r1)        128(r1)
                 const TYPE beta, TYPE *C, const int ldc)
+
+64 bit ABIv2s:
+                         r3           r4           r5             r6/f1
+void ATL_USERMM(const int M, const int N, const int K, const TYPE alpha,
+                           r7             r8             r9            r10
+                const TYPE *A, const int lda, const TYPE *B, const int ldb,
+                             f2   104(r1)        112(r1)
+                const TYPE beta, TYPE *C, const int ldc)
 #endif
 #ifdef ATL_AS_AIX_PPC
         .csect .text[PR]
@@ -202,7 +210,7 @@ Mjoin(.,ATL_USERMM):
 	.globl  Mjoin(_,ATL_USERMM)
 Mjoin(_,ATL_USERMM):
    #else
-      #if defined(ATL_USE64BITS)
+      #if defined(ATL_USE64BITS) && _CALL_ELF != 2
 /*
  *      Official Program Descripter section, seg fault w/o it on Linux/PPC64
  */
@@ -257,9 +265,17 @@ ATL_USERMM:
    #endif
 #endif
 
+
 #if defined (ATL_USE64BITS)
+#if _CALL_ELF == 2
+/* ABIv2 */
+        ld      pC0, 104(r1)
+        ld      incCn, 112(r1)
+#else
+/* ABIv1 */
         ld      pC0, 120(r1)
         ld      incCn, 128(r1)
+#endif
 #elif defined(ATL_AS_OSX_PPC) || defined(ATL_AS_AIX_PPC)
         lwz     pC0, 68(r1)
         lwz     incCn,  72(r1)
Index: ATLAS/tune/blas/gemm/CASES/ATL_smm4x4x128_av.c
===================================================================
--- ATLAS.orig/tune/blas/gemm/CASES/ATL_smm4x4x128_av.c
+++ ATLAS/tune/blas/gemm/CASES/ATL_smm4x4x128_av.c
@@ -196,7 +196,7 @@ void ATL_USERMM(const int M, const int N
 	.globl  Mjoin(_,ATL_USERMM)
 Mjoin(_,ATL_USERMM):
 #else
-   #if defined(ATL_USE64BITS)
+   #if defined(ATL_USE64BITS) && _CALL_ELF != 2
 /*
  *      Official Program Descripter section, seg fault w/o it on Linux/PPC64
  */
@@ -221,8 +221,15 @@ ATL_USERMM:
  *      kernel instead
  */
 #if defined (ATL_USE64BITS)
+#if _CALL_ELF == 2
+/* ABIv2 */
+        ld      r10, 104(r1)
+        ld      r5, 112(r1)
+#else
+/* ABIv1 */
         ld      r10, 120(r1)
         ld      r5, 128(r1)
+#endif
 #elif defined(ATL_AS_OSX_PPC)
         lwz     r10, 60(r1)
         lwz     r5,  64(r1)
@@ -285,8 +292,15 @@ ATL_USERMM:
         eqv     r0, r0, r0      /* all 1s */
         ATL_WriteVRSAVE(r0)     /* signal we use all vector regs */
 #if defined (ATL_USE64BITS)
+#if _CALL_ELF == 2
+        /* ABIv2 */
+        ld      pC0, FSIZE+104(r1)
+        ld      ldc, FSIZE+112(r1)
+#else
+        /* ABIv1 */
         ld      pC0, FSIZE+120(r1)
         ld      ldc, FSIZE+128(r1)
+#endif
 #elif defined(ATL_AS_OSX_PPC)
         lwz     pC0, FSIZE+60(r1)
         lwz     ldc,  FSIZE+64(r1)
@@ -4258,8 +4272,15 @@ UNALIGNED_C:
         eqv     r0, r0, r0      /* all 1s */
         ATL_WriteVRSAVE(r0)     /* signal we use all vector regs */
 #if defined (ATL_USE64BITS)
+#if _CALL_ELF == 2
+        /* ABIv2 */
+        ld      pC0, FSIZE+104(r1)
+        ld      ldc, FSIZE+112(r1)
+#else
+        /* ABIv1 */
         ld      pC0, FSIZE+120(r1)
         ld      ldc, FSIZE+128(r1)
+#endif
 #elif defined(ATL_AS_OSX_PPC)
         lwz     pC0, FSIZE+60(r1)
         lwz     ldc,  FSIZE+64(r1)

Places

File atlas.3.10.1-ppc64le_abiv2.patch of Package libatlas3 (Revision 37a605917916ee9b0a6c453f8a958ebc)

Places