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

Merge pull request #3331 from gxw-loongson/develop 

Fixed typos about LOONGARCH64
This commit is contained in:
Martin Kroeker 2021-08-02 07:21:46 +02:00 committed by GitHub
parent e0e88f9edc 0b8f7c8c10
commit e6d6d3ee43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.system
View File

@ -856,7 +856,7 @@ BINARY_DEFINED = 1
endif endif
ifeq ($(ARCH), loongarch64) ifeq ($(ARCH), loongarch64)
ifeq ($(CORE), LOONGSONG3R5) ifeq ($(CORE), LOONGSON3R5)
CCOMMON_OPT += -march=loongarch64 -mabi=lp64 CCOMMON_OPT += -march=loongarch64 -mabi=lp64
FCOMMON_OPT += -march=loongarch64 -mabi=lp64 FCOMMON_OPT += -march=loongarch64 -mabi=lp64
endif endif

4
cmake/arch.cmake
View File

@ -113,6 +113,10 @@ if (MIPS64)
set(NO_BINARY_MODE 1) set(NO_BINARY_MODE 1)
endif () endif ()
if (LOONGARCH64)
set(NO_BINARY_MODE 1)
endif ()
if (${ARCH} STREQUAL "alpha") if (${ARCH} STREQUAL "alpha")
set(NO_BINARY_MODE 1) set(NO_BINARY_MODE 1)
set(BINARY_DEFINED 1) set(BINARY_DEFINED 1)

9
cmake/cc.cmake
View File

@ -29,6 +29,15 @@ if (${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_C_COMPILER_ID} STREQUAL "LS
set(FCOMMON_OPT "${FCOMMON_OPT} -march=mips64") set(FCOMMON_OPT "${FCOMMON_OPT} -march=mips64")
endif () endif ()
if (LOONGARCH64)
if (BINARY64)
set(CCOMMON_OPT "${CCOMMON_OPT} -mabi=lp64")
else ()
set(CCOMMON_OPT "${CCOMMON_OPT} -mabi=lp32")
endif ()
set(BINARY_DEFINED 1)
endif ()
if (CMAKE_SYSTEM_NAME STREQUAL "AIX") if (CMAKE_SYSTEM_NAME STREQUAL "AIX")
set(BINARY_DEFINED 1) set(BINARY_DEFINED 1)
endif () endif ()

7
cmake/fc.cmake
View File

@ -61,6 +61,13 @@ if (${F_COMPILER} STREQUAL "GFORTRAN")
set(FCOMMON_OPT "${FCOMMON_OPT} -mabi=n32") set(FCOMMON_OPT "${FCOMMON_OPT} -mabi=n32")
endif () endif ()
endif () endif ()
if (LOONGARCH64)
if (BINARY64)
set(FCOMMON_OPT "${FCOMMON_OPT} -mabi=lp64")
else ()
set(FCOMMON_OPT "${FCOMMON_OPT} -mabi=lp32")
endif ()
endif ()
else () else ()
if (BINARY64) if (BINARY64)
set(FCOMMON_OPT "${FCOMMON_OPT} -m64") set(FCOMMON_OPT "${FCOMMON_OPT} -m64")

4
cmake/system_check.cmake
View File

@ -38,6 +38,8 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc.*|power.*|Power.*")
set(PPC 1) set(PPC 1)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "mips64.*") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "mips64.*")
set(MIPS64 1) set(MIPS64 1)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "loongarch64.*")
set(LOONGARCH64 1)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
if (NOT BINARY) if (NOT BINARY)
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
@ -95,7 +97,7 @@ else()
endif () endif ()
if (NOT BINARY) if (NOT BINARY)
if (X86_64 OR ARM64 OR PPC OR MIPS64) if (X86_64 OR ARM64 OR PPC OR MIPS64 OR LOONGARCH64)
set(BINARY 64) set(BINARY 64)
else () else ()
set(BINARY 32) set(BINARY 32)

2
common_loongarch64.h
View File

@ -186,7 +186,7 @@ REALNAME: ;\
#define BUFFER_SIZE ( 32 << 20) #define BUFFER_SIZE ( 32 << 20)
#define PAGESIZE (16UL << 1) #define PAGESIZE (16UL << 10)
#define FIXED_PAGESIZE (16UL << 10) #define FIXED_PAGESIZE (16UL << 10)
#define HUGE_PAGESIZE ( 2 << 20) #define HUGE_PAGESIZE ( 2 << 20)

2
kernel/loongarch64/KERNEL
View File

@ -234,3 +234,5 @@ endif
ifndef ZGEMM3MKERNEL ifndef ZGEMM3MKERNEL
ZGEMM3MKERNEL = zgemm3m_kernel.S ZGEMM3MKERNEL = zgemm3m_kernel.S
endif endif
DSDOTKERNEL = dot.S