Skip to content

Fix pre-processed POWER8 codes and wrong conditionals in the POWER8,PPC440 and PPC970 KERNEL files #2411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Feb 14, 2020
Merged

Fix pre-processed POWER8 codes and wrong conditionals in the POWER8,PPC440 and PPC970 KERNEL files #2411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
616921f
Merge pull request #27 from xianyi/develop
martin-frbg Feb 12, 2020
dc345d8
Fix syntax of endianness conditional and add gcc version check for wo…
martin-frbg Feb 12, 2020
120d207
Fix syntax of endianness conditional
martin-frbg Feb 12, 2020
0544cbc
Fix syntax of endianness conditional
martin-frbg Feb 12, 2020
7c162b8
Update isamax_power8.S
martin-frbg Feb 12, 2020
de40d47
Update isamin_power8.S
martin-frbg Feb 12, 2020
8eefa53
Update isamax_power8.S
martin-frbg Feb 12, 2020
5ba3699
Update isamin_power8.S
martin-frbg Feb 12, 2020
486c35c
Update icamin_power8.S
martin-frbg Feb 13, 2020
92ca92a
Update caxpy_power8.S
martin-frbg Feb 13, 2020
cafdd99
Update caxpy_power8.S
martin-frbg Feb 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 32 additions & 5 deletions kernel/power/KERNEL.POWER8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,30 +89,52 @@ ZTRSMKERNEL_RT = ../generic/trsm_kernel_RT.c
#SMINKERNEL = ../arm/min.c
#DMINKERNEL = ../arm/min.c
#
ifneq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
ifneq ($(GCCVERSIONGTEQ9),1)
ISAMAXKERNEL = isamax_power8.S
else
ISAMAXKERNEL = isamax.c
endif
else
ISAMAXKERNEL = isamax.c
endif
#
IDAMAXKERNEL = idamax.c
ifneq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
#
ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
ifneq ($(GCCVERSIONGTEQ9),1)
ICAMAXKERNEL = icamax_power8.S
else
ICAMAXKERNEL = icamax.c
endif
else
ICAMAXKERNEL = icamax.c
endif
#
IZAMAXKERNEL = izamax.c
#
ifneq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
ifneq ($(GCCVERSIONGTEQ9),1)
ISAMINKERNEL = isamin_power8.S
else
ISAMINKERNEL = isamin.c
endif
else
ISAMINKERNEL = isamin.c
endif
#
IDAMINKERNEL = idamin.c
ifneq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
#
ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
ifneq ($(GCCVERSIONGTEQ9),1)
ICAMINKERNEL = icamin_power8.S
else
ICAMINKERNEL = icamin.c
endif
else
ICAMINKERNEL = icamin.c
endif
#
IZAMINKERNEL = izamin.c
#
#ISMAXKERNEL = ../arm/imax.c
Expand All @@ -128,11 +150,16 @@ ZASUMKERNEL = zasum.c
#
SAXPYKERNEL = saxpy.c
DAXPYKERNEL = daxpy.c
ifneq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
ifneq ($(GCCVERSIONGTEQ9),1)
CAXPYKERNEL = caxpy_power8.S
else
CAXPYKERNEL = caxpy.c
endif
else
CAXPYKERNEL = caxpy.c
endif
#
ZAXPYKERNEL = zaxpy.c
#
SCOPYKERNEL = scopy.c
Expand Down
8 changes: 4 additions & 4 deletions kernel/power/KERNEL.PPC440
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ZASUMKERNEL = zasum_ppc440.S

SAXPYKERNEL = axpy_ppc440.S
DAXPYKERNEL = axpy_ppc440.S
ifneq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
CAXPYKERNEL = ../arm/zaxpy.c
ZAXPYKERNEL = ../arm/zaxpy.c
else
Expand All @@ -25,7 +25,7 @@ endif

SDOTKERNEL = dot_ppc440.S
DDOTKERNEL = dot_ppc440.S
ifneq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
CDOTKERNEL = zdot_ppc440.S
ZDOTKERNEL = zdot_ppc440.S
else
Expand Down Expand Up @@ -62,7 +62,7 @@ ZNRM2KERNEL = znrm2_ppc440.S

SROTKERNEL = rot_ppc440.S
DROTKERNEL = rot_ppc440.S
ifneq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
CROTKERNEL = zrot_ppc440.S
ZROTKERNEL = zrot_ppc440.S
else
Expand Down Expand Up @@ -132,7 +132,7 @@ ZTRSMKERNEL_LT = ztrsm_kernel_ppc440_LT.S
ZTRSMKERNEL_RN = ztrsm_kernel_ppc440_LT.S
ZTRSMKERNEL_RT = ztrsm_kernel_ppc440_RT.S

ifeq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
ifeq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
SGEMVNKERNEL = ../arm/gemv_n.c
DGEMVNKERNEL = ../arm/gemv_n.c
SGEMVTKERNEL = ../arm/gemv_t.c
Expand Down
6 changes: 3 additions & 3 deletions kernel/power/KERNEL.PPC970
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ifeq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
ifeq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
SGEMMKERNEL = gemm_kernel.S
SGEMMINCOPY =
SGEMMITCOPY =
Expand Down Expand Up @@ -30,7 +30,7 @@ DGEMMITCOPYOBJ =
DGEMMONCOPYOBJ = dgemm_oncopy$(TSUFFIX).$(SUFFIX)
DGEMMOTCOPYOBJ = dgemm_otcopy$(TSUFFIX).$(SUFFIX)

ifeq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
ifeq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
CGEMMKERNEL = zgemm_kernel.S
CGEMMINCOPY =
CGEMMITCOPY =
Expand Down Expand Up @@ -72,7 +72,7 @@ ZTRSMKERNEL_LT = ztrsm_kernel_LT.S
ZTRSMKERNEL_RN = ztrsm_kernel_LT.S
ZTRSMKERNEL_RT = ztrsm_kernel_RT.S

ifeq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
ifeq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
STRSMKERNEL_LN = trsm_kernel_LN.S
STRSMKERNEL_LT = trsm_kernel_LT.S
STRSMKERNEL_RN = trsm_kernel_LT.S
Expand Down
7 changes: 7 additions & 0 deletions kernel/power/caxpy_power8.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@

PROLOGUE

#if _CALL_ELF ==2
#ifdef CONJ
caxpyc_k:
#else
caxpy_k:
#endif
#endif
.LCF0:
0: addis 2,12,.TOC.-.LCF0@ha
addi 2,2,.TOC.-.LCF0@l
Expand Down
4 changes: 3 additions & 1 deletion kernel/power/icamin_power8.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
#include "common.h"

PROLOGUE

#if _CALL_ELF ==2
icamin_k:
#endif
.LCF0:
0: addis 2,12,.TOC.-.LCF0@ha
addi 2,2,.TOC.-.LCF0@l
Expand Down
5 changes: 4 additions & 1 deletion kernel/power/isamax_power8.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
#include "common.h"

PROLOGUE


#if _CALL_ELF == 2
isamax_k:
#endif
.LCF0:
0: addis 2,12,.TOC.-.LCF0@ha
addi 2,2,.TOC.-.LCF0@l
Expand Down
3 changes: 3 additions & 0 deletions kernel/power/isamin_power8.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@

PROLOGUE

#if _CALL_ELF ==2
isamin_k:
#endif
.LCF0:
0: addis 2,12,.TOC.-.LCF0@ha
addi 2,2,.TOC.-.LCF0@l
Expand Down