From patchwork Wed Mar 23 21:57:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 52281 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 BA40A388883A for ; Wed, 23 Mar 2022 22:08:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BA40A388883A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1648073290; bh=JZ+0iof1U4u/MX547y5bEEDCT5hFM60KnEFjcmycf+Q=; 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=w+puMv2I6olAz8y5A90EG50P9IDbTBbD3nRgQdifuMxIZywV1ujZW5pgdlPtBMCNO GGpia0mUkx5fmlcyv7DyqDeNiMx1SqOYbrQoP7w8ddLdbmsWfx46jCHB4W/TPgRgzS Ix/jABrCdIxERxAQ1+uYTG1HQsoZfRSsoSdgRNe4= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) by sourceware.org (Postfix) with ESMTPS id 25AED3888837 for ; Wed, 23 Mar 2022 22:01:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 25AED3888837 Received: by mail-il1-x12e.google.com with SMTP id i1so2010618ila.0 for ; Wed, 23 Mar 2022 15:01:11 -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=JZ+0iof1U4u/MX547y5bEEDCT5hFM60KnEFjcmycf+Q=; b=sExCtW36w5w9rI4Zfnl8wvW0nuRohLwjs3/1SqCZ1Vb6Nlqd4gnCJ8AilBv4JC1bcC l1b3AHnzoxeMW6F9v505VwQS4C6S7g5NTKz9nAuByLuMEOGdWW+g4VsUQCN9t/10ULu9 p+ieC6bVepCtdZ04As7KGhO5XfuZ4CpBLnBPiHmXmYqdhjdSKTjBy+btYf970kOES5mH 0uTH3YPZ2oeRFw5wigI+B8eOdXJ+StL7ulZ2quNvw0QnosVl5aMI5L2r8xPK70U3eBQp c4VTSBAPDGashTDa0AJL6w4weQTOlm2PMR3qk0N5Zpf/4kAzm2woWaRPzRyopMXqnJRO 9yzg== X-Gm-Message-State: AOAM5306m5MRGPwQ27N+bSZBbSJWv8Pnt5bH/LUxW1i/oy1bGIWhPKlp Cz1LgNaagA8vHbwEgPziIb94Ev1sDos= X-Google-Smtp-Source: ABdhPJzsN4VNPz2t/CPIC/8uv1+8PWg62ng9TeTURmDX8kGjYZPOgjpIwsg6Py6oYbB4DylzR0xCuA== X-Received: by 2002:a05:6e02:20c4:b0:2c8:5b82:3035 with SMTP id 4-20020a056e0220c400b002c85b823035mr1103611ilq.220.1648072870078; Wed, 23 Mar 2022 15:01:10 -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.15.01.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 15:01:09 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v1 14/23] benchtests: Use json-lib in bench-strncasecmp.c Date: Wed, 23 Mar 2022 16:57:32 -0500 Message-Id: <20220323215734.3927131-14-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-strncasecmp.c | 113 ++++++++++++++++++++------------- 1 file changed, 69 insertions(+), 44 deletions(-) diff --git a/benchtests/bench-strncasecmp.c b/benchtests/bench-strncasecmp.c index a9819efc73..91f49cc8d3 100644 --- a/benchtests/bench-strncasecmp.c +++ b/benchtests/bench-strncasecmp.c @@ -20,6 +20,7 @@ #define TEST_MAIN #define TEST_NAME "strncasecmp" #include "bench-string.h" +#include "json-lib.h" typedef int (*proto_t) (const char *, const char *, size_t); static int simple_strncasecmp (const char *, const char *, size_t); @@ -47,8 +48,8 @@ simple_strncasecmp (const char *s1, const char *s2, size_t n) } static void -do_one_test (impl_t *impl, const char *s1, const char *s2, size_t n, - int exp_result) +do_one_test (json_ctx_t *json_ctx, impl_t *impl, const char *s1, + const char *s2, size_t n, int exp_result) { size_t i, iters = INNER_LOOP_ITERS; timing_t start, stop, cur; @@ -62,12 +63,12 @@ do_one_test (impl_t *impl, const char *s1, const char *s2, size_t n, 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 n, size_t len, int max_char, - int exp_result) +do_test (json_ctx_t *json_ctx, size_t align1, size_t align2, size_t n, + size_t len, int max_char, int exp_result) { size_t i; char *s1, *s2; @@ -101,83 +102,107 @@ do_test (size_t align1, size_t align2, size_t n, size_t len, int max_char, else s2[len - 1] -= exp_result; - printf ("Length %4zd, alignment %2zd/%2zd:", len, align1, align2); + json_element_object_begin (json_ctx); + json_attr_uint (json_ctx, "length", len); + json_attr_uint (json_ctx, "n", n); + 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"); FOR_EACH_IMPL (impl, 0) - do_one_test (impl, s1, s2, n, exp_result); + do_one_test (json_ctx, impl, s1, s2, n, 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 - 1, i, 127, 0); + do_test (&json_ctx, i, i, i - 1, i, 127, 0); - do_test (i, i, i, i, 127, 0); - do_test (i, i, i, i, 127, 1); - do_test (i, i, i, i, 127, -1); + do_test (&json_ctx, i, i, i, i, 127, 0); + do_test (&json_ctx, i, i, i, i, 127, 1); + do_test (&json_ctx, i, i, i, i, 127, -1); - do_test (i, i, i + 1, i, 127, 0); - do_test (i, i, i + 1, i, 127, 1); - do_test (i, i, i + 1, i, 127, -1); + do_test (&json_ctx, i, i, i + 1, i, 127, 0); + do_test (&json_ctx, i, i, i + 1, i, 127, 1); + do_test (&json_ctx, i, i, i + 1, i, 127, -1); } for (i = 1; i < 10; ++i) { - do_test (0, 0, (2 << i) - 1, 2 << i, 127, 0); - do_test (0, 0, 2 << i, 2 << i, 254, 0); - do_test (0, 0, (2 << i) + 1, 2 << i, 127, 0); + do_test (&json_ctx, 0, 0, (2 << i) - 1, 2 << i, 127, 0); + do_test (&json_ctx, 0, 0, 2 << i, 2 << i, 254, 0); + do_test (&json_ctx, 0, 0, (2 << i) + 1, 2 << i, 127, 0); - do_test (0, 0, (2 << i) + 1, 2 << i, 254, 0); + do_test (&json_ctx, 0, 0, (2 << i) + 1, 2 << i, 254, 0); - do_test (0, 0, 2 << i, 2 << i, 127, 1); - do_test (0, 0, (2 << i) + 10, 2 << i, 127, 1); + do_test (&json_ctx, 0, 0, 2 << i, 2 << i, 127, 1); + do_test (&json_ctx, 0, 0, (2 << i) + 10, 2 << i, 127, 1); - do_test (0, 0, 2 << i, 2 << i, 254, 1); - do_test (0, 0, (2 << i) + 10, 2 << i, 254, 1); + do_test (&json_ctx, 0, 0, 2 << i, 2 << i, 254, 1); + do_test (&json_ctx, 0, 0, (2 << i) + 10, 2 << i, 254, 1); - do_test (0, 0, 2 << i, 2 << i, 127, -1); - do_test (0, 0, (2 << i) + 10, 2 << i, 127, -1); + do_test (&json_ctx, 0, 0, 2 << i, 2 << i, 127, -1); + do_test (&json_ctx, 0, 0, (2 << i) + 10, 2 << i, 127, -1); - do_test (0, 0, 2 << i, 2 << i, 254, -1); - do_test (0, 0, (2 << i) + 10, 2 << i, 254, -1); + do_test (&json_ctx, 0, 0, 2 << i, 2 << i, 254, -1); + do_test (&json_ctx, 0, 0, (2 << i) + 10, 2 << i, 254, -1); } for (i = 1; i < 8; ++i) { - do_test (i, 2 * i, (8 << i) - 1, 8 << i, 127, 0); - do_test (i, 2 * i, 8 << i, 8 << i, 127, 0); - do_test (i, 2 * i, (8 << i) + 100, 8 << i, 127, 0); + do_test (&json_ctx, i, 2 * i, (8 << i) - 1, 8 << i, 127, 0); + do_test (&json_ctx, i, 2 * i, 8 << i, 8 << i, 127, 0); + do_test (&json_ctx, i, 2 * i, (8 << i) + 100, 8 << i, 127, 0); - do_test (2 * i, i, (8 << i) - 1, 8 << i, 254, 0); - do_test (2 * i, i, 8 << i, 8 << i, 254, 0); - do_test (2 * i, i, (8 << i) + 100, 8 << i, 254, 0); + do_test (&json_ctx, 2 * i, i, (8 << i) - 1, 8 << i, 254, 0); + do_test (&json_ctx, 2 * i, i, 8 << i, 8 << i, 254, 0); + do_test (&json_ctx, 2 * i, i, (8 << i) + 100, 8 << i, 254, 0); - do_test (i, 2 * i, 8 << i, 8 << i, 127, 1); - do_test (i, 2 * i, (8 << i) + 100, 8 << i, 127, 1); + do_test (&json_ctx, i, 2 * i, 8 << i, 8 << i, 127, 1); + do_test (&json_ctx, i, 2 * i, (8 << i) + 100, 8 << i, 127, 1); - do_test (2 * i, i, 8 << i, 8 << i, 254, 1); - do_test (2 * i, i, (8 << i) + 100, 8 << i, 254, 1); + do_test (&json_ctx, 2 * i, i, 8 << i, 8 << i, 254, 1); + do_test (&json_ctx, 2 * i, i, (8 << i) + 100, 8 << i, 254, 1); - do_test (i, 2 * i, 8 << i, 8 << i, 127, -1); - do_test (i, 2 * i, (8 << i) + 100, 8 << i, 127, -1); + do_test (&json_ctx, i, 2 * i, 8 << i, 8 << i, 127, -1); + do_test (&json_ctx, i, 2 * i, (8 << i) + 100, 8 << i, 127, -1); - do_test (2 * i, i, 8 << i, 8 << i, 254, -1); - do_test (2 * i, i, (8 << i) + 100, 8 << i, 254, -1); + do_test (&json_ctx, 2 * i, i, 8 << i, 8 << i, 254, -1); + do_test (&json_ctx, 2 * i, i, (8 << i) + 100, 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; }