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

Merge pull request #3173 from martin-frbg/dyna-sse3 

Fix spillover of host-specific build flags into the shared part of x86 DYNAMIC_ARCH builds
This commit is contained in:
Martin Kroeker 2021-04-05 13:39:17 +02:00 committed by GitHub
parent 209b026e46 5332cbae18
commit a2216ef19f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile.x86
View File

@ -1,10 +1,21 @@
# COMPILER_PREFIX = mingw32- # COMPILER_PREFIX = mingw32-
ifdef HAVE_SSE ifndef DYNAMIC_ARCH
CCOMMON_OPT += -msse ADD_CPUFLAGS = 1
FCOMMON_OPT += -msse else
ifdef TARGET_CORE
ADD_CPUFLAGS = 1
endif
endif endif
ifdef ADD_CPUFLAGS
ifdef HAVE_SSE
CCOMMON_OPT += -msse
ifneq ($(F_COMPILER), NAG)
FCOMMON_OPT += -msse
endif
endif
endif
ifeq ($(OSNAME), Interix) ifeq ($(OSNAME), Interix)
ARFLAGS = -m x86 ARFLAGS = -m x86

15
Makefile.x86_64
View File

@ -8,6 +8,16 @@ endif
endif endif
endif endif
ifndef DYNAMIC_ARCH
ADD_CPUFLAGS = 1
else
ifdef TARGET_CORE
ADD_CPUFLAGS = 1
endif
endif
ifdef ADD_CPUFLAGS
ifdef HAVE_SSE3 ifdef HAVE_SSE3
CCOMMON_OPT += -msse3 CCOMMON_OPT += -msse3
ifneq ($(F_COMPILER), NAG) ifneq ($(F_COMPILER), NAG)
@ -44,7 +54,6 @@ endif
endif endif
ifeq ($(CORE), SKYLAKEX) ifeq ($(CORE), SKYLAKEX)
ifndef DYNAMIC_ARCH
ifndef NO_AVX512 ifndef NO_AVX512
CCOMMON_OPT += -march=skylake-avx512 CCOMMON_OPT += -march=skylake-avx512
ifneq ($(F_COMPILER), NAG) ifneq ($(F_COMPILER), NAG)
@ -62,10 +71,8 @@ endif
endif endif
endif endif
endif endif
endif
ifeq ($(CORE), COOPERLAKE) ifeq ($(CORE), COOPERLAKE)
ifndef DYNAMIC_ARCH
ifndef NO_AVX512 ifndef NO_AVX512
ifeq ($(C_COMPILER), GCC) ifeq ($(C_COMPILER), GCC)
# cooperlake support was added in 10.1 # cooperlake support was added in 10.1
@ -88,7 +95,6 @@ endif
endif endif
endif endif
endif endif
endif
ifdef HAVE_AVX2 ifdef HAVE_AVX2
ifndef NO_AVX2 ifndef NO_AVX2
@ -120,6 +126,7 @@ endif
endif endif
endif endif
endif
ifeq ($(OSNAME), Interix) ifeq ($(OSNAME), Interix)