From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by sourceware.org (Postfix) with ESMTPS id 233BE385380D for ; Thu, 24 Mar 2022 19:00:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 233BE385380D Received: by mail-pg1-x532.google.com with SMTP id k14so4599031pga.0 for ; Thu, 24 Mar 2022 12:00:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Lasgx9PPsjbhqUCezXpsAoqZJix5mcBR0l/zPG2+xJE=; b=ylJ2Wp5/hYFGT5jqhb/FjtEV8Y70kSJ9HF714vV+xIhPI25eKGtyyG+s0DQbDQ48MN JUqKzEZq6sTFc/jFrllLc25jqPCx3HCtzoZDcMC7w2MKEmiXN3kw0vdzK/qoNdpVEtj6 y9rAnAV0GD/lMkDqc7ZWs7lAePe7T5DYGRJ5X3T7+QEyvc4wcmlMKifG68wtKY2TLy8r dOTSYf3NaWkbMNvrzulacT4KonzZM9EWqx0bczC3NE2BKt7IH+fqMkMo7DXdny/suG9G JJSE0OuXTSsPwceoXuEJ1RyVtWpMgKjCbMYqYuXWTTVgpETppoHQO+iYIhvKtedSpRaB RVpQ== X-Gm-Message-State: AOAM533LTRbcY9ZY5v0dWvVJv5PRWHL2+OuO7kkMtvv6/D8jfL3gmT+m xOAnoTd1lhSv3JFs84azv4QwJeTtKa2Z1Ss3FUo= X-Google-Smtp-Source: ABdhPJxYSc+9zFly6LyUE3qY8u08cbw6cx6lG59zzBskGRgbUX18Kx7vVL+Tgl9a08Utt8da7ELiaoca4nng/17WlmM= X-Received: by 2002:aa7:8892:0:b0:4f7:ad05:2f22 with SMTP id z18-20020aa78892000000b004f7ad052f22mr6488679pfe.76.1648148438022; Thu, 24 Mar 2022 12:00:38 -0700 (PDT) MIME-Version: 1.0 References: <20220323215734.3927131-1-goldstein.w.n@gmail.com> <20220323215734.3927131-13-goldstein.w.n@gmail.com> In-Reply-To: <20220323215734.3927131-13-goldstein.w.n@gmail.com> From: "H.J. Lu" Date: Thu, 24 Mar 2022 12:00:02 -0700 Message-ID: Subject: Re: [PATCH v1 13/23] benchtests: Use json-lib in bench-strcasecmp.c To: Noah Goldstein Cc: GNU C Library , "Carlos O'Donell" Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3027.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Mar 2022 19:00:41 -0000 On Wed, Mar 23, 2022 at 3:01 PM Noah Goldstein wrote: > > Just QOL change to make parsing the output of the benchtests more > consistent. > --- > benchtests/bench-strcasecmp.c | 77 +++++++++++++++++++++++------------ > 1 file changed, 51 insertions(+), 26 deletions(-) > > diff --git a/benchtests/bench-strcasecmp.c b/benchtests/bench-strcasecmp.c > index daccf1d245..855f2db2ad 100644 > --- a/benchtests/bench-strcasecmp.c > +++ b/benchtests/bench-strcasecmp.c > @@ -20,6 +20,7 @@ > #define TEST_MAIN > #define TEST_NAME "strcasecmp" > #include "bench-string.h" > +#include "json-lib.h" > > typedef int (*proto_t) (const char *, const char *); > static int simple_strcasecmp (const char *, const char *); > @@ -40,7 +41,8 @@ simple_strcasecmp (const char *s1, const char *s2) > } > > static void > -do_one_test (impl_t *impl, const char *s1, const char *s2, int exp_result) > +do_one_test (json_ctx_t *json_ctx, impl_t *impl, const char *s1, > + const char *s2, int exp_result) > { > size_t i, iters = INNER_LOOP_ITERS; > timing_t start, stop, cur; > @@ -64,12 +66,12 @@ do_one_test (impl_t *impl, const char *s1, const char *s2, int exp_result) > > 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; > char *s1, *s2; > @@ -85,6 +87,13 @@ do_test (size_t align1, size_t align2, size_t len, int max_char, > if (align2 + len + 1 >= page_size) > return; > > + json_element_object_begin (json_ctx); > + json_attr_uint (json_ctx, "length", len); > + json_attr_uint (json_ctx, "align1", align1); > + json_attr_uint (json_ctx, "align2", align2); > + json_attr_uint (json_ctx, "max_char", max_char); > + json_array_begin (json_ctx, "timings"); > + > s1 = (char *) (buf1 + align1); > s2 = (char *) (buf2 + align2); > > @@ -103,53 +112,69 @@ do_test (size_t align1, size_t align2, size_t len, int max_char, > else > s2[len - 1] -= exp_result; > > - printf ("Length %4zd, alignment %2zd/%2zd:", len, align1, align2); > - > 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", ""); > + > + 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, i, i, 127, 0); > - do_test (i, i, i, 127, 1); > - do_test (i, i, i, 127, -1); > + do_test (&json_ctx, i, i, i, 127, 0); > + do_test (&json_ctx, i, i, i, 127, 1); > + do_test (&json_ctx, i, i, i, 127, -1); > } > > for (i = 1; i < 10; ++i) > { > - do_test (0, 0, 2 << i, 127, 0); > - do_test (0, 0, 2 << i, 254, 0); > - do_test (0, 0, 2 << i, 127, 1); > - do_test (0, 0, 2 << i, 254, 1); > - do_test (0, 0, 2 << i, 127, -1); > - do_test (0, 0, 2 << i, 254, -1); > + do_test (&json_ctx, 0, 0, 2 << i, 127, 0); > + do_test (&json_ctx, 0, 0, 2 << i, 254, 0); > + do_test (&json_ctx, 0, 0, 2 << i, 127, 1); > + do_test (&json_ctx, 0, 0, 2 << i, 254, 1); > + do_test (&json_ctx, 0, 0, 2 << i, 127, -1); > + do_test (&json_ctx, 0, 0, 2 << i, 254, -1); > } > > for (i = 1; i < 8; ++i) > { > - do_test (i, 2 * i, 8 << i, 127, 0); > - do_test (2 * i, i, 8 << i, 254, 0); > - do_test (i, 2 * i, 8 << i, 127, 1); > - do_test (2 * i, i, 8 << i, 254, 1); > - do_test (i, 2 * i, 8 << i, 127, -1); > - do_test (2 * i, i, 8 << i, 254, -1); > + do_test (&json_ctx, i, 2 * i, 8 << i, 127, 0); > + do_test (&json_ctx, 2 * i, i, 8 << i, 254, 0); > + do_test (&json_ctx, i, 2 * i, 8 << i, 127, 1); > + do_test (&json_ctx, 2 * i, i, 8 << i, 254, 1); > + do_test (&json_ctx, i, 2 * i, 8 << i, 127, -1); > + do_test (&json_ctx, 2 * i, i, 8 << i, 254, -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; > } > > -- > 2.25.1 > LGTM. Reviewed-by: H.J. Lu Thanks. -- H.J.