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

Merge pull request #2162 from martin-frbg/pgi 

Fixes for PGI compiler
This commit is contained in:
Martin Kroeker 2019-07-03 19:16:30 +02:00 committed by GitHub
parent 6b6c9b1441 7684c4f8f8
commit abea977ded
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.system
View File

@ -144,9 +144,10 @@ endif
# On x86_64 build getarch with march=native. This is required to detect AVX512 support in getarch. # On x86_64 build getarch with march=native. This is required to detect AVX512 support in getarch.
ifeq ($(ARCH), x86_64) ifeq ($(ARCH), x86_64)
ifneq ($(C_COMPILER), PGI)
GETARCH_FLAGS += -march=native GETARCH_FLAGS += -march=native
endif endif
endif
ifdef INTERFACE64 ifdef INTERFACE64
ifneq ($(INTERFACE64), 0) ifneq ($(INTERFACE64), 0)

4
Makefile.x86_64
View File

@ -28,11 +28,15 @@ endif
ifeq ($(CORE), HASWELL) ifeq ($(CORE), HASWELL)
ifndef DYNAMIC_ARCH ifndef DYNAMIC_ARCH
ifndef NO_AVX2 ifndef NO_AVX2
ifeq ($(C_COMPILER), GCC)
CCOMMON_OPT += -mavx2 CCOMMON_OPT += -mavx2
endif
ifeq ($(F_COMPILER), GFORTRAN)
FCOMMON_OPT += -mavx2 FCOMMON_OPT += -mavx2
endif endif
endif endif
endif endif
endif

5
common_x86_64.h
View File

@ -129,12 +129,13 @@ static __inline void cpuid(int op, int *eax, int *ebx, int *ecx, int *edx){
*ecx=cpuinfo[2]; *ecx=cpuinfo[2];
*edx=cpuinfo[3]; *edx=cpuinfo[3];
#else #else
__asm__ __volatile__("cpuid" __asm__ __volatile__("mov $0, %%ecx;"
"cpuid"
: "=a" (*eax), : "=a" (*eax),
"=b" (*ebx), "=b" (*ebx),
"=c" (*ecx), "=c" (*ecx),
"=d" (*edx) "=d" (*edx)
: "0" (op), "c"(0)); : "0" (op));
#endif #endif
} }