From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by sourceware.org (Postfix) with ESMTPS id 1A1C9385E451 for ; Thu, 24 Mar 2022 18:55:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1A1C9385E451 Received: by mail-pl1-x62e.google.com with SMTP id y6so3169909plg.2 for ; Thu, 24 Mar 2022 11:55:07 -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=JwqnCWzfs5aduDxX7lmJXk6fLrHvu13lf5PZxT/ivlA=; b=kkR0ANjt6gxfZNYrhnoXL0tGVMxo2r++Io06L9Ml/xnNFOtdJdXnbc6ueifR3AU0zm xbivXGN6RdblvQzPm39dTMJpVPfUJ6IDc1nKhsmBzp5KGAwes4Sh4UjZQeyIUKuqteye 2xrKYr5TNAZ7b3wPTDYDgPwDQ9/ZzGlGFAx2GO1SPc+tTCX1B0QHgwMXFDMyBKDIW8SZ X3LDh5Jt9n1VN2Ky2sMe3dD1C3AqrjgWM/2ggBEra5cHSEJ6yabhnaESQhTzhB5TzkY6 u5ofFGLdaXCimYUyyAngLdnhpDIzx9tsr7FQyuxA3az6XCEpmUJB2FuKY/tLOMTEBc+f bQQQ== X-Gm-Message-State: AOAM533APNJcwiIJtK0tzwSnHIbTkTOb9dsjrjJ3rER+UFXVvv1V+jBm Ev/LO0T4/MwB7Tv/Rt073En2jvTVTLxWVUzO8jtixKG316s= X-Google-Smtp-Source: ABdhPJxnub4UTsOWoS1eNam41wGy18C0vTPhTrEviuwZ3iKGZmQRpuX3X+Yudp/dJhCKzit/ICQKLiR3bQo0jEbDx3A= X-Received: by 2002:a17:902:f690:b0:154:2ceb:f18a with SMTP id l16-20020a170902f69000b001542cebf18amr7414814plg.4.1648148106108; Thu, 24 Mar 2022 11:55:06 -0700 (PDT) MIME-Version: 1.0 References: <20220323215734.3927131-1-goldstein.w.n@gmail.com> <20220323215734.3927131-5-goldstein.w.n@gmail.com> In-Reply-To: <20220323215734.3927131-5-goldstein.w.n@gmail.com> From: "H.J. Lu" Date: Thu, 24 Mar 2022 11:54:30 -0700 Message-ID: Subject: Re: [PATCH v1 05/23] benchtests: Use json-lib in bench-strpbrk.c To: Noah Goldstein Cc: GNU C Library , "Carlos O'Donell" Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3026.4 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:55:09 -0000 On Wed, Mar 23, 2022 at 2:59 PM Noah Goldstein wrote: > > Just QOL change to make parsing the output of the benchtests more > consistent. > --- > benchtests/bench-strpbrk.c | 81 ++++++++++++++++++++++++++++---------- > 1 file changed, 61 insertions(+), 20 deletions(-) > > diff --git a/benchtests/bench-strpbrk.c b/benchtests/bench-strpbrk.c > index d46bf9c0e2..a7522a76e6 100644 > --- a/benchtests/bench-strpbrk.c > +++ b/benchtests/bench-strpbrk.c > @@ -62,11 +62,14 @@ SIMPLE_STRPBRK (const CHAR *s, const CHAR *rej) > > #endif /* !STRPBRK_RESULT */ > > +#include "json-lib.h" > + > static void > -do_one_test (impl_t *impl, const CHAR *s, const CHAR *rej, RES_TYPE exp_res) > +do_one_test (json_ctx_t *json_ctx, impl_t *impl, const CHAR *s, > + const CHAR *rej, RES_TYPE exp_res) > { > RES_TYPE res = CALL (impl, s, rej); > - size_t i, iters = INNER_LOOP_ITERS_MEDIUM; > + size_t i, iters = INNER_LOOP_ITERS; > timing_t start, stop, cur; > > if (res != exp_res) > @@ -86,23 +89,26 @@ do_one_test (impl_t *impl, const CHAR *s, const CHAR *rej, RES_TYPE 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) > +do_test (json_ctx_t *json_ctx, size_t align1, size_t align2, size_t pos, > + size_t len) > { > size_t i; > int c; > RES_TYPE result; > CHAR *rej, *s; > > - align &= 7; > - if ((align + pos + 10) * sizeof (CHAR) >= page_size || len > 240) > + align1 &= 7; > + if ((align1 + pos + 10) * sizeof (CHAR) >= page_size || len > 240) > + return; > + if ((align2 + len) * sizeof (CHAR) >= page_size) > return; > > - rej = (CHAR *) (buf2) + (random () & 255); > - s = (CHAR *) (buf1) + align; > + rej = (CHAR *) (buf2) + align2; > + s = (CHAR *) (buf1) + align1; > > for (i = 0; i < len; ++i) > { > @@ -136,43 +142,78 @@ do_test (size_t align, size_t pos, size_t len) > } > result = STRPBRK_RESULT (s, pos); > > - printf ("Length %4zd, alignment %2zd, rej len %2zd:", pos, align, len); > + json_element_object_begin (json_ctx); > + json_attr_uint (json_ctx, "len", len); > + json_attr_uint (json_ctx, "pos", pos); > + json_attr_uint (json_ctx, "align1", align1); > + json_attr_uint (json_ctx, "align2", align2); > + json_array_begin (json_ctx, "timings"); > > FOR_EACH_IMPL (impl, 0) > - do_one_test (impl, s, rej, result); > + do_one_test (json_ctx, impl, s, rej, 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 ("%32s", ""); > + 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 = 0; i < 32; ++i) > { > - do_test (0, 512, i); > - do_test (i, 512, i); > + do_test (&json_ctx, 0, 0, 512, i); > + do_test (&json_ctx, i, 0, 512, i); > + do_test (&json_ctx, 0, i, 512, i); > + do_test (&json_ctx, i, i, 512, i); > + > } > > for (i = 1; i < 8; ++i) > { > - do_test (0, 16 << i, 4); > - do_test (i, 16 << i, 4); > + do_test (&json_ctx, 0, 0, 16 << i, 4); > + do_test (&json_ctx, i, 0, 16 << i, 4); > + do_test (&json_ctx, 0, i, 16 << i, 4); > + do_test (&json_ctx, i, i, 16 << i, 4); > } > > for (i = 1; i < 8; ++i) > - do_test (i, 64, 10); > + { > + do_test (&json_ctx, i, 0, 64, 10); > + do_test (&json_ctx, i, i, 64, 10); > + } > > for (i = 0; i < 64; ++i) > - do_test (0, i, 6); > + { > + do_test (&json_ctx, 0, 0, i, 6); > + do_test (&json_ctx, 0, i, i, 6); > + } > + > + 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.