X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra.am;h=85695db604527daa2623527c6197f83c4c418d18;hb=1fcbd728095b4fbb3e1b4a757f3bc3f19ba879c7;hp=bf21ea8914474e736b19758e971e0ab6269e7086;hpb=8d6ef60b767fc0348b91b3abbf1aff2b84167c2b;p=vpp.git

diff --git a/src/vppinfra.am b/src/vppinfra.am
index bf21ea89144..85695db6045 100644
--- a/src/vppinfra.am
+++ b/src/vppinfra.am
@@ -24,6 +24,7 @@ TESTS  +=  test_bihash_template \
 	   test_elf \
 	   test_elog \
 	   test_fifo \
+	   test_flowhash_template \
 	   test_format \
 	   test_fpool \
 	   test_hash \
@@ -31,7 +32,6 @@ TESTS  +=  test_bihash_template \
 	   test_longjmp \
 	   test_macros \
 	   test_maplog \
-	   test_md5 \
 	   test_mheap \
 	   test_pool_iterate \
 	   test_ptclosure \
@@ -59,6 +59,7 @@ test_dlist_SOURCES = vppinfra/test_dlist.c
 test_elf_SOURCES = vppinfra/test_elf.c
 test_elog_SOURCES = vppinfra/test_elog.c
 test_fifo_SOURCES = vppinfra/test_fifo.c
+test_flowhash_template_SOURCES = vppinfra/test_flowhash_template.c
 test_format_SOURCES = vppinfra/test_format.c
 test_fpool_SOURCES = vppinfra/test_fpool.c
 test_hash_SOURCES = vppinfra/test_hash.c
@@ -66,7 +67,6 @@ test_heap_SOURCES = vppinfra/test_heap.c
 test_longjmp_SOURCES = vppinfra/test_longjmp.c
 test_macros_SOURCES = vppinfra/test_macros.c
 test_maplog_SOURCES = vppinfra/test_maplog.c
-test_md5_SOURCES = vppinfra/test_md5.c
 test_mheap_SOURCES = vppinfra/test_mheap.c
 test_pool_iterate_SOURCES = vppinfra/test_pool_iterate.c
 test_ptclosure_SOURCES = vppinfra/test_ptclosure.c
@@ -92,6 +92,7 @@ test_dlist_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_elf_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_elog_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_fifo_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_flowhash_template_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
 test_format_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_fpool_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_hash_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
@@ -99,7 +100,6 @@ test_heap_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_longjmp_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_macros_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_maplog_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_md5_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_mheap_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_pool_iterate_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_ptclosure_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
@@ -123,6 +123,7 @@ test_dlist_LDADD =	libvppinfra.la
 test_elf_LDADD =	libvppinfra.la
 test_elog_LDADD =	libvppinfra.la
 test_fifo_LDADD =	libvppinfra.la
+test_flowhash_template_LDADD =  libvppinfra.la
 test_format_LDADD =	libvppinfra.la
 test_fpool_LDADD =	libvppinfra.la
 test_hash_LDADD =	libvppinfra.la
@@ -130,7 +131,6 @@ test_heap_LDADD =	libvppinfra.la
 test_longjmp_LDADD =	libvppinfra.la
 test_macros_LDADD =	libvppinfra.la
 test_maplog_LDADD =	libvppinfra.la
-test_md5_LDADD =	libvppinfra.la
 test_mheap_LDADD =	libvppinfra.la
 test_pool_iterate_LDADD =	libvppinfra.la
 test_ptclosure_LDADD =	libvppinfra.la
@@ -154,6 +154,7 @@ test_dlist_LDFLAGS = -static
 test_elf_LDFLAGS = -static
 test_elog_LDFLAGS = -static
 test_fifo_LDFLAGS = -static
+test_flowhash_template_LDFLAGS = -static
 test_format_LDFLAGS = -static
 test_fpool_LDFLAGS = -static
 test_hash_LDFLAGS = -static
@@ -161,7 +162,6 @@ test_heap_LDFLAGS = -static
 test_longjmp_LDFLAGS = -static
 test_macros_LDFLAGS = -static
 test_maplog_LDFLAGS = -static
-test_md5_LDFLAGS = -static
 test_mheap_LDFLAGS = -static
 test_pool_iterate_LDFLAGS = -static
 test_ptclosure_LDFLAGS = -static
@@ -210,6 +210,9 @@ nobase_include_HEADERS = \
   vppinfra/error_bootstrap.h \
   vppinfra/fifo.h \
   vppinfra/file.h \
+  vppinfra/flowhash_template.h \
+  vppinfra/flowhash_8_8.h \
+  vppinfra/flowhash_24_16.h \
   vppinfra/format.h \
   vppinfra/graph.h \
   vppinfra/hash.h \
@@ -221,7 +224,6 @@ nobase_include_HEADERS = \
   vppinfra/macros.h \
   vppinfra/maplog.h \
   vppinfra/math.h \
-  vppinfra/md5.h \
   vppinfra/mem.h \
   vppinfra/memcpy_sse3.h \
   vppinfra/memcpy_avx2.h \
@@ -260,9 +262,8 @@ nobase_include_HEADERS = \
   vppinfra/vector.h \
   vppinfra/vector_altivec.h \
   vppinfra/vector_funcs.h \
-  vppinfra/vector_iwmmxt.h \
   vppinfra/vector_neon.h \
-  vppinfra/vector_sse2.h \
+  vppinfra/vector_sse42.h \
   vppinfra/valgrind.h \
   vppinfra/xxhash.h \
   vppinfra/xy.h \
@@ -281,6 +282,9 @@ CLIB_CORE = \
   vppinfra/error.c \
   vppinfra/fifo.c \
   vppinfra/fheap.c \
+  vppinfra/flowhash_8_8.h \
+  vppinfra/flowhash_24_16.h \
+  vppinfra/flowhash_template.h \
   vppinfra/format.c \
   vppinfra/pool.c \
   vppinfra/graph.c \
@@ -290,7 +294,6 @@ CLIB_CORE = \
   vppinfra/macros.c \
   vppinfra/mhash.c \
   vppinfra/mheap.c \
-  vppinfra/md5.c \
   vppinfra/mem_mheap.c \
   vppinfra/ptclosure.c \
   vppinfra/random.c \