From patchwork Fri Feb 2 04:48:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 868503 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-89911-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="aPPtIUXe"; 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 3zXkyz2qnGz9sDB for ; Fri, 2 Feb 2018 15:48:59 +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:in-reply-to :references; q=dns; s=default; b=rPA1Q/JPEfrrgB0tMOHTLBJULqhhb1G vGuTTL/wKSvpyIr/0kv+4do5bj/fGI9/BEvAkaeIjMsyIr2GUFbIA+YDQr8pkmVY o8+nVAAkZIljqM6qA0Ja5GoUWjMPUoJgZ3GNlyy5Gge3Cw/qxCXVadBOEWQOCezp 3F/MJ7NDMInc= 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:in-reply-to :references; s=default; bh=JteKNzmT8D86Bv4P3o/ctRGvL1o=; b=aPPtI UXekPTfQviWz/ZvNeRGiiYLN4aN556vsOCfH1c51NBFInIeAUBlFcymWUwpq5qkH Xq6MF7WYL0RUAHcL8EgLXYZFgNq0IzI/k2Ix+lQkflEq9BQAgU/b/l4We2SaQYe4 vUy6kmA5hOdiWycWPOyONaLTyQhOR6UIqgk2DU= Received: (qmail 44376 invoked by alias); 2 Feb 2018 04:48:33 -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 44144 invoked by uid 89); 2 Feb 2018 04:48:30 -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= X-HELO: homiemail-a52.g.dreamhost.com From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Subject: [COMMITTED] benchtests: Make bench-memcmp print json Date: Fri, 2 Feb 2018 10:18:08 +0530 Message-Id: <20180202044809.2797-2-siddhesh@sourceware.org> In-Reply-To: <20180202044809.2797-1-siddhesh@sourceware.org> References: <20180202044809.2797-1-siddhesh@sourceware.org> The benchamrk result can now be studied using the compare_strings.py script. * benchtests/bench-memcmp.c: Print json instead of plain text. --- ChangeLog | 2 ++ benchtests/bench-memcmp.c | 76 +++++++++++++++++++++++++++++++---------------- 2 files changed, 52 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4362a79893..4b3be4ba84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2018-02-02 Siddhesh Poyarekar + * benchtests/bench-memcmp.c: Print json instead of plain text. + * benchtests/bench-memcmp.c (do_test): Call realloc_buf for every test run. diff --git a/benchtests/bench-memcmp.c b/benchtests/bench-memcmp.c index c7255a5b0e..69ed9c958b 100644 --- a/benchtests/bench-memcmp.c +++ b/benchtests/bench-memcmp.c @@ -69,14 +69,16 @@ simple_memcmp (const char *s1, const char *s2, size_t n) } #endif +# include "json-lib.h" + typedef int (*proto_t) (const CHAR *, const CHAR *, size_t); IMPL (SIMPLE_MEMCMP, 0) IMPL (MEMCMP, 1) static void -do_one_test (impl_t *impl, const CHAR *s1, const CHAR *s2, size_t len, - int exp_result) +do_one_test (json_ctx_t *json_ctx, impl_t *impl, const CHAR *s1, + const CHAR *s2, size_t len, int exp_result) { size_t i, iters = INNER_LOOP_ITERS; timing_t start, stop, cur; @@ -90,11 +92,12 @@ do_one_test (impl_t *impl, const CHAR *s1, const CHAR *s2, size_t len, 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 exp_result) +do_test (json_ctx_t *json_ctx, size_t align1, size_t align2, size_t len, + int exp_result) { size_t i; CHAR *s1, *s2; @@ -110,7 +113,11 @@ do_test (size_t align1, size_t align2, size_t len, int exp_result) if (align2 + (len + 1) * CHARBYTES >= page_size) return; - 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) { @@ -124,57 +131,74 @@ do_test (size_t align1, size_t align2, size_t len, int exp_result) s2[len] = align2; s2[len - 1] -= exp_result; - do_one_test (impl, s1, s2, len, exp_result); + do_one_test (json_ctx, impl, s1, s2, len, exp_result); realloc_bufs (); } - 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 < 16; ++i) { - do_test (i * CHARBYTES, i * CHARBYTES, i, 0); - do_test (i * CHARBYTES, i * CHARBYTES, i, 1); - do_test (i * CHARBYTES, i * CHARBYTES, i, -1); + do_test (&json_ctx, i * CHARBYTES, i * CHARBYTES, i, 0); + do_test (&json_ctx, i * CHARBYTES, i * CHARBYTES, i, 1); + do_test (&json_ctx, i * CHARBYTES, i * CHARBYTES, i, -1); } for (i = 0; i < 16; ++i) { - do_test (0, 0, i, 0); - do_test (0, 0, i, 1); - do_test (0, 0, i, -1); + do_test (&json_ctx, 0, 0, i, 0); + do_test (&json_ctx, 0, 0, i, 1); + do_test (&json_ctx, 0, 0, i, -1); } for (i = 1; i < 10; ++i) { - do_test (0, 0, 2 << i, 0); - do_test (0, 0, 2 << i, 1); - do_test (0, 0, 2 << i, -1); - do_test (0, 0, 16 << i, 0); - do_test ((8 - i) * CHARBYTES, (2 * i) * CHARBYTES, 16 << i, 0); - do_test (0, 0, 16 << i, 1); - do_test (0, 0, 16 << i, -1); + do_test (&json_ctx, 0, 0, 2 << i, 0); + do_test (&json_ctx, 0, 0, 2 << i, 1); + do_test (&json_ctx, 0, 0, 2 << i, -1); + do_test (&json_ctx, 0, 0, 16 << i, 0); + do_test (&json_ctx, (8 - i) * CHARBYTES, (2 * i) * CHARBYTES, 16 << i, 0); + do_test (&json_ctx, 0, 0, 16 << i, 1); + do_test (&json_ctx, 0, 0, 16 << i, -1); } for (i = 1; i < 8; ++i) { - do_test (i * CHARBYTES, 2 * (i * CHARBYTES), 8 << i, 0); - do_test (i * CHARBYTES, 2 * (i * CHARBYTES), 8 << i, 1); - do_test (i * CHARBYTES, 2 * (i * CHARBYTES), 8 << i, -1); + do_test (&json_ctx, i * CHARBYTES, 2 * (i * CHARBYTES), 8 << i, 0); + do_test (&json_ctx, i * CHARBYTES, 2 * (i * CHARBYTES), 8 << i, 1); + do_test (&json_ctx, i * CHARBYTES, 2 * (i * CHARBYTES), 8 << i, -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; }