X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=config%2Fx86%2Fmeson.build;h=29f3dea1813c09b2e20f07ef9105a14b206d7fa2;hb=c4045f34557a5ce3de2b14e997fe41b122595e29;hp=6ec020ef6b27bd0d77f866dc4e301b4a447fb0c7;hpb=68b1f1cda5b46ab826aa83d39d9e5b473c5bdcce;p=dpdk.git

diff --git a/config/x86/meson.build b/config/x86/meson.build
index 6ec020ef6b..29f3dea181 100644
--- a/config/x86/meson.build
+++ b/config/x86/meson.build
@@ -1,50 +1,74 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017-2019 Intel Corporation
+# Copyright(c) 2017-2020 Intel Corporation
 
 # get binutils version for the workaround of Bug 97
 if not is_windows
-	binutils_ok = run_command(binutils_avx512_check)
-	if binutils_ok.returncode() != 0 and cc.has_argument('-mno-avx512f')
-		machine_args += '-mno-avx512f'
-		warning('Binutils error with AVX512 assembly, disabling AVX512 support')
-	endif
+    binutils_ok = run_command(binutils_avx512_check)
+    if binutils_ok.returncode() != 0 and cc.has_argument('-mno-avx512f')
+        machine_args += '-mno-avx512f'
+        warning('Binutils error with AVX512 assembly, disabling AVX512 support')
+    endif
+endif
+
+# check if compiler is working with _mm512_extracti64x4_epi64
+# Ref: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82887
+if cc.has_argument('-mavx512f')
+    code = '''#include <immintrin.h>
+    void test(__m512i zmm){
+        __m256i ymm = _mm512_extracti64x4_epi64(zmm, 0);}'''
+    result = cc.compiles(code, args : '-mavx512f', name : 'AVX512 checking')
+    if result == false
+        machine_args += '-mno-avx512f'
+        warning('Broken _mm512_extracti64x4_epi64, disabling AVX512 support')
+    endif
 endif
 
 # we require SSE4.2 for DPDK
 if cc.get_define('__SSE4_2__', args: machine_args) == ''
-	message('SSE 4.2 not enabled by default, explicitly enabling')
-	machine_args += '-msse4'
+    message('SSE 4.2 not enabled by default, explicitly enabling')
+    machine_args += '-msse4'
 endif
 
 base_flags = ['SSE', 'SSE2', 'SSE3','SSSE3', 'SSE4_1', 'SSE4_2']
 foreach f:base_flags
-	dpdk_conf.set('RTE_MACHINE_CPUFLAG_' + f, 1)
-	compile_time_cpuflags += ['RTE_CPUFLAG_' + f]
+    compile_time_cpuflags += ['RTE_CPUFLAG_' + f]
 endforeach
 
-optional_flags = ['AES', 'PCLMUL',
-		'AVX', 'AVX2', 'AVX512F',
-		'RDRND', 'RDSEED']
+optional_flags = [
+        'AES',
+        'AVX',
+        'AVX2',
+        'AVX512BW',
+        'AVX512CD',
+        'AVX512DQ',
+        'AVX512F',
+        'AVX512VL',
+        'PCLMUL',
+        'RDRND',
+        'RDSEED',
+        'VPCLMULQDQ',
+]
 foreach f:optional_flags
-	if cc.get_define('__@0@__'.format(f), args: machine_args) == '1'
-		if f == 'PCLMUL' # special case flags with different defines
-			f = 'PCLMULQDQ'
-		elif f == 'RDRND'
-			f = 'RDRAND'
-		endif
-		dpdk_conf.set('RTE_MACHINE_CPUFLAG_' + f, 1)
-		compile_time_cpuflags += ['RTE_CPUFLAG_' + f]
-	endif
+    if cc.get_define('__@0@__'.format(f), args: machine_args) == '1'
+        if f == 'PCLMUL' # special case flags with different defines
+            f = 'PCLMULQDQ'
+        elif f == 'RDRND'
+            f = 'RDRAND'
+        endif
+        compile_time_cpuflags += ['RTE_CPUFLAG_' + f]
+    endif
 endforeach
 
 
 dpdk_conf.set('RTE_ARCH_X86', 1)
 if dpdk_conf.get('RTE_ARCH_64')
-	dpdk_conf.set('RTE_ARCH_X86_64', 1)
-	dpdk_conf.set('RTE_ARCH', 'x86_64')
+    dpdk_conf.set('RTE_ARCH_X86_64', 1)
+    dpdk_conf.set('RTE_ARCH', 'x86_64')
 else
-	dpdk_conf.set('RTE_ARCH_I686', 1)
-	dpdk_conf.set('RTE_ARCH', 'i686')
+    dpdk_conf.set('RTE_ARCH_I686', 1)
+    dpdk_conf.set('RTE_ARCH', 'i686')
 endif
 
 dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
+dpdk_conf.set('RTE_MAX_LCORE', 128)
+dpdk_conf.set('RTE_MAX_NUMA_NODES', 32)