[PATCH v1 05/23] benchtests: Use json-lib in bench-strpbrk.c

[Noah Goldstein <goldstein.w.n@gmail.com>]

Just QOL change to make parsing the output of the benchtests more
consistent.
---
 benchtests/bench-strpbrk.c | 81 ++++++++++++++++++++++++++++----------
 1 file changed, 61 insertions(+), 20 deletions(-)

diff --git a/benchtests/bench-strpbrk.c b/benchtests/bench-strpbrk.c
index d46bf9c0e2..a7522a76e6 100644
--- a/benchtests/bench-strpbrk.c
+++ b/benchtests/bench-strpbrk.c
@@ -62,11 +62,14 @@ SIMPLE_STRPBRK (const CHAR *s, const CHAR *rej)
 
 #endif /* !STRPBRK_RESULT */
 
+#include "json-lib.h"
+
 static void
-do_one_test (impl_t *impl, const CHAR *s, const CHAR *rej, RES_TYPE exp_res)
+do_one_test (json_ctx_t *json_ctx, impl_t *impl, const CHAR *s,
+             const CHAR *rej, RES_TYPE exp_res)
 {
   RES_TYPE res = CALL (impl, s, rej);
-  size_t i, iters = INNER_LOOP_ITERS_MEDIUM;
+  size_t i, iters = INNER_LOOP_ITERS;
   timing_t start, stop, cur;
 
   if (res != exp_res)
@@ -86,23 +89,26 @@ do_one_test (impl_t *impl, const CHAR *s, const CHAR *rej, RES_TYPE exp_res)
 
   TIMING_DIFF (cur, start, stop);
 
-  TIMING_PRINT_MEAN ((double) cur, (double) iters);
+  json_element_double (json_ctx, (double)cur / (double)iters);
 }
 
 static void
-do_test (size_t align, size_t pos, size_t len)
+do_test (json_ctx_t *json_ctx, size_t align1, size_t align2, size_t pos,
+         size_t len)
 {
   size_t i;
   int c;
   RES_TYPE result;
   CHAR *rej, *s;
 
-  align &= 7;
-  if ((align + pos + 10) * sizeof (CHAR) >= page_size || len > 240)
+  align1 &= 7;
+  if ((align1 + pos + 10) * sizeof (CHAR) >= page_size || len > 240)
+    return;
+  if ((align2 + len) * sizeof (CHAR) >= page_size)
     return;
 
-  rej = (CHAR *) (buf2) + (random () & 255);
-  s = (CHAR *) (buf1) + align;
+  rej = (CHAR *) (buf2) + align2;
+  s = (CHAR *) (buf1) + align1;
 
   for (i = 0; i < len; ++i)
     {
@@ -136,43 +142,78 @@ do_test (size_t align, size_t pos, size_t len)
     }
   result = STRPBRK_RESULT (s, pos);
 
-  printf ("Length %4zd, alignment %2zd, rej len %2zd:", pos, align, len);
+  json_element_object_begin (json_ctx);
+  json_attr_uint (json_ctx, "len", len);
+  json_attr_uint (json_ctx, "pos", pos);
+  json_attr_uint (json_ctx, "align1", align1);
+  json_attr_uint (json_ctx, "align2", align2);
+  json_array_begin (json_ctx, "timings");
 
   FOR_EACH_IMPL (impl, 0)
-    do_one_test (impl, s, rej, result);
+    do_one_test (json_ctx, impl, s, rej, result);
 
-  putchar ('\n');
+  json_array_end (json_ctx);
+  json_element_object_end (json_ctx);
 }
 
 int
 test_main (void)
 {
+  json_ctx_t json_ctx;
   size_t i;
 
   test_init ();
 
-  printf ("%32s", "");
+  json_init (&json_ctx, 0, stdout);
+
+  json_document_begin (&json_ctx);
+  json_attr_string (&json_ctx, "timing_type", TIMING_TYPE);
+
+  json_attr_object_begin (&json_ctx, "functions");
+  json_attr_object_begin (&json_ctx, TEST_NAME);
+  json_attr_string (&json_ctx, "bench-variant", "");
+
+  json_array_begin (&json_ctx, "ifuncs");
   FOR_EACH_IMPL (impl, 0)
-    printf ("\t%s", impl->name);
-  putchar ('\n');
+    json_element_string (&json_ctx, impl->name);
+  json_array_end (&json_ctx);
+
+  json_array_begin (&json_ctx, "results");
+
 
   for (i = 0; i < 32; ++i)
     {
-      do_test (0, 512, i);
-      do_test (i, 512, i);
+      do_test (&json_ctx, 0, 0, 512, i);
+      do_test (&json_ctx, i, 0, 512, i);
+      do_test (&json_ctx, 0, i, 512, i);
+      do_test (&json_ctx, i, i, 512, i);
+
     }
 
   for (i = 1; i < 8; ++i)
     {
-      do_test (0, 16 << i, 4);
-      do_test (i, 16 << i, 4);
+      do_test (&json_ctx, 0, 0, 16 << i, 4);
+      do_test (&json_ctx, i, 0, 16 << i, 4);
+      do_test (&json_ctx, 0, i, 16 << i, 4);
+      do_test (&json_ctx, i, i, 16 << i, 4);
     }
 
   for (i = 1; i < 8; ++i)
-    do_test (i, 64, 10);
+  {
+    do_test (&json_ctx, i, 0, 64, 10);
+    do_test (&json_ctx, i, i, 64, 10);
+  }
 
   for (i = 0; i < 64; ++i)
-    do_test (0, i, 6);
+  {
+    do_test (&json_ctx, 0, 0, i, 6);
+    do_test (&json_ctx, 0, i, i, 6);
+  }
+
+  json_array_end (&json_ctx);
+  json_attr_object_end (&json_ctx);
+  json_attr_object_end (&json_ctx);
+  json_document_end (&json_ctx);
 
   return ret;
 }
-- 
2.25.1