| @@ -470,10 +470,31 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||||
| #endif | #endif | ||||
| #ifdef FORCE_SAPPHIRERAPIDS | #ifdef FORCE_SAPPHIRERAPIDS | ||||
| #ifdef NO_AVX512 | |||||
| #define FORCE | #define FORCE | ||||
| #define FORCE_INTEL | #define FORCE_INTEL | ||||
| #define ARCHITECTURE "X86" | #define ARCHITECTURE "X86" | ||||
| #ifdef NO_AVX512 | |||||
| #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 " \ | ||||
| @@ -483,10 +504,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 "SAPPHIRERAPIDS" | #define SUBARCHITECTURE "SAPPHIRERAPIDS" | ||||
| #define ARCHCONFIG "-DSAPPHIRERAPIDS " \ | #define ARCHCONFIG "-DSAPPHIRERAPIDS " \ | ||||
| "-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \ | "-DL1_DATA_SIZE=32768 -DL1_DATA_LINESIZE=64 " \ | ||||