Merge pull request #2898 from martin-frbg/morefixes
More pre-release fixes
This commit is contained in:
commit
e6c5b13a18
16
Makefile.x86
16
Makefile.x86
|
@ -54,3 +54,19 @@ LIBATLAS = -L$(ATLASPATH)/32 -lcblas -lf77blas -latlas -lm
|
||||||
else
|
else
|
||||||
LIBATLAS = -L$(ATLASPATH)/32 -lptf77blas -lptatlas -lpthread -lm
|
LIBATLAS = -L$(ATLASPATH)/32 -lptf77blas -lptatlas -lpthread -lm
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef HAVE_SSE3
|
||||||
|
ifndef DYNAMIC_ARCH
|
||||||
|
CCOMMON_OPT += -msse3
|
||||||
|
FCOMMON_OPT += -msse3
|
||||||
|
ifdef HAVE_SSSE3
|
||||||
|
CCOMMON_OPT += -mssse3
|
||||||
|
FCOMMON_OPT += -mssse3
|
||||||
|
endif
|
||||||
|
ifdef HAVE_SSE4_1
|
||||||
|
CCOMMON_OPT += -msse4.1
|
||||||
|
FCOMMON_OPT += -msse4.1
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
|
@ -46,6 +46,9 @@ endif
|
||||||
ifdef TARGET_CORE
|
ifdef TARGET_CORE
|
||||||
ifeq ($(TARGET_CORE), $(filter $(TARGET_CORE),PRESCOTT CORE2 PENRYN DUNNINGTON ATOM NANO SANDYBRIDGE HASWELL NEHALEM ZEN BARCELONA BOBCAT BULLDOZER PILEDRIVER EXCAVATOR STEAMROLLER OPTERON_SSE3))
|
ifeq ($(TARGET_CORE), $(filter $(TARGET_CORE),PRESCOTT CORE2 PENRYN DUNNINGTON ATOM NANO SANDYBRIDGE HASWELL NEHALEM ZEN BARCELONA BOBCAT BULLDOZER PILEDRIVER EXCAVATOR STEAMROLLER OPTERON_SSE3))
|
||||||
override CFLAGS += -msse3 -mssse3 -msse4.1
|
override CFLAGS += -msse3 -mssse3 -msse4.1
|
||||||
|
endif
|
||||||
|
ifeq ($(TARGET_CORE), $(filter $(TARGET_CORE),KATMAI COPPERMINE NEHALEM BARCELONA CORE2 PRESCOTT NORTHWOOD ATHLON))
|
||||||
|
override CFLAGS += -msse -msse2
|
||||||
endif
|
endif
|
||||||
ifeq ($(TARGET_CORE), COOPERLAKE)
|
ifeq ($(TARGET_CORE), COOPERLAKE)
|
||||||
override CFLAGS += -DBUILD_KERNEL -DTABLE_NAME=gotoblas_$(TARGET_CORE)
|
override CFLAGS += -DBUILD_KERNEL -DTABLE_NAME=gotoblas_$(TARGET_CORE)
|
||||||
|
|
|
@ -1164,7 +1164,7 @@ static void init_parameter(void) {
|
||||||
TABLE_NAME.xgemm3m_q = QGEMM_DEFAULT_Q;
|
TABLE_NAME.xgemm3m_q = QGEMM_DEFAULT_Q;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (CORE_KATMAI) || (CORE_COPPERMINE) || (CORE_BANIAS) || (CORE_YONAH) || (CORE_ATHLON)
|
#if defined(CORE_KATMAI) || defined(CORE_COPPERMINE) || defined(CORE_BANIAS) || defined(CORE_YONAH) || defined(CORE_ATHLON)
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
fprintf(stderr, "Katmai, Coppermine, Banias, Athlon\n");
|
fprintf(stderr, "Katmai, Coppermine, Banias, Athlon\n");
|
||||||
|
|
|
@ -51,6 +51,8 @@
|
||||||
#define MAXPS maxps
|
#define MAXPS maxps
|
||||||
#define MAXSS maxss
|
#define MAXSS maxss
|
||||||
#ifdef USE_MIN
|
#ifdef USE_MIN
|
||||||
|
#undef MAXPS
|
||||||
|
#undef MAXSS
|
||||||
#define MAXPS minps
|
#define MAXPS minps
|
||||||
#define MAXSS minss
|
#define MAXSS minss
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue