Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git

[libucw.git] / lib / sorter / sort-test.c

diff --git a/lib/sorter/sort-test.c b/lib/sorter/sort-test.c
index f103710070e9115e4b1544323b5b24ec2e725969..e7d5873020d2bb527e2ac0efb312bbe5ff0b8e4f 100644 (file)
--- a/lib/sorter/sort-test.c
+++ b/lib/sorter/sort-test.c
@@ -21,9 +21,17 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+/*** A hack for overriding radix-sorter configuration ***/
+
+#ifdef FORCE_RADIX_BITS
+#undef CONFIG_UCW_RADIX_SORTER_BITS
+#define CONFIG_UCW_RADIX_SORTER_BITS FORCE_RADIX_BITS
+#endif
+
 /*** Time measurement ***/
 
 static timestamp_t timer;
+static uns test_id;
 
 static void
 start(void)
@@ -36,7 +44,7 @@ static void
 stop(void)
 {
   sync();
-  log(L_INFO, "Test took %.3fs", get_timer(&timer) / 1000.);
+  msg(L_INFO, "Test %d took %.3fs", test_id, get_timer(&timer) / 1000.);
 }
 
 /*** Simple 4-byte integer keys ***/
@@ -60,7 +68,7 @@ test_int(int mode, u64 size)
 {
   uns N = size ? nextprime(MIN(size/4, 0xffff0000)) : 0;
   uns K = N/4*3;
-  log(L_INFO, ">>> Integers (%s, N=%u)", ((char *[]) { "increasing", "decreasing", "random" })[mode], N);
+  msg(L_INFO, ">>> Integers (%s, N=%u)", ((char *[]) { "increasing", "decreasing", "random" })[mode], N);
 
   struct fastbuf *f = bopen_tmp(65536);
   for (uns i=0; i<N; i++)
@@ -113,7 +121,7 @@ test_counted(int mode, u64 size)
     mult++;
   uns N = items ? nextprime(items/(2*mult)) : 0;
   uns K = N/4*3;
-  log(L_INFO, ">>> Counted integers (%s, N=%u, mult=%u)", ((char *[]) { "increasing", "decreasing", "random" })[mode], N, mult);
+  msg(L_INFO, ">>> Counted integers (%s, N=%u, mult=%u)", ((char *[]) { "increasing", "decreasing", "random" })[mode], N, mult);
 
   struct fastbuf *f = bopen_tmp(65536);
   for (uns m=0; m<mult; m++)
@@ -137,7 +145,7 @@ test_counted(int mode, u64 size)
        die("Discrepancy: %u instead of %u", j, i);
       uns k = bgetl(f);
       if (k != 2*mult)
-       die("Discrepancy: %u has count %u instead of %u", j, k, mult);
+       die("Discrepancy: %u has count %u instead of %u", j, k, 2*mult);
     }
   bclose(f);
 }
