X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra.am;h=185541eafc830fb3f7f2947c951abcaf0d659cb6;hb=9f06d0eccf06b82b42cc55f02c37cbed9e1aab83;hp=25cf14460417676ad2fa05ad8b93e1d94f531b83;hpb=310518e522aff7ab6f4c5799765d39ecf0c7fb4c;p=vpp.git

diff --git a/src/vppinfra.am b/src/vppinfra.am
index 25cf1446041..185541eafc8 100644
--- a/src/vppinfra.am
+++ b/src/vppinfra.am
@@ -24,12 +24,14 @@ TESTS  +=  test_bihash_template \
 	   test_elf \
 	   test_elog \
 	   test_fifo \
+	   test_flowhash_template \
 	   test_format \
 	   test_fpool \
 	   test_hash \
 	   test_heap \
 	   test_longjmp \
 	   test_macros \
+	   test_maplog \
 	   test_md5 \
 	   test_mheap \
 	   test_pool_iterate \
@@ -42,6 +44,7 @@ TESTS  +=  test_bihash_template \
 	   test_time \
 	   test_timing_wheel \
 	   test_tw_timer \
+	   test_valloc \
 	   test_vec \
 	   test_zvec
 endif
@@ -57,12 +60,14 @@ 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
 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
@@ -75,6 +80,7 @@ test_socket_SOURCES = vppinfra/test_socket.c
 test_time_SOURCES = vppinfra/test_time.c
 test_timing_wheel_SOURCES = vppinfra/test_timing_wheel.c
 test_tw_timer_SOURCES = vppinfra/test_tw_timer.c
+test_valloc_SOURCES = vppinfra/test_valloc.c
 test_vec_SOURCES = vppinfra/test_vec.c
 test_zvec_SOURCES = vppinfra/test_zvec.c
 
@@ -88,12 +94,14 @@ 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
 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
@@ -106,6 +114,7 @@ test_socket_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_time_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_timing_wheel_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
 test_tw_timer_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_valloc_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_vec_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_zvec_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 
@@ -117,12 +126,14 @@ 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
 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
@@ -135,6 +146,7 @@ test_socket_LDADD =	libvppinfra.la
 test_time_LDADD =	libvppinfra.la -lm
 test_timing_wheel_LDADD =	libvppinfra.la -lm
 test_tw_timer_LDADD =	libvppinfra.la
+test_valloc_LDADD =	libvppinfra.la
 test_vec_LDADD =	libvppinfra.la
 test_zvec_LDADD =	libvppinfra.la
 
@@ -146,12 +158,14 @@ 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
 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
@@ -164,6 +178,7 @@ test_socket_LDFLAGS = -static
 test_time_LDFLAGS = -static
 test_timing_wheel_LDFLAGS = -static
 test_tw_timer_LDFLAGS = -static
+test_valloc_LDFLAGS = -static
 test_vec_LDFLAGS = -static
 test_zvec_LDFLAGS = -static
 
@@ -200,6 +215,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 \
@@ -209,11 +227,13 @@ nobase_include_HEADERS = \
   vppinfra/lock.h \
   vppinfra/longjmp.h \
   vppinfra/macros.h \
+  vppinfra/maplog.h \
   vppinfra/math.h \
   vppinfra/md5.h \
   vppinfra/mem.h \
   vppinfra/memcpy_sse3.h \
-  vppinfra/memcpy_avx.h \
+  vppinfra/memcpy_avx2.h \
+  vppinfra/memcpy_avx512.h \
   vppinfra/mhash.h \
   vppinfra/mheap.h \
   vppinfra/mheap_bootstrap.h \
@@ -242,14 +262,14 @@ nobase_include_HEADERS = \
   vppinfra/tw_timer_template.c \
   vppinfra/types.h \
   vppinfra/unix.h \
+  vppinfra/valloc.h \
   vppinfra/vec.h \
   vppinfra/vec_bootstrap.h \
   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 \
@@ -268,6 +288,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 \
@@ -301,6 +324,7 @@ CLIB_CORE = \
   vppinfra/tw_timer_1t_3w_1024sl_ov.h \
   vppinfra/tw_timer_1t_3w_1024sl_ov.c \
   vppinfra/unformat.c \
+  vppinfra/valloc.c \
   vppinfra/vec.c \
   vppinfra/vector.c \
   vppinfra/zvec.c
@@ -311,6 +335,7 @@ libvppinfra_la_SOURCES =			\
   vppinfra/elf_clib.c				\
   vppinfra/linux/mem.c				\
   vppinfra/linux/sysfs.c			\
+  vppinfra/maplog.c 				\
   vppinfra/socket.c				\
   vppinfra/timer.c				\
   vppinfra/unix-formats.c			\