floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1749 from martin-frbg/issue1531 

Fix ARMV8 cross-compilation for IOS
This commit is contained in:
Martin Kroeker 2018-09-07 11:02:01 +02:00 committed by GitHub
parent 9e2bb0c641 4cf7315a5d
commit ba4f433321
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/arm64/KERNEL
View File

@ -1,17 +1,17 @@
ifndef SNRM2KERNEL ifndef SNRM2KERNEL
SNRM2KERNEL = nrm2.c SNRM2KERNEL = ../arm/nrm2.c
endif endif
ifndef DNRM2KERNEL ifndef DNRM2KERNEL
DNRM2KERNEL = nrm2.c DNRM2KERNEL = ../arm/nrm2.c
endif endif
ifndef CNRM2KERNEL ifndef CNRM2KERNEL
CNRM2KERNEL = znrm2.c CNRM2KERNEL = ../arm/znrm2.c
endif endif
ifndef ZNRM2KERNEL ifndef ZNRM2KERNEL
ZNRM2KERNEL = znrm2.c ZNRM2KERNEL = ../arm/znrm2.c
endif endif
ifndef SCABS_KERNEL ifndef SCABS_KERNEL

6
kernel/arm64/KERNEL.ARMV8
View File

@ -51,10 +51,12 @@ CDOTKERNEL = zdot.S
ZDOTKERNEL = zdot.S ZDOTKERNEL = zdot.S
DSDOTKERNEL = dot.S DSDOTKERNEL = dot.S
ifneq ($(OS_DARWIN)$(CROSS),11)
SNRM2KERNEL = nrm2.S SNRM2KERNEL = nrm2.S
DNRM2KERNEL = nrm2.S DNRM2KERNEL = nrm2.S
CNRM2KERNEL = znrm2.S CNRM2KERNEL = znrm2.S
ZNRM2KERNEL = znrm2.S ZNRM2KERNEL = znrm2.S
endif
SROTKERNEL = rot.S SROTKERNEL = rot.S
DROTKERNEL = rot.S DROTKERNEL = rot.S
@ -86,7 +88,11 @@ DTRMMKERNEL = ../generic/trmmkernel_2x2.c
CTRMMKERNEL = ../generic/ztrmmkernel_2x2.c CTRMMKERNEL = ../generic/ztrmmkernel_2x2.c
ZTRMMKERNEL = ../generic/ztrmmkernel_2x2.c ZTRMMKERNEL = ../generic/ztrmmkernel_2x2.c
ifneq ($(OS_DARWIN)$(CROSS),11)
SGEMMKERNEL = sgemm_kernel_4x4.S SGEMMKERNEL = sgemm_kernel_4x4.S
else
SGEMMKERNEL = ../generic/gemmkernel_2x2.c
endif
SGEMMONCOPY = ../generic/gemm_ncopy_4.c SGEMMONCOPY = ../generic/gemm_ncopy_4.c
SGEMMOTCOPY = ../generic/gemm_tcopy_4.c SGEMMOTCOPY = ../generic/gemm_tcopy_4.c
SGEMMONCOPYOBJ = sgemm_oncopy.o SGEMMONCOPYOBJ = sgemm_oncopy.o

5
param.h
View File

@ -2590,8 +2590,13 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define GEMM_DEFAULT_OFFSET_B 0 #define GEMM_DEFAULT_OFFSET_B 0
#define GEMM_DEFAULT_ALIGN 0x03fffUL #define GEMM_DEFAULT_ALIGN 0x03fffUL
#if defined(OS_DARWIN) && defined(CROSS)
#define SGEMM_DEFAULT_UNROLL_M 2
#define SGEMM_DEFAULT_UNROLL N 2
#else
#define SGEMM_DEFAULT_UNROLL_M 4 #define SGEMM_DEFAULT_UNROLL_M 4
#define SGEMM_DEFAULT_UNROLL_N 4 #define SGEMM_DEFAULT_UNROLL_N 4
#endif
#define DGEMM_DEFAULT_UNROLL_M 2 #define DGEMM_DEFAULT_UNROLL_M 2
#define DGEMM_DEFAULT_UNROLL_N 2 #define DGEMM_DEFAULT_UNROLL_N 2