diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2019-03-20 14:50:04 +0000 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2019-03-20 14:50:10 +0000 |
| commit | 36e178648f46ea9fb63d89097c59ce45fb8a67fe (patch) | |
| tree | e3ee0ea25a45aa28918dc721dd1fe19b27d6849c /mk/rte.cpuflags.mk | |
| parent | 1ab31fb74132eabd45f326413eb6e4f647de48d9 (diff) | |
| parent | f7a9461e29147c47ce2bb81bd157ac1833cf5eb1 (diff) | |
Merge tag 'upstream/16.11.9' into 16.11.x
Upstream version 16.11.9
Change-Id: I947c2532ec89a9850d135bde544b4d5812b49e4f
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'mk/rte.cpuflags.mk')
| -rw-r--r-- | mk/rte.cpuflags.mk | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/mk/rte.cpuflags.mk b/mk/rte.cpuflags.mk index e634abc3..5cef63ab 100644 --- a/mk/rte.cpuflags.mk +++ b/mk/rte.cpuflags.mk @@ -70,8 +70,10 @@ CPUFLAGS += PCLMULQDQ endif ifneq ($(filter $(AUTO_CPUFLAGS),__AVX__),) +ifeq ($(CONFIG_RTE_ENABLE_AVX),y) CPUFLAGS += AVX endif +endif ifneq ($(filter $(AUTO_CPUFLAGS),__RDRND__),) CPUFLAGS += RDRAND @@ -86,11 +88,20 @@ CPUFLAGS += F16C endif ifneq ($(filter $(AUTO_CPUFLAGS),__AVX2__),) +ifeq ($(CONFIG_RTE_ENABLE_AVX),y) CPUFLAGS += AVX2 endif +endif ifneq ($(filter $(AUTO_CPUFLAGS),__AVX512F__),) +ifeq ($(CONFIG_RTE_ENABLE_AVX512),y) CPUFLAGS += AVX512F +else +# disable AVX512F support of gcc as a workaround for Bug 97 +ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) +MACHINE_CFLAGS += -mno-avx512f +endif +endif endif # IBM Power CPU flags @@ -111,7 +122,7 @@ CPUFLAGS += VSX endif # ARM flags -ifneq ($(filter $(AUTO_CPUFLAGS),__ARM_NEON),) +ifneq ($(filter __ARM_NEON __aarch64__,$(AUTO_CPUFLAGS)),) CPUFLAGS += NEON endif |