From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by sourceware.org (Postfix) with ESMTPS id ED4743858D3C for ; Thu, 24 Mar 2022 18:44:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org ED4743858D3C Received: by mail-pf1-x429.google.com with SMTP id s11so4615774pfu.13 for ; Thu, 24 Mar 2022 11:44:03 -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=PoQYpLH00LNhgLXXquQUHNO6ut+ei/DKWY1dA1ORoRk=; b=l96HRghu1nIMFS9hz7szSBg19/6sbgHhae7OLHWfFLZBrAJ7unIyg5ruL36bFd2jz5 Rt6RUDOMV7gv89b6mcaxff+9lA9wTjb45AQ4i7pcXANuFGPsCEAF+WVGOgkkSWVd1IXC h/a24DUyytd7wyZCDbe+G5hdg6aet7c5ERU9U60NLHA164Hze3mCCgUJ2OfiY7afpm4W BugZuSERoOwn8uiEYvbWrcGr+3RiYuwY+Gy48NuUCSHhxaCXeMJNUdksnqz+RjH3ma8D 8XRjth05j/BUHxL4izJfMq57/KZhCEYONfUGKk/0UxUzlDkY7jrZ+tCQ2WiPDOe+De2Q 7Igw== X-Gm-Message-State: AOAM532tvqqPilRkiZyQ8vJMZOLu2vRIZwUjCkZWTrJB/35S6YPuS4fJ LeWCD1HTTEwAuVO7IMSex7nRCGkbYeiMfb18cJjoC8kwT+U= X-Google-Smtp-Source: ABdhPJxn2HxTLj7HeNGGkp90FOOGbsxlotl4l5WClHjZkYxPTimOQwC5/jgTFmoe48Q1PNlKU13IHORRaPWd5Trzy9o= X-Received: by 2002:a63:3e47:0:b0:382:366:64ea with SMTP id l68-20020a633e47000000b00382036664eamr5008972pga.210.1648147442863; Thu, 24 Mar 2022 11:44:02 -0700 (PDT) MIME-Version: 1.0 References: <20220323215734.3927131-1-goldstein.w.n@gmail.com> In-Reply-To: <20220323215734.3927131-1-goldstein.w.n@gmail.com> From: "H.J. Lu" Date: Thu, 24 Mar 2022 11:43:26 -0700 Message-ID: Subject: Re: [PATCH v1 01/23] benchtests: Use json-lib in bench-strchr.c To: Noah Goldstein Cc: GNU C Library , "Carlos O'Donell" Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3026.7 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 18:44:06 -0000 On Wed, Mar 23, 2022 at 2:58 PM Noah Goldstein wrote: > > Just QOL change to make parsing the output of the benchtests more > consistent. > --- > benchtests/bench-strchr.c | 94 ++++++++++++++++++++++++++------------- > 1 file changed, 64 insertions(+), 30 deletions(-) > > diff --git a/benchtests/bench-strchr.c b/benchtests/bench-strchr.c > index 821bc615b0..203900d4ad 100644 > --- a/benchtests/bench-strchr.c > +++ b/benchtests/bench-strchr.c > @@ -32,6 +32,7 @@ > #endif /* WIDE */ > #include "bench-string.h" > > +#include "json-lib.h" > #define BIG_CHAR MAX_CHAR > > #ifndef WIDE > @@ -74,10 +75,19 @@ IMPL (simple_STRCHR, 0) > IMPL (STRCHR, 1) > > static void > -do_one_test (impl_t *impl, const CHAR *s, int c, const CHAR *exp_res) > +do_one_test (json_ctx_t *json_ctx, impl_t *impl, const CHAR *s, int c, > + const CHAR *exp_res) > { > size_t i, iters = INNER_LOOP_ITERS_LARGE; > timing_t start, stop, cur; > + const CHAR *res = CALL (impl, s, c); > + if (res != exp_res) > + { > + error (0, 0, "Wrong result in function %s %p != %p", impl->name, res, > + exp_res); > + ret = 1; > + return; > + } > > TIMING_NOW (start); > for (i = 0; i < iters; ++i) > @@ -88,11 +98,12 @@ do_one_test (impl_t *impl, const CHAR *s, int c, const CHAR *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, int seek_char, int max_char) > +do_test (json_ctx_t *json_ctx, size_t align, size_t pos, size_t len, > + int seek_char, int max_char) > /* For wcschr: align here means align not in bytes, > but in wchar_ts, in bytes it will equal to align * (sizeof (wchar_t)) > len for wcschr here isn't in bytes but it's number of wchar_t symbols. */ > @@ -124,87 +135,110 @@ do_test (size_t align, size_t pos, size_t len, int seek_char, int max_char) > else > result = NULLRET (buf + align + len); > > - printf ("Length %4zd, alignment in bytes %2zd:", > - pos, align * sizeof (CHAR)); > + json_element_object_begin (json_ctx); > + json_attr_uint (json_ctx, "length", len); > + json_attr_uint (json_ctx, "pos", pos); > + json_attr_uint (json_ctx, "seek_char", seek_char); > + json_attr_uint (json_ctx, "max_char", max_char); > + json_attr_uint (json_ctx, "alignment", align); > + json_array_begin (json_ctx, "timings"); > > FOR_EACH_IMPL (impl, 0) > - do_one_test (impl, buf + align, seek_char, result); > + do_one_test (json_ctx, impl, buf + align, seek_char, 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 ("%20s", ""); > + 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 < 8; ++i) > { > - do_test (0, 16 << i, 2048, SMALL_CHAR, MIDDLE_CHAR); > - do_test (i, 16 << i, 2048, SMALL_CHAR, MIDDLE_CHAR); > + do_test (&json_ctx, 0, 16 << i, 2048, SMALL_CHAR, MIDDLE_CHAR); > + do_test (&json_ctx, i, 16 << i, 2048, SMALL_CHAR, MIDDLE_CHAR); > } > > for (i = 1; i < 8; ++i) > { > - do_test (0, 16 << i, 4096, SMALL_CHAR, MIDDLE_CHAR); > - do_test (i, 16 << i, 4096, SMALL_CHAR, MIDDLE_CHAR); > + do_test (&json_ctx, 0, 16 << i, 4096, SMALL_CHAR, MIDDLE_CHAR); > + do_test (&json_ctx, i, 16 << i, 4096, SMALL_CHAR, MIDDLE_CHAR); > } > > for (i = 1; i < 8; ++i) > { > - do_test (i, 64, 256, SMALL_CHAR, MIDDLE_CHAR); > - do_test (i, 64, 256, SMALL_CHAR, BIG_CHAR); > + do_test (&json_ctx, i, 64, 256, SMALL_CHAR, MIDDLE_CHAR); > + do_test (&json_ctx, i, 64, 256, SMALL_CHAR, BIG_CHAR); > } > > for (i = 0; i < 8; ++i) > { > - do_test (16 * i, 256, 512, SMALL_CHAR, MIDDLE_CHAR); > - do_test (16 * i, 256, 512, SMALL_CHAR, BIG_CHAR); > + do_test (&json_ctx, 16 * i, 256, 512, SMALL_CHAR, MIDDLE_CHAR); > + do_test (&json_ctx, 16 * i, 256, 512, SMALL_CHAR, BIG_CHAR); > } > > for (i = 0; i < 32; ++i) > { > - do_test (0, i, i + 1, SMALL_CHAR, MIDDLE_CHAR); > - do_test (0, i, i + 1, SMALL_CHAR, BIG_CHAR); > + do_test (&json_ctx, 0, i, i + 1, SMALL_CHAR, MIDDLE_CHAR); > + do_test (&json_ctx, 0, i, i + 1, SMALL_CHAR, BIG_CHAR); > } > > for (i = 1; i < 8; ++i) > { > - do_test (0, 16 << i, 2048, 0, MIDDLE_CHAR); > - do_test (i, 16 << i, 2048, 0, MIDDLE_CHAR); > + do_test (&json_ctx, 0, 16 << i, 2048, 0, MIDDLE_CHAR); > + do_test (&json_ctx, i, 16 << i, 2048, 0, MIDDLE_CHAR); > } > > for (i = 1; i < 8; ++i) > { > - do_test (0, 16 << i, 4096, 0, MIDDLE_CHAR); > - do_test (i, 16 << i, 4096, 0, MIDDLE_CHAR); > + do_test (&json_ctx, 0, 16 << i, 4096, 0, MIDDLE_CHAR); > + do_test (&json_ctx, i, 16 << i, 4096, 0, MIDDLE_CHAR); > } > > for (i = 1; i < 8; ++i) > { > - do_test (i, 64, 256, 0, MIDDLE_CHAR); > - do_test (i, 64, 256, 0, BIG_CHAR); > + do_test (&json_ctx, i, 64, 256, 0, MIDDLE_CHAR); > + do_test (&json_ctx, i, 64, 256, 0, BIG_CHAR); > } > > for (i = 0; i < 8; ++i) > { > - do_test (16 * i, 256, 512, 0, MIDDLE_CHAR); > - do_test (16 * i, 256, 512, 0, BIG_CHAR); > + do_test (&json_ctx, 16 * i, 256, 512, 0, MIDDLE_CHAR); > + do_test (&json_ctx, 16 * i, 256, 512, 0, BIG_CHAR); > } > > for (i = 0; i < 32; ++i) > { > - do_test (0, i, i + 1, 0, MIDDLE_CHAR); > - do_test (0, i, i + 1, 0, BIG_CHAR); > + do_test (&json_ctx, 0, i, i + 1, 0, MIDDLE_CHAR); > + do_test (&json_ctx, 0, i, i + 1, 0, BIG_CHAR); > } > > + 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.