Add NO_AVX=1 fallbacks to newer generation x86_64 for completeness (#3360)
* Add NO_AVX=1 fallbacks to newer generation x86_64 for completeness * Update .travis.yml
This commit is contained in:
parent
af19cda65a
commit
72f3ce5f08
|
@ -1,6 +1,6 @@
|
||||||
# XXX: Precise is already deprecated, new default is Trusty.
|
# XXX: Precise is already deprecated, new default is Trusty.
|
||||||
# https://blog.travis-ci.com/2017-07-11-trusty-as-default-linux-is-coming
|
# https://blog.travis-ci.com/2017-07-11-trusty-as-default-linux-is-coming
|
||||||
dist: precise
|
dist: focal
|
||||||
sudo: true
|
sudo: true
|
||||||
language: c
|
language: c
|
||||||
|
|
||||||
|
|
83
getarch.c
83
getarch.c
|
@ -313,6 +313,16 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#define FORCE
|
#define FORCE
|
||||||
#define FORCE_INTEL
|
#define FORCE_INTEL
|
||||||
#define ARCHITECTURE "X86"
|
#define ARCHITECTURE "X86"
|
||||||
|
#ifdef NO_AVX
|
||||||
|
#define SUBARCHITECTURE "NEHALEM"
|
||||||
|
#define ARCHCONFIG "-DNEHALEM " \
|
||||||
|
"-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"
|
||||||
|
#define LIBNAME "nehalem"
|
||||||
|
#define CORENAME "NEHALEM"
|
||||||
|
#else
|
||||||
#define SUBARCHITECTURE "SANDYBRIDGE"
|
#define SUBARCHITECTURE "SANDYBRIDGE"
|
||||||
#define ARCHCONFIG "-DSANDYBRIDGE " \
|
#define ARCHCONFIG "-DSANDYBRIDGE " \
|
||||||
"-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \
|
"-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \
|
||||||
|
@ -322,12 +332,23 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#define LIBNAME "sandybridge"
|
#define LIBNAME "sandybridge"
|
||||||
#define CORENAME "SANDYBRIDGE"
|
#define CORENAME "SANDYBRIDGE"
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef FORCE_HASWELL
|
#ifdef FORCE_HASWELL
|
||||||
#define FORCE
|
#define FORCE
|
||||||
#define FORCE_INTEL
|
#define FORCE_INTEL
|
||||||
#define ARCHITECTURE "X86"
|
#define ARCHITECTURE "X86"
|
||||||
#ifdef NO_AVX2
|
#ifdef NO_AVX2
|
||||||
|
#ifdef NO_AVX
|
||||||
|
#define SUBARCHITECTURE "NEHALEM"
|
||||||
|
#define ARCHCONFIG "-DNEHALEM " \
|
||||||
|
"-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"
|
||||||
|
#define LIBNAME "nehalem"
|
||||||
|
#define CORENAME "NEHALEM"
|
||||||
|
#else
|
||||||
#define SUBARCHITECTURE "SANDYBRIDGE"
|
#define SUBARCHITECTURE "SANDYBRIDGE"
|
||||||
#define ARCHCONFIG "-DSANDYBRIDGE " \
|
#define ARCHCONFIG "-DSANDYBRIDGE " \
|
||||||
"-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \
|
"-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \
|
||||||
|
@ -336,6 +357,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
"-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"
|
||||||
#define LIBNAME "sandybridge"
|
#define LIBNAME "sandybridge"
|
||||||
#define CORENAME "SANDYBRIDGE"
|
#define CORENAME "SANDYBRIDGE"
|
||||||
|
#endif
|
||||||
#else
|
#else
|
||||||
#define SUBARCHITECTURE "HASWELL"
|
#define SUBARCHITECTURE "HASWELL"
|
||||||
#define ARCHCONFIG "-DHASWELL " \
|
#define ARCHCONFIG "-DHASWELL " \
|
||||||
|
@ -354,6 +376,27 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#define FORCE
|
#define FORCE
|
||||||
#define FORCE_INTEL
|
#define FORCE_INTEL
|
||||||
#define ARCHITECTURE "X86"
|
#define ARCHITECTURE "X86"
|
||||||
|
#ifdef NO_AVX2
|
||||||
|
#ifdef NO_AVX
|
||||||
|
#define SUBARCHITECTURE "NEHALEM"
|
||||||
|
#define ARCHCONFIG "-DNEHALEM " \
|
||||||
|
"-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"
|
||||||
|
#define LIBNAME "nehalem"
|
||||||
|
#define CORENAME "NEHALEM"
|
||||||
|
#else
|
||||||
|
#define SUBARCHITECTURE "SANDYBRIDGE"
|
||||||
|
#define ARCHCONFIG "-DSANDYBRIDGE " \
|
||||||
|
"-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"
|
||||||
|
#define LIBNAME "sandybridge"
|
||||||
|
#define CORENAME "SANDYBRIDGE"
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
#define SUBARCHITECTURE "HASWELL"
|
#define SUBARCHITECTURE "HASWELL"
|
||||||
#define ARCHCONFIG "-DHASWELL " \
|
#define ARCHCONFIG "-DHASWELL " \
|
||||||
"-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \
|
"-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \
|
||||||
|
@ -363,10 +406,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
"-DHAVE_AVX2 -DHAVE_FMA3 -DFMA3"
|
"-DHAVE_AVX2 -DHAVE_FMA3 -DFMA3"
|
||||||
#define LIBNAME "haswell"
|
#define LIBNAME "haswell"
|
||||||
#define CORENAME "HASWELL"
|
#define CORENAME "HASWELL"
|
||||||
|
#endif
|
||||||
#else
|
#else
|
||||||
#define FORCE
|
|
||||||
#define FORCE_INTEL
|
|
||||||
#define ARCHITECTURE "X86"
|
|
||||||
#define SUBARCHITECTURE "SKYLAKEX"
|
#define SUBARCHITECTURE "SKYLAKEX"
|
||||||
#define ARCHCONFIG "-DSKYLAKEX " \
|
#define ARCHCONFIG "-DSKYLAKEX " \
|
||||||
"-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \
|
"-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \
|
||||||
|
@ -384,6 +425,27 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#define FORCE
|
#define FORCE
|
||||||
#define FORCE_INTEL
|
#define FORCE_INTEL
|
||||||
#define ARCHITECTURE "X86"
|
#define ARCHITECTURE "X86"
|
||||||
|
#ifdef NO_AVX2
|
||||||
|
#ifdef NO_AVX
|
||||||
|
#define SUBARCHITECTURE "NEHALEM"
|
||||||
|
#define ARCHCONFIG "-DNEHALEM " \
|
||||||
|
"-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"
|
||||||
|
#define LIBNAME "nehalem"
|
||||||
|
#define CORENAME "NEHALEM"
|
||||||
|
#else
|
||||||
|
#define SUBARCHITECTURE "SANDYBRIDGE"
|
||||||
|
#define ARCHCONFIG "-DSANDYBRIDGE " \
|
||||||
|
"-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"
|
||||||
|
#define LIBNAME "sandybridge"
|
||||||
|
#define CORENAME "SANDYBRIDGE"
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
#define SUBARCHITECTURE "HASWELL"
|
#define SUBARCHITECTURE "HASWELL"
|
||||||
#define ARCHCONFIG "-DHASWELL " \
|
#define ARCHCONFIG "-DHASWELL " \
|
||||||
"-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \
|
"-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \
|
||||||
|
@ -393,10 +455,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
"-DHAVE_AVX2 -DHAVE_FMA3 -DFMA3"
|
"-DHAVE_AVX2 -DHAVE_FMA3 -DFMA3"
|
||||||
#define LIBNAME "haswell"
|
#define LIBNAME "haswell"
|
||||||
#define CORENAME "HASWELL"
|
#define CORENAME "HASWELL"
|
||||||
|
#endif
|
||||||
#else
|
#else
|
||||||
#define FORCE
|
|
||||||
#define FORCE_INTEL
|
|
||||||
#define ARCHITECTURE "X86"
|
|
||||||
#define SUBARCHITECTURE "COOPERLAKE"
|
#define SUBARCHITECTURE "COOPERLAKE"
|
||||||
#define ARCHCONFIG "-DCOOPERLAKE " \
|
#define ARCHCONFIG "-DCOOPERLAKE " \
|
||||||
"-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \
|
"-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \
|
||||||
|
@ -564,6 +624,16 @@ 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"
|
||||||
#ifdef NO_AVX2
|
#ifdef NO_AVX2
|
||||||
|
#ifdef NO_AVX
|
||||||
|
#define SUBARCHITECTURE "NEHALEM"
|
||||||
|
#define ARCHCONFIG "-DNEHALEM " \
|
||||||
|
"-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"
|
||||||
|
#define LIBNAME "nehalem"
|
||||||
|
#define CORENAME "NEHALEM"
|
||||||
|
#else
|
||||||
#define SUBARCHITECTURE "SANDYBRIDGE"
|
#define SUBARCHITECTURE "SANDYBRIDGE"
|
||||||
#define ARCHCONFIG "-DSANDYBRIDGE " \
|
#define ARCHCONFIG "-DSANDYBRIDGE " \
|
||||||
"-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \
|
"-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \
|
||||||
|
@ -572,6 +642,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
"-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"
|
||||||
#define LIBNAME "sandybridge"
|
#define LIBNAME "sandybridge"
|
||||||
#define CORENAME "SANDYBRIDGE"
|
#define CORENAME "SANDYBRIDGE"
|
||||||
|
#endif
|
||||||
#else
|
#else
|
||||||
#define SUBARCHITECTURE "ZEN"
|
#define SUBARCHITECTURE "ZEN"
|
||||||
#define ARCHCONFIG "-DZEN " \
|
#define ARCHCONFIG "-DZEN " \
|
||||||
|
|
Loading…
Reference in New Issue