From patchwork Thu Dec 14 21:02:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 848776 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-88159-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="qv8uM2WE"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yyQxr4Cywz9t3M for ; Fri, 15 Dec 2017 08:02:56 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; q=dns; s= default; b=JwSMJTWYeeD+YN8jFMsgBPYwObVd5JR5CnvU1rDsQzBWaq4uwGy30 XuxMkQeUPTKPu0gEuE0MjeW+UsyVrhIF0xDcGa6ZLKg2EJuyYXFTwCeEu1Xh1uN5 NDDokZf0i01VmoJ1a1DA6b+nEePhoCR/cjIb5vpbRsM7KL3K7pe/fU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; s=default; bh=Ej+1065bgJ0VDczbqv5vEaqtGog=; b=qv8uM2WEzmblwhqWxK5hQiOdbZUv hYfNd4JOND3p8CxjwOVgcM6OHC5X8Dt2zCjMCoSuHrz0vRLjLTOkgYj+iQ9BvBp8 5JtItKwubpNSRw3MKW+t6dM0oSJT1BTieEglcTJMTlijSYN1A72ZEPmzdrChahko ejWHpbB/J6Agl4Y= Received: (qmail 89260 invoked by alias); 14 Dec 2017 21:02:50 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 89250 invoked by uid 89); 14 Dec 2017 21:02:49 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy=2zd, timings X-HELO: homiemail-a52.g.dreamhost.com From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Subject: [COMMITTED] Convert strcmp benchmark output to json format Date: Fri, 15 Dec 2017 02:32:38 +0530 Message-Id: <1513285358-30739-1-git-send-email-siddhesh@sourceware.org> The format is now parseable with the compare_strings.py script. --- ChangeLog | 2 ++ benchtests/bench-strcmp.c | 78 +++++++++++++++++++++++++++++++---------------- 2 files changed, 53 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ae1fd2..99792bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2017-12-14 Siddhesh Poyarekar + * benchtests/bench-strcmp.c: Print output in JSON format. + * elf/dl-tunables.list: Remove redundant SXID_ERASE. 2017-12-14 Florian Weimer diff --git a/benchtests/bench-strcmp.c b/benchtests/bench-strcmp.c index 1fd0d1e..bd92b29 100644 --- a/benchtests/bench-strcmp.c +++ b/benchtests/bench-strcmp.c @@ -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,55 +188,77 @@ 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; }