Skip to content

Commit 433637c

Browse files
authored
Merge pull request #2980 from martin-frbg/fixgetarch
Fix missing AVX2 and FMA3 capabilities in FORCE_target mode
2 parents 110c7a6 + ec088bf commit 433637c

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

getarch.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
330330
"-DL2_SIZE=262144 -DL2_LINESIZE=64 " \
331331
"-DDTB_DEFAULT_ENTRIES=64 -DDTB_SIZE=4096 " \
332332
"-DHAVE_CMOV -DHAVE_MMX -DHAVE_SSE -DHAVE_SSE2 -DHAVE_SSE3 -DHAVE_SSSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 -DHAVE_AVX " \
333-
"-DFMA3"
333+
"-DHAVE_AVX2 -DHAVE_FMA3 -DFMA3"
334334
#define LIBNAME "haswell"
335335
#define CORENAME "HASWELL"
336336
#endif
@@ -346,7 +346,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
346346
"-DL2_SIZE=262144 -DL2_LINESIZE=64 " \
347347
"-DDTB_DEFAULT_ENTRIES=64 -DDTB_SIZE=4096 " \
348348
"-DHAVE_CMOV -DHAVE_MMX -DHAVE_SSE -DHAVE_SSE2 -DHAVE_SSE3 -DHAVE_SSSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 -DHAVE_AVX " \
349-
"-DFMA3"
349+
"-DHAVE_AVX2 -DHAVE_FMA3 -DFMA3"
350350
#define LIBNAME "haswell"
351351
#define CORENAME "HASWELL"
352352
#else
@@ -359,7 +359,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
359359
"-DL2_SIZE=262144 -DL2_LINESIZE=64 " \
360360
"-DDTB_DEFAULT_ENTRIES=64 -DDTB_SIZE=4096 " \
361361
"-DHAVE_CMOV -DHAVE_MMX -DHAVE_SSE -DHAVE_SSE2 -DHAVE_SSE3 -DHAVE_SSSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 -DHAVE_AVX " \
362-
"-DFMA3 -DHAVE_AVX512VL -march=skylake-avx512"
362+
"-DHAVE_AVX2 -DHAVE_FMA3 -DFMA3 -DHAVE_AVX512VL -march=skylake-avx512"
363363
#define LIBNAME "skylakex"
364364
#define CORENAME "SKYLAKEX"
365365
#endif
@@ -376,7 +376,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
376376
"-DL2_SIZE=262144 -DL2_LINESIZE=64 " \
377377
"-DDTB_DEFAULT_ENTRIES=64 -DDTB_SIZE=4096 " \
378378
"-DHAVE_CMOV -DHAVE_MMX -DHAVE_SSE -DHAVE_SSE2 -DHAVE_SSE3 -DHAVE_SSSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 -DHAVE_AVX " \
379-
"-DFMA3"
379+
"-DHAVE_AVX2 -DHAVE_FMA3 -DFMA3"
380380
#define LIBNAME "haswell"
381381
#define CORENAME "HASWELL"
382382
#else
@@ -389,7 +389,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
389389
"-DL2_SIZE=262144 -DL2_LINESIZE=64 " \
390390
"-DDTB_DEFAULT_ENTRIES=64 -DDTB_SIZE=4096 " \
391391
"-DHAVE_CMOV -DHAVE_MMX -DHAVE_SSE -DHAVE_SSE2 -DHAVE_SSE3 -DHAVE_SSSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 -DHAVE_AVX " \
392-
"-DFMA3 -DHAVE_AVX512VL -DHAVE_AVX512BF16 -march=cooperlake"
392+
"-DHAVE_AVX2 -DHAVE_FMA3 -DFMA3 -DHAVE_AVX512VL -DHAVE_AVX512BF16 -march=cooperlake"
393393
#define LIBNAME "cooperlake"
394394
#define CORENAME "COOPERLAKE"
395395
#endif
@@ -559,7 +559,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
559559
"-DDTB_DEFAULT_ENTRIES=64 -DDTB_SIZE=4096 " \
560560
"-DHAVE_MMX -DHAVE_SSE -DHAVE_SSE2 -DHAVE_SSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 " \
561561
"-DHAVE_SSE4A -DHAVE_MISALIGNSSE -DHAVE_128BITFPU -DHAVE_FASTMOVU -DHAVE_CFLUSH " \
562-
"-DHAVE_AVX -DHAVE_FMA3 -DFMA3"
562+
"-DHAVE_AVX -DHAVE_AVX2 -DHAVE_FMA3 -DFMA3"
563563
#define LIBNAME "zen"
564564
#define CORENAME "ZEN"
565565
#endif

0 commit comments

Comments
 (0)