From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by sourceware.org (Postfix) with ESMTPS id 91E473858406 for ; Thu, 24 Mar 2022 18:55:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 91E473858406 Received: by mail-pj1-x102a.google.com with SMTP id l4-20020a17090a49c400b001c6840df4a3so6019838pjm.0 for ; Thu, 24 Mar 2022 11:55:22 -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=xVdcYpt8cXk+2Frk2t+rcldKJF1+orNJuR9EIkBTv08=; b=MGDJSp3udt2sXxZ2o1jXGVWFf4UBSsJXHeEoN8VdG/lrT0FcabXgIJy9NvZivJIeAN gAr1o3yBS9gv0XLBTFLTfp1cxMEfMOanoJvjm9avWhAh3Cow1EiDms/VdRI9Gt+oMhV2 TqxSOLitauSHzEru9l0+aZ7Tc+qZk3N/dIXMN+6H18xHJGBAF+vZYuaxiynDa+n12Q+Z RWVorspcrz+w0OOkX1X/glWPrhj6H4X/Y7Lu1itbKotI8KDJdojC9yBBSp75Y/+LZ26V 71/AL0DgQYiIhlK7bg/0o59L0y2931IEglRp0+mlC8kwKBMlfDppuevj5y2xE321Qs1G X01A== X-Gm-Message-State: AOAM530F+gdZ0vbJhMHyqi2VSAouJ5KVPqEFX5rY/K8JQojUXWEBWJn0 +0U4V4ZCcY+hld8Ecn7Aau+sNOaw8vX2wDla4lMD/Ez8+DI= X-Google-Smtp-Source: ABdhPJydPn3YSC+w7QuQSHbTjvEEEbuXGRKueJuQIGn+jGWUbuvOkgPzkfo/ttIWpJC7gd6ijkcvbnX2hL2vxur5cNY= X-Received: by 2002:a17:90b:4c41:b0:1c7:3fa8:9b6a with SMTP id np1-20020a17090b4c4100b001c73fa89b6amr19674411pjb.120.1648148121492; Thu, 24 Mar 2022 11:55:21 -0700 (PDT) MIME-Version: 1.0 References: <20220323215734.3927131-1-goldstein.w.n@gmail.com> <20220323215734.3927131-6-goldstein.w.n@gmail.com> In-Reply-To: <20220323215734.3927131-6-goldstein.w.n@gmail.com> From: "H.J. Lu" Date: Thu, 24 Mar 2022 11:54:45 -0700 Message-ID: Subject: Re: [PATCH v1 06/23] benchtests: Use json-lib in bench-strspn.c To: Noah Goldstein Cc: GNU C Library , "Carlos O'Donell" Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3026.6 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:24 -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-strspn.c | 78 +++++++++++++++++++++++++++++---------- > 1 file changed, 58 insertions(+), 20 deletions(-) > > diff --git a/benchtests/bench-strspn.c b/benchtests/bench-strspn.c > index d79c36fae6..061e90c54d 100644 > --- a/benchtests/bench-strspn.c > +++ b/benchtests/bench-strspn.c > @@ -23,6 +23,7 @@ > # define TEST_NAME "wcsspn" > #endif /* WIDE */ > #include "bench-string.h" > +#include "json-lib.h" > > #define BIG_CHAR MAX_CHAR > > @@ -58,9 +59,10 @@ SIMPLE_STRSPN (const CHAR *s, const CHAR *acc) > } > > static void > -do_one_test (impl_t *impl, const CHAR *s, const CHAR *acc, size_t exp_res) > +do_one_test (json_ctx_t *json_ctx, impl_t *impl, const CHAR *s, > + const CHAR *acc, size_t exp_res) > { > - size_t res = CALL (impl, s, acc), i, iters = INNER_LOOP_ITERS_MEDIUM; > + size_t res = CALL (impl, s, acc), i, iters = INNER_LOOP_ITERS; > timing_t start, stop, cur; > > if (res != exp_res) > @@ -80,21 +82,24 @@ do_one_test (impl_t *impl, const CHAR *s, const CHAR *acc, size_t 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; > CHAR *acc, *s; > > - align &= 7; > - if ((align + pos + 10) * sizeof (CHAR) >= page_size || len > 240 || ! len) > + align1 &= 7; > + if ((align1 + pos + 10) * sizeof (CHAR) >= page_size || len > 240 || !len) > + return; > + if ((align2 + len) * sizeof (CHAR) >= page_size) > return; > > - acc = (CHAR *) (buf2) + (random () & 255); > - s = (CHAR *) (buf1) + align; > + acc = (CHAR *) (buf2) + align2; > + s = (CHAR *) (buf1) + align1; > > for (i = 0; i < len; ++i) > { > @@ -118,43 +123,76 @@ do_test (size_t align, size_t pos, size_t len) > s[i] = '\0'; > } > > - printf ("Length %4zd, alignment %2zd, acc 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, acc, pos); > + do_one_test (json_ctx, impl, s, acc, pos); > > - 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.