X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Ftest_bihash_template.c;h=86039d8408a6383688e69500124ec09c42bcc251;hb=b5c0d35f;hp=e52f2740b3bceccbc2a3d3a4b81baefde562ff6f;hpb=828d27ea0edb97280a0164041a286973fa74b5a2;p=vpp.git

diff --git a/src/vppinfra/test_bihash_template.c b/src/vppinfra/test_bihash_template.c
index e52f2740b3b..86039d8408a 100644
--- a/src/vppinfra/test_bihash_template.c
+++ b/src/vppinfra/test_bihash_template.c
@@ -72,7 +72,13 @@ test_bihash_vec64 (test_main_t * tm)
 
   h = &tm->hash;
 
+#if BIHASH_32_64_SVM
+  BV (clib_bihash_master_init_svm) (h, "test", user_buckets,
+				    0x30000000 /* base_addr */ ,
+				    user_memory_size);
+#else
   BV (clib_bihash_init) (h, "test", user_buckets, user_memory_size);
+#endif
 
   before = clib_time_now (&tm->clib_time);
 
@@ -116,7 +122,13 @@ test_bihash_stale_overwrite (test_main_t * tm)
 
   h = &tm->hash;
 
+#if BIHASH_32_64_SVM
+  BV (clib_bihash_master_init_svm) (h, "test", tm->nbuckets,
+				    0x30000000 /* base_addr */ ,
+				    tm->hash_memory_size);
+#else
   BV (clib_bihash_init) (h, "test", tm->nbuckets, tm->hash_memory_size);
+#endif
 
   fformat (stdout, "Add %d items to %d buckets\n", tm->nitems, tm->nbuckets);
 
@@ -195,7 +207,13 @@ test_bihash_threads (test_main_t * tm)
 
   h = &tm->hash;
 
+#if BIHASH_32_64_SVM
+  BV (clib_bihash_master_init_svm) (h, "test", tm->nbuckets,
+				    0x30000000 /* base_addr */ ,
+				    tm->hash_memory_size);
+#else
   BV (clib_bihash_init) (h, "test", tm->nbuckets, tm->hash_memory_size);
+#endif
 
   tm->thread_barrier = 1;
 
@@ -243,7 +261,13 @@ test_bihash (test_main_t * tm)
 
   h = &tm->hash;
 
+#if BIHASH_32_64_SVM
+  BV (clib_bihash_master_init_svm) (h, "test", tm->nbuckets,
+				    0x30000000 /* base_addr */ ,
+				    tm->hash_memory_size);
+#else
   BV (clib_bihash_init) (h, "test", tm->nbuckets, tm->hash_memory_size);
+#endif
 
   for (acycle = 0; acycle < tm->ncycles; acycle++)
     {
@@ -313,6 +337,16 @@ test_bihash (test_main_t * tm)
 	{
 	  for (i = 0; i < tm->nitems; i++)
 	    {
+	      /* Prefetch buckets 8 iterations ahead */
+	      if (1 && (i < (tm->nitems - 8)))
+		{
+		  BVT (clib_bihash_kv) pref_kv;
+		  u64 pref_hash;
+		  pref_kv.key = tm->keys[i + 8];
+		  pref_hash = BV (clib_bihash_hash) (&pref_kv);
+		  BV (clib_bihash_prefetch_bucket) (h, pref_hash);
+		}
+
 	      kv.key = tm->keys[i];
 	      if (BV (clib_bihash_search) (h, &kv, &kv) < 0)
 		if (BV (clib_bihash_search) (h, &kv, &kv) < 0)
@@ -332,8 +366,10 @@ test_bihash (test_main_t * tm)
 	  total_searches = (uword) tm->search_iter * (uword) tm->nitems;
 
 	  if (delta > 0)
-	    fformat (stdout, "%.f searches per second\n",
-		     ((f64) total_searches) / delta);
+	    fformat (stdout,
+		     "%.f searches per second, %.2f nsec per search\n",
+		     ((f64) total_searches) / delta,
+		     1e9 * (delta / ((f64) total_searches)));
 
 	  fformat (stdout, "%lld searches in %.6f seconds\n", total_searches,
 		   delta);
@@ -385,6 +421,16 @@ test_bihash (test_main_t * tm)
 	    {
 	      for (j = 0; j < tm->nitems; j++)
 		{
+		  /* Prefetch buckets 8 iterations ahead */
+		  if (1 && (j < (tm->nitems - 8)))
+		    {
+		      BVT (clib_bihash_kv) pref_kv;
+		      u64 pref_hash;
+		      pref_kv.key = tm->keys[j + 8];
+		      pref_hash = BV (clib_bihash_hash) (&pref_kv);
+		      BV (clib_bihash_prefetch_bucket) (h, pref_hash);
+		    }
+
 		  kv.key = tm->keys[j];
 		  rv = BV (clib_bihash_search) (h, &kv, &kv);
 		  if (j <= i && rv >= 0)
@@ -420,6 +466,9 @@ test_bihash (test_main_t * tm)
   fformat (stdout, "End of run, should be empty...\n");
 
   fformat (stdout, "%U", BV (format_bihash), h, 0 /* very verbose */ );
+
+  BV (clib_bihash_free) (h);
+
   return 0;
 }
 
@@ -431,7 +480,7 @@ test_bihash_main (test_main_t * tm)
   int which = 0;
 
   tm->report_every_n = 1;
-  tm->hash_memory_size = 4095ULL << 20;
+  tm->hash_memory_size = 1ULL << 30;
 
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
     {