X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk.am;h=01655667290b0d821308d02d0ee322a16a8bc3e6;hb=3b23e9d5af4f02836b689286824c9217fa2aa19a;hp=3a1ffeeb4a2b651b6da7710a8fc3c3111c55fa7c;hpb=3b12cdc59c8ec98b580b356f20b68e3554f91e97;p=vpp.git

diff --git a/src/plugins/dpdk.am b/src/plugins/dpdk.am
index 3a1ffeeb4a2..01655667290 100644
--- a/src/plugins/dpdk.am
+++ b/src/plugins/dpdk.am
@@ -19,19 +19,23 @@ dpdk_plugin_la_LDFLAGS = $(AM_LDFLAGS) -ldpdk
 else
 dpdk_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,--whole-archive,-l:libdpdk.a,--no-whole-archive
 endif
-if WITH_DPDK_AESNI_MB_PMD
+if WITH_AESNI_MB_LIB
 dpdk_plugin_la_LDFLAGS += -Wl,--exclude-libs,libIPSec_MB.a,-l:libIPSec_MB.a
 endif
-if WITH_DPDK_AESNI_GCM_PMD
+if WITH_ISA_L_CRYPTO_LIB
 dpdk_plugin_la_LDFLAGS += -Wl,--exclude-libs,libisal_crypto.a,-l:libisal_crypto.a
 endif
-dpdk_plugin_la_LDFLAGS += -Wl,-lm,-ldl
-if WITH_DPDK_MLX5_PMD
-dpdk_plugin_la_LDFLAGS += -Wl,-libverbs
+dpdk_plugin_la_CFLAGS = $(AM_CFLAGS)
+if WITH_LIBNUMA
+dpdk_plugin_la_LDFLAGS += -Wl,-lnuma
 endif
-if WITH_DPDK_MLX4_PMD
-dpdk_plugin_la_LDFLAGS += -Wl,-libverbs
+
+if WITH_DPDK_MLX5_PMD
+dpdk_plugin_la_LDFLAGS += -Wl,-lm,-ldl,-lmnl
+else
+dpdk_plugin_la_LDFLAGS += -Wl,-lm,-ldl
 endif
+dpdk_plugin_la_LIBADD =
 
 dpdk_plugin_la_SOURCES =					\
   dpdk/main.c							\
@@ -40,6 +44,7 @@ dpdk_plugin_la_SOURCES =					\
   dpdk/api/dpdk_api.c						\
   dpdk/device/cli.c						\
   dpdk/device/common.c						\
+  dpdk/device/flow.c						\
   dpdk/device/dpdk_priv.h					\
   dpdk/device/device.c						\
   dpdk/device/format.c						\
@@ -55,13 +60,41 @@ dpdk_plugin_la_SOURCES =					\
 
 API_FILES += dpdk/api/dpdk.api
 
+if CPU_X86_64
+dpdk_multiversioning_sources = 					\
+	dpdk/buffer.c						\
+	dpdk/device/node.c					\
+	dpdk/device/device.c
+
+if CC_SUPPORTS_AVX2
+###############################################################
+# AVX2
+###############################################################
+libdpdk_plugin_avx2_la_SOURCES = $(dpdk_multiversioning_sources)
+libdpdk_plugin_avx2_la_CFLAGS =					\
+	$(AM_CFLAGS)  @CPU_AVX2_FLAGS@				\
+	-DCLIB_MARCH_VARIANT=avx2
+noinst_LTLIBRARIES += libdpdk_plugin_avx2.la
+dpdk_plugin_la_LIBADD += libdpdk_plugin_avx2.la
+endif
+
+if CC_SUPPORTS_AVX512
+###############################################################
+# AVX512
+###############################################################
+libdpdk_plugin_avx512_la_SOURCES = $(dpdk_multiversioning_sources)
+libdpdk_plugin_avx512_la_CFLAGS =				\
+	$(AM_CFLAGS) @CPU_AVX512_FLAGS@				\
+	-DCLIB_MARCH_VARIANT=avx512
+noinst_LTLIBRARIES += libdpdk_plugin_avx512.la
+dpdk_plugin_la_LIBADD += libdpdk_plugin_avx512.la
+endif
+endif
+
 nobase_include_HEADERS +=					\
   dpdk/device/dpdk.h						\
-  dpdk/api/dpdk_all_api_h.h
-
-nobase_include_HEADERS +=			\
- dpdk/ipsec/ipsec.h		\
- dpdk/ipsec/esp.h
+  dpdk/api/dpdk_all_api_h.h					\
+  dpdk/ipsec/ipsec.h
 
 dpdk_test_plugin_la_SOURCES = 					\
   dpdk/api/dpdk_test.c dpdk/api/dpdk_plugin.api.h