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

diff --git a/drivers/net/iavf/meson.build b/drivers/net/iavf/meson.build
index bc22ad1799..a3fad363db 100644
--- a/drivers/net/iavf/meson.build
+++ b/drivers/net/iavf/meson.build
@@ -3,18 +3,35 @@
 
 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 dpdk_conf.has('RTE_MACHINE_CPUFLAG_AVX2')
+		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
 endif