From patchwork Wed Mar 23 21:57:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 52280 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 B2D68388883A for ; Wed, 23 Mar 2022 22:07:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B2D68388883A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1648073247; bh=QmJ1KRkrD/2XSN4unGb1jaWs5ngsfQCDRluEC6yxWzg=; 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=X0AVWh988hYKZyM8gsxr4CClonvJ63pw4jZ/Pc1Hw2rL5aB20U74/+jkv4Ui9gGkK gkJD7Dt2lFZdVJX3ivs3KTo0CWYb9BfGXk7lJwKVhgktmRypxLVbfvh2IZt5OEELby ZtMr5dimsBsUTWABC/J/Ey27qiicMMOlfFQ+H/jY= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) by sourceware.org (Postfix) with ESMTPS id 3A296388883D for ; Wed, 23 Mar 2022 22:01:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3A296388883D Received: by mail-il1-x12d.google.com with SMTP id b9so1980372ila.8 for ; Wed, 23 Mar 2022 15:01:09 -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=QmJ1KRkrD/2XSN4unGb1jaWs5ngsfQCDRluEC6yxWzg=; b=pcA8XAxbS52cEaUNG/GXgeOk6HViMMxrKGO6XLtNZZtWtRYlCLNsXhxg+5dRJ3raEA P2E7K0i2Nn7NvJlY8z2wX2Ucu2XnaMb7A+yjJt/5bE0Bc+qukQMniaIDJCD6IYT7JJJM ds8cyF5MTohayFCuA1qJgoiYcyR1/2ie6wyk3SieB+ta2Cm070vQEJw19llCSNuZ7t4T XXAMjW9H2uA0YEKDnor8SWKelCgHF7Ba7uxeJ5XZH2P9kwFU6tm+piYJ625eKyFbWUnb 2G9NjqIKetV8pHI03lagzq20rXst2gHdSELi0iamLgZxNFqKyVQjstqqTr9GesVsxAJ5 1lwA== X-Gm-Message-State: AOAM530ZnF67VYoe8dZ9nTRdMY9Fjz+yNzZ2iUlmiQVmkWIh+2sRQyws mN8AEe7S13PdeTAkcCESQUPZIIuMgWw= X-Google-Smtp-Source: ABdhPJxhZfBi8f03k1EumR1l+NGxvQO3AJ9fCZsepbf4FESvySZv9ljVynTIA962IZdPqbJzt8hydw== X-Received: by 2002:a05:6e02:12c2:b0:2c7:c44d:df9a with SMTP id i2-20020a056e0212c200b002c7c44ddf9amr999516ilm.245.1648072868309; Wed, 23 Mar 2022 15:01:08 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 15:01:07 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v1 13/23] benchtests: Use json-lib in bench-strcasecmp.c Date: Wed, 23 Mar 2022 16:57:31 -0500 Message-Id: <20220323215734.3927131-13-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-strcasecmp.c | 77 +++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 26 deletions(-) diff --git a/benchtests/bench-strcasecmp.c b/benchtests/bench-strcasecmp.c index daccf1d245..855f2db2ad 100644 --- a/benchtests/bench-strcasecmp.c +++ b/benchtests/bench-strcasecmp.c @@ -20,6 +20,7 @@ #define TEST_MAIN #define TEST_NAME "strcasecmp" #include "bench-string.h" +#include "json-lib.h" typedef int (*proto_t) (const char *, const char *); static int simple_strcasecmp (const char *, const char *); @@ -40,7 +41,8 @@ simple_strcasecmp (const char *s1, const char *s2) } static void -do_one_test (impl_t *impl, const char *s1, const char *s2, int exp_result) +do_one_test (json_ctx_t *json_ctx, impl_t *impl, const char *s1, + const char *s2, int exp_result) { size_t i, iters = INNER_LOOP_ITERS; timing_t start, stop, cur; @@ -64,12 +66,12 @@ do_one_test (impl_t *impl, const char *s1, const char *s2, int exp_result) 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 len, int max_char, - int exp_result) +do_test (json_ctx_t *json_ctx, size_t align1, size_t align2, size_t len, + int max_char, int exp_result) { size_t i; char *s1, *s2; @@ -85,6 +87,13 @@ do_test (size_t align1, size_t align2, size_t len, int max_char, if (align2 + len + 1 >= page_size) return; + json_element_object_begin (json_ctx); + json_attr_uint (json_ctx, "length", len); + 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"); + s1 = (char *) (buf1 + align1); s2 = (char *) (buf2 + align2); @@ -103,53 +112,69 @@ do_test (size_t align1, size_t align2, size_t len, int max_char, else s2[len - 1] -= exp_result; - printf ("Length %4zd, alignment %2zd/%2zd:", len, align1, align2); - FOR_EACH_IMPL (impl, 0) - do_one_test (impl, s1, s2, exp_result); + do_one_test (json_ctx, impl, s1, s2, 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, 127, 0); - do_test (i, i, i, 127, 1); - do_test (i, i, i, 127, -1); + do_test (&json_ctx, i, i, i, 127, 0); + do_test (&json_ctx, i, i, i, 127, 1); + do_test (&json_ctx, i, i, i, 127, -1); } for (i = 1; i < 10; ++i) { - do_test (0, 0, 2 << i, 127, 0); - do_test (0, 0, 2 << i, 254, 0); - do_test (0, 0, 2 << i, 127, 1); - do_test (0, 0, 2 << i, 254, 1); - do_test (0, 0, 2 << i, 127, -1); - do_test (0, 0, 2 << i, 254, -1); + do_test (&json_ctx, 0, 0, 2 << i, 127, 0); + do_test (&json_ctx, 0, 0, 2 << i, 254, 0); + do_test (&json_ctx, 0, 0, 2 << i, 127, 1); + do_test (&json_ctx, 0, 0, 2 << i, 254, 1); + do_test (&json_ctx, 0, 0, 2 << i, 127, -1); + do_test (&json_ctx, 0, 0, 2 << i, 254, -1); } for (i = 1; i < 8; ++i) { - do_test (i, 2 * i, 8 << i, 127, 0); - do_test (2 * i, i, 8 << i, 254, 0); - do_test (i, 2 * i, 8 << i, 127, 1); - do_test (2 * i, i, 8 << i, 254, 1); - do_test (i, 2 * i, 8 << i, 127, -1); - do_test (2 * i, i, 8 << i, 254, -1); + do_test (&json_ctx, i, 2 * i, 8 << i, 127, 0); + do_test (&json_ctx, 2 * i, i, 8 << i, 254, 0); + do_test (&json_ctx, i, 2 * i, 8 << i, 127, 1); + do_test (&json_ctx, 2 * i, i, 8 << i, 254, 1); + do_test (&json_ctx, i, 2 * i, 8 << i, 127, -1); + do_test (&json_ctx, 2 * i, i, 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; }