@@ -152,9 +160,10 @@ struct key3 {
 
 static inline int s3_compare(struct key3 *x, struct key3 *y)
 {
-  /* FIXME: Maybe unroll manually? */
-  for (uns i=0; i<4; i++)
-    COMPARE(x->hash[i], y->hash[i]);
+  COMPARE(x->hash[0], y->hash[0]);
+  COMPARE(x->hash[1], y->hash[1]);
+  COMPARE(x->hash[2], y->hash[2]);
+  COMPARE(x->hash[3], y->hash[3]);
   return 0;
 }
 
@@ -205,7 +214,7 @@ static void
 test_hashes(int mode, u64 size)
 {
   uns N = MIN(size / sizeof(struct key3), 0xffffffff);
-  log(L_INFO, ">>> Hashes (%s, N=%u)", ((char *[]) { "increasing", "decreasing", "random" })[mode], N);
+  msg(L_INFO, ">>> Hashes (%s, N=%u)", ((char *[]) { "increasing", "decreasing", "random" })[mode], N);
   struct key3 k, lastk;
 
   struct fastbuf *f = bopen_tmp(65536);
@@ -323,7 +332,7 @@ test_strings(uns mode, u64 size)
 {
   uns avg_item_size = KEY4_MAX/2 + 4 + (mode ? 128 : 0);
   uns N = MIN(size / avg_item_size, 0xffffffff);
-  log(L_INFO, ">>> Strings %s(N=%u)", (mode ? "with data " : ""), N);
+  msg(L_INFO, ">>> Strings %s(N=%u)", (mode ? "with data " : ""), N);
   srand(1);
 
   struct key4 k, lastk;
@@ -388,7 +397,7 @@ static int s5_gen(struct s5_pair *p)
 {
   if (s5_j >= s5_N)
     {
-      if (s5_i >= s5_N-1)
+      if (!s5_N || s5_i >= s5_N-1)
        return 0;
       s5_j = 0;
       s5_i++;
@@ -417,7 +426,7 @@ static void s5_write_merged(struct fastbuf *f, struct key5 **keys, void **data,
   s5m_sort(m, a);
   keys[0]->cnt = m;
   bwrite(f, keys[0], sizeof(struct key5));
-  bwrite(f, a, 4*m);                   /* FIXME: Might overflow here */
+  bwrite(f, a, 4*m);
 }
 
 static void s5_copy_merged(struct key5 **keys, struct fastbuf **data, uns n, struct fastbuf *dest)
@@ -452,13 +461,10 @@ static inline int s5p_lt(struct s5_pair x, struct s5_pair y)
   return 0;
 }
 
-/* FIXME: Use smarter internal sorter when it's available */
 #define ASORT_PREFIX(x) s5p_##x
 #define ASORT_KEY_TYPE struct s5_pair
-#define ASORT_ELT(i) ary[i]
 #define ASORT_LT(x,y) s5p_lt(x,y)
-#define ASORT_EXTRA_ARGS , struct s5_pair *ary
-#include "lib/arraysort.h"
+#include "lib/sorter/array.h"
 
 static int s5_presort(struct fastbuf *dest, void *buf, size_t bufsize)
 {
@@ -469,7 +475,7 @@ static int s5_presort(struct fastbuf *dest, void *buf, size_t bufsize)
     n++;
   if (!n)
     return 0;
-  s5p_sort(n, a);
+  s5p_sort(a, n);
   uns i = 0;
   while (i < n)
     {
@@ -514,7 +520,9 @@ test_graph(uns mode, u64 size)
   uns N = 3;
   while ((u64)N*(N+2)*4 < size)
     N = nextprime(N);
-  log(L_INFO, ">>> Graph%s (N=%u)", (mode ? "" : " with custom presorting"), N);
+  if (!size)
+    N = 0;
+  msg(L_INFO, ">>> Graph%s (N=%u)", (mode ? "" : " with custom presorting"), N);
   s5_N = N;
   s5_K = N/4*3;
   s5_L = N/3*2;
@@ -580,7 +588,7 @@ test_int64(int mode, u64 size)
 {
   u64 N = size ? nextprime(MIN(size/8, 0xffff0000)) : 0;
   u64 K = N/4*3;
-  log(L_INFO, ">>> 64-bit integers (%s, N=%llu)", ((char *[]) { "increasing", "decreasing", "random" })[mode], (long long)N);
+  msg(L_INFO, ">>> 64-bit integers (%s, N=%llu)", ((char *[]) { "increasing", "decreasing", "random" })[mode], (long long)N);
 
   struct fastbuf *f = bopen_tmp(65536);
   for (u64 i=0; i<N; i++)
@@ -606,6 +614,7 @@ test_int64(int mode, u64 size)
 static void
 run_test(uns i, u64 size)
 {
+  test_id = i;
   switch (i)
     {
     case 0:
@@ -663,9 +672,20 @@ main(int argc, char **argv)
          goto usage;
        break;
       case 't':
-       t = atol(optarg);
-       if (t >= TMAX)
-         goto usage;
+         {
+           char *w[32];
+           int f = sepsplit(optarg, ',', w, ARRAY_SIZE(w));
+           if (f < 0)
+             goto usage;
+           t = 0;
+           for (int i=0; i<f; i++)
+             {
+               int j = atol(w[i]);
+               if (j >= TMAX)
+                 goto usage;
+               t |= 1 << j;
+             }
+         }
        break;
       case 'v':
        sorter_trace++;
@@ -678,10 +698,8 @@ main(int argc, char **argv)
   if (optind != argc)
     goto usage;
 
-  if (t != ~0U)
-    run_test(t, size);
-  else
-    for (uns i=0; i<TMAX; i++)
+  for (uns i=0; i<TMAX; i++)
+    if (t & (1 << i))
       run_test(i, size);
 
   return 0;