diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:33:27 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:33:27 +0000 |
commit | 064374be911f72dfaec8a75f06da1f9fc1827712 (patch) | |
tree | ad96fd1f1b9b57a50005db7803f6b79e748bb820 /benchtests/bench-strcmp.c | |
parent | 4dc1e6e42f1f602e1d2227e112f2db8dce9da763 (diff) | |
parent | 7c7d34a16f08f84427b3f617313d9633423ad5eb (diff) |
Merge commit 'refs/top-bases/t/hurdsig-global-dispositions' into t/hurdsig-global-dispositions
Diffstat (limited to 'benchtests/bench-strcmp.c')
-rw-r--r-- | benchtests/bench-strcmp.c | 82 |
1 files changed, 53 insertions, 29 deletions
diff --git a/benchtests/bench-strcmp.c b/benchtests/bench-strcmp.c index f2d83c08b5..325cfc5a48 100644 --- a/benchtests/bench-strcmp.c +++ b/benchtests/bench-strcmp.c @@ -1,5 +1,5 @@ /* Measure strcmp and wcscmp functions. - Copyright (C) 2013-2016 Free Software Foundation, Inc. + Copyright (C) 2013-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -127,6 +127,8 @@ stupid_strcmp (const char *s1, const char *s2) } #endif +# include "json-lib.h" + typedef int (*proto_t) (const CHAR *, const CHAR *); IMPL (STUPID_STRCMP, 1) @@ -134,7 +136,7 @@ IMPL (SIMPLE_STRCMP, 1) IMPL (STRCMP, 1) static void -do_one_test (impl_t *impl, +do_one_test (json_ctx_t *json_ctx, impl_t *impl, const CHAR *s1, const CHAR *s2, int exp_result) { @@ -150,12 +152,12 @@ do_one_test (impl_t *impl, 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 align1, size_t align2, size_t len, int max_char, - int exp_result) +do_test (json_ctx_t *json_ctx, size_t align1, size_t align2, size_t len, int + max_char, int exp_result) { size_t i; @@ -186,56 +188,78 @@ do_test (size_t align1, size_t align2, size_t len, int max_char, s2[len + 1] = 24 + exp_result; s2[len - 1] -= exp_result; - printf ("Length %4zd, alignment %2zd/%2zd:", len, align1, align2); + json_element_object_begin (json_ctx); + json_attr_uint (json_ctx, "length", (double) len); + json_attr_uint (json_ctx, "align1", (double) align1); + json_attr_uint (json_ctx, "align2", (double) align2); + json_array_begin (json_ctx, "timings"); FOR_EACH_IMPL (impl, 0) - do_one_test (impl, s1, s2, exp_result); + do_one_test (json_ctx, impl, s1, s2, exp_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 ("%23s", ""); + 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", "default"); + + 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 = 1; i < 32; ++i) { - do_test (CHARBYTES * i, CHARBYTES * i, i, MIDCHAR, 0); - do_test (CHARBYTES * i, CHARBYTES * i, i, MIDCHAR, 1); - do_test (CHARBYTES * i, CHARBYTES * i, i, MIDCHAR, -1); + do_test (&json_ctx, CHARBYTES * i, CHARBYTES * i, i, MIDCHAR, 0); + do_test (&json_ctx, CHARBYTES * i, CHARBYTES * i, i, MIDCHAR, 1); + do_test (&json_ctx, CHARBYTES * i, CHARBYTES * i, i, MIDCHAR, -1); } for (i = 1; i < 10 + CHARBYTESLOG; ++i) { - do_test (0, 0, 2 << i, MIDCHAR, 0); - do_test (0, 0, 2 << i, LARGECHAR, 0); - do_test (0, 0, 2 << i, MIDCHAR, 1); - do_test (0, 0, 2 << i, LARGECHAR, 1); - do_test (0, 0, 2 << i, MIDCHAR, -1); - do_test (0, 0, 2 << i, LARGECHAR, -1); - do_test (0, CHARBYTES * i, 2 << i, MIDCHAR, 1); - do_test (CHARBYTES * i, CHARBYTES * (i + 1), 2 << i, LARGECHAR, 1); + do_test (&json_ctx, 0, 0, 2 << i, MIDCHAR, 0); + do_test (&json_ctx, 0, 0, 2 << i, LARGECHAR, 0); + do_test (&json_ctx, 0, 0, 2 << i, MIDCHAR, 1); + do_test (&json_ctx, 0, 0, 2 << i, LARGECHAR, 1); + do_test (&json_ctx, 0, 0, 2 << i, MIDCHAR, -1); + do_test (&json_ctx, 0, 0, 2 << i, LARGECHAR, -1); + do_test (&json_ctx, 0, CHARBYTES * i, 2 << i, MIDCHAR, 1); + do_test (&json_ctx, CHARBYTES * i, CHARBYTES * (i + 1), 2 << i, LARGECHAR, 1); } for (i = 1; i < 8; ++i) { - do_test (CHARBYTES * i, 2 * CHARBYTES * i, 8 << i, MIDCHAR, 0); - do_test (2 * CHARBYTES * i, CHARBYTES * i, 8 << i, LARGECHAR, 0); - do_test (CHARBYTES * i, 2 * CHARBYTES * i, 8 << i, MIDCHAR, 1); - do_test (2 * CHARBYTES * i, CHARBYTES * i, 8 << i, LARGECHAR, 1); - do_test (CHARBYTES * i, 2 * CHARBYTES * i, 8 << i, MIDCHAR, -1); - do_test (2 * CHARBYTES * i, CHARBYTES * i, 8 << i, LARGECHAR, -1); + do_test (&json_ctx, CHARBYTES * i, 2 * CHARBYTES * i, 8 << i, MIDCHAR, 0); + do_test (&json_ctx, 2 * CHARBYTES * i, CHARBYTES * i, 8 << i, LARGECHAR, 0); + do_test (&json_ctx, CHARBYTES * i, 2 * CHARBYTES * i, 8 << i, MIDCHAR, 1); + do_test (&json_ctx, 2 * CHARBYTES * i, CHARBYTES * i, 8 << i, LARGECHAR, 1); + do_test (&json_ctx, CHARBYTES * i, 2 * CHARBYTES * i, 8 << i, MIDCHAR, -1); + do_test (&json_ctx, 2 * CHARBYTES * i, CHARBYTES * i, 8 << i, LARGECHAR, -1); } + json_array_end (&json_ctx); + json_attr_object_end (&json_ctx); + json_attr_object_end (&json_ctx); + json_document_end (&json_ctx); + return ret; } -#include "../test-skeleton.c" +#include <support/test-driver.c> |