X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fiavf%2Fmeson.build;h=dcd028530cfa90958303766dd14d0c3197e86762;hb=13e8bf892c2ea18c8a7ef8ec82f6dce6776c5163;hp=bc22ad1799e45978a0263e9cd7256d3decc8b1c5;hpb=3ded348378a76622e22a9017455de02c8c4048b5;p=dpdk.git

diff --git a/drivers/net/iavf/meson.build b/drivers/net/iavf/meson.build
index bc22ad1799..dcd028530c 100644
--- a/drivers/net/iavf/meson.build
+++ b/drivers/net/iavf/meson.build
@@ -3,18 +3,59 @@
 
 cflags += ['-Wno-strict-aliasing']
 
-allow_experimental_apis = true
-
-subdir('base')
-objs = [base_objs]
+includes += include_directories('../../common/iavf')
+deps += ['common_iavf']
 
 sources = files(
 	'iavf_ethdev.c',
 	'iavf_rxtx.c',
 	'iavf_vchnl.c',
+	'iavf_generic_flow.c',
+	'iavf_fdir.c',
+	'iavf_hash.c',
 )
 
 if arch_subdir == 'x86'
-	dpdk_conf.set('RTE_LIBRTE_AVF_INC_VECTOR', 1)
 	sources += files('iavf_rxtx_vec_sse.c')
+
+	# compile AVX2 version if either:
+	# a. we have AVX supported in minimum instruction set baseline
+	# b. it's not minimum instruction set, but supported by compiler
+	if cc.get_define('__AVX2__', args: machine_args) != ''
+		cflags += ['-DCC_AVX2_SUPPORT']
+		sources += files('iavf_rxtx_vec_avx2.c')
+	elif cc.has_argument('-mavx2')
+		cflags += ['-DCC_AVX2_SUPPORT']
+		iavf_avx2_lib = static_library('iavf_avx2_lib',
+				'iavf_rxtx_vec_avx2.c',
+				dependencies: [static_rte_ethdev,
+					static_rte_kvargs, static_rte_hash],
+				include_directories: includes,
+				c_args: [cflags, '-mavx2'])
+		objs += iavf_avx2_lib.extract_objects('iavf_rxtx_vec_avx2.c')
+	endif
+
+	iavf_avx512_cpu_support = (
+		cc.get_define('__AVX512F__', args: machine_args) != '' and
+		cc.get_define('__AVX512BW__', args: machine_args) != '')
+
+	iavf_avx512_cc_support = (
+		not machine_args.contains('-mno-avx512f') and
+		cc.has_argument('-mavx512f') and
+		cc.has_argument('-mavx512bw'))
+
+	if iavf_avx512_cpu_support == true or iavf_avx512_cc_support == true
+		cflags += ['-DCC_AVX512_SUPPORT']
+		avx512_args = [cflags, '-mavx512f', '-mavx512bw']
+		if cc.has_argument('-march=skylake-avx512')
+			avx512_args += '-march=skylake-avx512'
+		endif
+		iavf_avx512_lib = static_library('iavf_avx512_lib',
+				'iavf_rxtx_vec_avx512.c',
+				dependencies: [static_rte_ethdev,
+					static_rte_kvargs, static_rte_hash],
+				include_directories: includes,
+				c_args: avx512_args)
+		objs += iavf_avx512_lib.extract_objects('iavf_rxtx_vec_avx512.c')
+	endif
 endif