X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra.am;h=cb8748ca9c9e86dd9a2e1ec9475ca3e984238a44;hb=54c6dc450031443663d40b836a8b0bffdcc2bdea;hp=a5769a0de08360f3112fb60fa18e21425f67e128;hpb=56dd5438b04b869065d8e901c315496bb6777455;p=vpp.git

diff --git a/src/vppinfra.am b/src/vppinfra.am
index a5769a0de08..cb8748ca9c9 100644
--- a/src/vppinfra.am
+++ b/src/vppinfra.am
@@ -13,10 +13,13 @@
 
 lib_LTLIBRARIES += libvppinfra.la
 
-TESTS =
+TESTS = 
 
 if ENABLE_TESTS
 TESTS  +=  test_bihash_template \
+           test_bihash_vec88 \
+	   test_cuckoo_bihash \
+	   test_cuckoo_template\
 	   test_dlist \
 	   test_elf \
 	   test_elog \
@@ -27,6 +30,7 @@ TESTS  +=  test_bihash_template \
 	   test_heap \
 	   test_longjmp \
 	   test_macros \
+	   test_maplog \
 	   test_md5 \
 	   test_mheap \
 	   test_pool_iterate \
@@ -47,6 +51,9 @@ noinst_PROGRAMS = $(TESTS)
 check_PROGRAMS	= $(TESTS)
 
 test_bihash_template_SOURCES = vppinfra/test_bihash_template.c
+test_bihash_vec88_SOURCES = vppinfra/test_bihash_vec88.c
+test_cuckoo_template_SOURCES = vppinfra/test_cuckoo_template.c
+test_cuckoo_bihash_SOURCES = vppinfra/test_cuckoo_bihash.c
 test_dlist_SOURCES = vppinfra/test_dlist.c
 test_elf_SOURCES = vppinfra/test_elf.c
 test_elog_SOURCES = vppinfra/test_elog.c
@@ -57,6 +64,7 @@ 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 +83,9 @@ test_zvec_SOURCES = vppinfra/test_zvec.c
 # All unit tests use ASSERT for failure
 # So we'll need -DDEBUG to enable ASSERTs
 test_bihash_template_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_bihash_vec88_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_cuckoo_template_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_cuckoo_bihash_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_dlist_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_elf_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_elog_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
@@ -85,6 +96,7 @@ 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
@@ -101,6 +113,9 @@ test_vec_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_zvec_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 
 test_bihash_template_LDADD =	libvppinfra.la
+test_bihash_vec88_LDADD =	libvppinfra.la
+test_cuckoo_template_LDADD =	libvppinfra.la
+test_cuckoo_bihash_LDADD =	libvppinfra.la
 test_dlist_LDADD =	libvppinfra.la
 test_elf_LDADD =	libvppinfra.la
 test_elog_LDADD =	libvppinfra.la
@@ -111,6 +126,7 @@ 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
@@ -127,6 +143,9 @@ test_vec_LDADD =	libvppinfra.la
 test_zvec_LDADD =	libvppinfra.la
 
 test_bihash_template_LDFLAGS = -static
+test_bihash_vec88_LDFLAGS = -static
+test_cuckoo_template_LDFLAGS = -static
+test_cuckoo_bihash_LDFLAGS = -static -lpthread
 test_dlist_LDFLAGS = -static
 test_elf_LDFLAGS = -static
 test_elog_LDFLAGS = -static
@@ -137,6 +156,7 @@ 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
@@ -162,6 +182,7 @@ nobase_include_HEADERS = \
   vppinfra/asm_mips.h \
   vppinfra/asm_x86.h \
   vppinfra/bihash_8_8.h \
+  vppinfra/bihash_vec8_8.h \
   vppinfra/bihash_16_8.h \
   vppinfra/bihash_24_8.h \
   vppinfra/bihash_48_8.h \
@@ -188,14 +209,18 @@ nobase_include_HEADERS = \
   vppinfra/graph.h \
   vppinfra/hash.h \
   vppinfra/heap.h \
+  vppinfra/linux/sysfs.h \
+  vppinfra/linux/syscall.h \
   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 \
@@ -233,7 +258,6 @@ nobase_include_HEADERS = \
   vppinfra/vector_neon.h \
   vppinfra/vector_sse2.h \
   vppinfra/valgrind.h \
-  vppinfra/vm_unix.h \
   vppinfra/xxhash.h \
   vppinfra/xy.h \
   vppinfra/zvec.h
@@ -242,6 +266,7 @@ CLIB_CORE = \
   vppinfra/asm_x86.c \
   vppinfra/backtrace.c \
   vppinfra/bihash_8_8.h \
+  vppinfra/bihash_vec8_8.h \
   vppinfra/bihash_24_8.h \
   vppinfra/bihash_template.h \
   vppinfra/cpu.c \
@@ -291,6 +316,9 @@ CLIB_CORE = \
 libvppinfra_la_SOURCES =			\
   $(CLIB_CORE)					\
   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			\