reduce scope of avx512 cflags

This commit is contained in:
Andrew 2018-12-11 22:33:36 +01:00
parent 863162a1c8
commit 91d6a56931
2 changed files with 23 additions and 14 deletions

View File

@ -8,20 +8,20 @@ endif
endif endif
endif endif
ifeq ($(CORE), SKYLAKEX) # ifeq ($(CORE), SKYLAKEX)
ifndef NO_AVX512 # ifndef NO_AVX512
CCOMMON_OPT += -march=skylake-avx512 # CCOMMON_OPT += -march=skylake-avx512
FCOMMON_OPT += -march=skylake-avx512 # FCOMMON_OPT += -march=skylake-avx512
ifeq ($(OSNAME), CYGWIN_NT) # ifeq ($(OSNAME), CYGWIN_NT)
CCOMMON_OPT += -fno-asynchronous-unwind-tables # CCOMMON_OPT += -fno-asynchronous-unwind-tables
endif # endif
ifeq ($(OSNAME), WINNT) # ifeq ($(OSNAME), WINNT)
ifeq ($(C_COMPILER), GCC) # ifeq ($(C_COMPILER), GCC)
CCOMMON_OPT += -fno-asynchronous-unwind-tables # CCOMMON_OPT += -fno-asynchronous-unwind-tables
endif # endif
endif # endif
endif # endif
endif # endif
ifeq ($(OSNAME), Interix) ifeq ($(OSNAME), Interix)
ARFLAGS = -m x64 ARFLAGS = -m x64

View File

@ -331,12 +331,21 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define FORCE_INTEL #define FORCE_INTEL
#define ARCHITECTURE "X86" #define ARCHITECTURE "X86"
#define SUBARCHITECTURE "SKYLAKEX" #define SUBARCHITECTURE "SKYLAKEX"
#ifndef WINNT
#define ARCHCONFIG "-DSKYLAKEX " \ #define ARCHCONFIG "-DSKYLAKEX " \
"-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \ "-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \
"-DL2_SIZE=262144 -DL2_LINESIZE=64 " \ "-DL2_SIZE=262144 -DL2_LINESIZE=64 " \
"-DDTB_DEFAULT_ENTRIES=64 -DDTB_SIZE=4096 " \ "-DDTB_DEFAULT_ENTRIES=64 -DDTB_SIZE=4096 " \
"-DHAVE_CMOV -DHAVE_MMX -DHAVE_SSE -DHAVE_SSE2 -DHAVE_SSE3 -DHAVE_SSSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 -DHAVE_AVX " \ "-DHAVE_CMOV -DHAVE_MMX -DHAVE_SSE -DHAVE_SSE2 -DHAVE_SSE3 -DHAVE_SSSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 -DHAVE_AVX " \
"-DFMA3 -DHAVE_AVX512VL -march=skylake-avx512" "-DFMA3 -DHAVE_AVX512VL -march=skylake-avx512"
#else
#define ARCHCONFIG "-DSKYLAKEX " \
"-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \
"-DL2_SIZE=262144 -DL2_LINESIZE=64 " \
"-DDTB_DEFAULT_ENTRIES=64 -DDTB_SIZE=4096 " \
"-DHAVE_CMOV -DHAVE_MMX -DHAVE_SSE -DHAVE_SSE2 -DHAVE_SSE3 -DHAVE_SSSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 -DHAVE_AVX " \
"-DFMA3 -DHAVE_AVX512VL -march=skylake-avx512 -fno-asynchronous-unwind-tables"
#endif
#define LIBNAME "skylakex" #define LIBNAME "skylakex"
#define CORENAME "SKYLAKEX" #define CORENAME "SKYLAKEX"
#endif #endif