From 24928a23623ecae664b42cc62ff06be2fd21c9b8 Mon Sep 17 00:00:00 2001
From: Tyge Løvset <60263450+tylov@users.noreply.github.com>
Date: Sun, 16 Aug 2020 16:51:00 +0200
Subject: Update benchmark.c

---
 examples/benchmark.c | 31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

(limited to 'examples')

diff --git a/examples/benchmark.c b/examples/benchmark.c
index c7a6afd8..858b53ee 100644
--- a/examples/benchmark.c
+++ b/examples/benchmark.c
@@ -133,6 +133,11 @@ int rr = RR;
     M##_CLEAR(); \
 }
 
+#ifndef __cplusplus
+#define RUN_TEST(n) MAP_TEST##n(CMAP) MAP_TEST##n(KMAP)
+#else
+#define RUN_TEST(n) MAP_TEST##n(CMAP) MAP_TEST##n(KMAP) MAP_TEST##n(UMAP) MAP_TEST##n(BMAP) MAP_TEST##n(FMAP) MAP_TEST##n(RMAP)
+#endif
 
 int main(int argc, char* argv[])
 {
@@ -140,32 +145,12 @@ int main(int argc, char* argv[])
     seed = time(NULL);
     printf("\nRandom keys are in range [0, 2^%d), seed = %zu:\n",  rr, seed);
     printf("\nUnordered maps: %zu repeats of Insert random key + try to remove a random key:\n", N1);
-    MAP_TEST1(CMAP)
-    MAP_TEST1(KMAP)
-#ifdef __cplusplus
-    MAP_TEST1(UMAP)
-    MAP_TEST1(BMAP)
-    MAP_TEST1(FMAP)
-    MAP_TEST1(RMAP)
-#endif
+    RUN_TEST(1)
 
     printf("\nUnordered maps: Insert %zu index keys, then remove them in same order:\n", N2);
-    MAP_TEST2(CMAP)
-    MAP_TEST2(KMAP)
-#ifdef __cplusplus
-    MAP_TEST2(UMAP)
-    MAP_TEST2(BMAP)
-    MAP_TEST2(FMAP)
-    MAP_TEST2(RMAP)
-#endif
+    RUN_TEST(2)
 
     printf("\nUnordered maps: Insert %zu random keys, then remove them in same order:\n", N3);
-    MAP_TEST3(CMAP)
-    MAP_TEST3(KMAP)
-#ifdef __cplusplus
-    MAP_TEST3(UMAP)
-    MAP_TEST3(BMAP)
-    MAP_TEST3(FMAP)
-    MAP_TEST3(RMAP)
+    RUN_TEST(3)
 #endif
 }
-- 
cgit v1.2.3