From patchwork Wed Mar 23 21:57:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 52272 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4CDF63888838 for ; Wed, 23 Mar 2022 22:01:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4CDF63888838 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1648072883; bh=Owh3Je9U2b9edLRmDeWtNLVw/zXWj69J+wd+Okzb+ho=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=t5LnLD1IbKQlInAtUEiLxCQA7ubLlstbg2hHLm1l86JFiSV5iMuk62naTCwNqRv5I oL+clMiBGQTwwQlgpidqlGjas8gpHn6+5cpkZgA37YN6ZETnriFEhqntEGNgt6t2Q4 57IFJbAnbFXwKpqNeHwOvFknotW8IvFIaVwU80AA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) by sourceware.org (Postfix) with ESMTPS id D2DCB3876053 for ; Wed, 23 Mar 2022 21:59:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D2DCB3876053 Received: by mail-io1-xd2a.google.com with SMTP id 9so249429iou.5 for ; Wed, 23 Mar 2022 14:59:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Owh3Je9U2b9edLRmDeWtNLVw/zXWj69J+wd+Okzb+ho=; b=Senl/fpr/zfAlxrkqZAkMycAGe+pOz5MLjiSYXB3ONisVS9rxwuBSW8+2yT2K1UqHG FrTZ8pBfr2xI3aX9wjDGAxwGhBRa62/TEE4/9KqiLGslyhjHAub3a4A3Qfo3FpXEjkMZ tE4cxYMDqKnxKGfTkQXFISMNDEo1e/WYYexaGkaesghtdA0NKoXyOjtnK4uP6NphnAEr yR2yLxC8jNKAIR+zrS+GG7ihGUkc4ucF0T50aMcFeGUH1LTIpIvyWO9fAXiOUavx9QP9 AL8hSlHoCnAf8mRc4IziZv+Sbeluk/MfGxVU/xIVukCa8QY9gqfhEW6UXJ2ApXHpPkB8 xgSA== X-Gm-Message-State: AOAM532lsGdBpHmS5um2dNIcSxqfUQIDsf1mcF1M0bfYxqjV8WGAs/Vm g6JdbKS2vBJUdto2DYuEhjKzEwCWlm0= X-Google-Smtp-Source: ABdhPJxEwAcYdWY480k5aXWIcaP9I6pQFrIoF3pkB3JaCLwxbGsU1G6b9WgsN34e5em608qI6i09qA== X-Received: by 2002:a05:6602:26cb:b0:648:f391:c37d with SMTP id g11-20020a05660226cb00b00648f391c37dmr1122802ioo.198.1648072754940; Wed, 23 Mar 2022 14:59:14 -0700 (PDT) Received: from localhost.localdomain (node-17-161.flex.volo.net. [76.191.17.161]) by smtp.googlemail.com with ESMTPSA id c22-20020a5ea816000000b00649d360663asm529227ioa.40.2022.03.23.14.59.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 14:59:14 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v1 05/23] benchtests: Use json-lib in bench-strpbrk.c Date: Wed, 23 Mar 2022 16:57:19 -0500 Message-Id: <20220323215734.3927131-5-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220323215734.3927131-1-goldstein.w.n@gmail.com> References: <20220323215734.3927131-1-goldstein.w.n@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 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-Patchwork-Original-From: Noah Goldstein via Libc-alpha From: Noah Goldstein Reply-To: Noah Goldstein Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Just QOL change to make parsing the output of the benchtests more consistent. Reviewed-by: H.J. Lu --- 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; }