From patchwork Wed Mar 23 21:57:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 52268 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 9C97C3888839 for ; Wed, 23 Mar 2022 21:58:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9C97C3888839 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1648072704; bh=5zFZ/NwrDTts3+99cSWhez+P0ZHqc1lnvH68WrbXB3o=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=dmtJUVVkqjixUdbA6xlYy4G5aR0XQxnLGEoMH+JnwVesvt3p9q2f4vogLSEi3ZgPD vhD+jTSC+RSkIX2B2+YYX6CsgM3PyCAehcghw29CYmx8ElI2jEOf+1ltuS8t1r3s9v Mvgf8DufnL7B3bw+uz8CtoyiK8bVtZMmD7Kj7YV4= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) by sourceware.org (Postfix) with ESMTPS id 413493858C2C for ; Wed, 23 Mar 2022 21:58:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 413493858C2C Received: by mail-io1-xd2c.google.com with SMTP id d62so3364992iog.13 for ; Wed, 23 Mar 2022 14:58:02 -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:mime-version :content-transfer-encoding; bh=5zFZ/NwrDTts3+99cSWhez+P0ZHqc1lnvH68WrbXB3o=; b=lM2R3Sn+d8E/ZT5sinr0XXi7FwSpSXFGcxfdO6eqvlwBAHALnNsrNblrP/3MlGV3Ji 7yTjtKHAtzp9TsBFlRgysRqYj5EG9mPjwGo53JqWXySUeMEY00BFFPAaWhRb/yOQIYKN t1ccVo/JqVUy1NWBy80wq1W9f/YjGPxr8UWy/2rdgMjbc6A6n4WaQ5+SM9waaV2bcBv9 E/FISsT9z3U4WlPkvT8Z2TcyXGJh7XUg9ZNoxL7P0G4TRzXbKfCLro/LNkfMNdiNPR/B T4S80GWekSDx0DBy8OM3wDYonxyOwPqk+LFEMMKdSs47oLUxgeP1cZ7h9WBVTjKg97e/ 4FsA== X-Gm-Message-State: AOAM532Ioq3tVevwqDSNuFdfqAQIco+xr11uOgwfdThr5Fp8ujjRPuV0 7vWPqBt6QXASuXsvF2Jk5Yv7L+qkjiE= X-Google-Smtp-Source: ABdhPJz1QSpSlOka1CzohzJr+9OgK4GCOsgKN+eKLCbMboEU/Y/h+NCaE/XSSzO+27+YraN+CstizQ== X-Received: by 2002:a02:ac12:0:b0:321:384f:c0b2 with SMTP id a18-20020a02ac12000000b00321384fc0b2mr1056007jao.157.1648072681276; Wed, 23 Mar 2022 14:58:01 -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.58.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 14:58:00 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v1 01/23] benchtests: Use json-lib in bench-strchr.c Date: Wed, 23 Mar 2022 16:57:13 -0500 Message-Id: <20220323215734.3927131-1-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.25.1 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-strchr.c | 94 ++++++++++++++++++++++++++------------- 1 file changed, 64 insertions(+), 30 deletions(-) diff --git a/benchtests/bench-strchr.c b/benchtests/bench-strchr.c index 821bc615b0..203900d4ad 100644 --- a/benchtests/bench-strchr.c +++ b/benchtests/bench-strchr.c @@ -32,6 +32,7 @@ #endif /* WIDE */ #include "bench-string.h" +#include "json-lib.h" #define BIG_CHAR MAX_CHAR #ifndef WIDE @@ -74,10 +75,19 @@ IMPL (simple_STRCHR, 0) IMPL (STRCHR, 1) static void -do_one_test (impl_t *impl, const CHAR *s, int c, const CHAR *exp_res) +do_one_test (json_ctx_t *json_ctx, impl_t *impl, const CHAR *s, int c, + const CHAR *exp_res) { size_t i, iters = INNER_LOOP_ITERS_LARGE; timing_t start, stop, cur; + const CHAR *res = CALL (impl, s, c); + if (res != exp_res) + { + error (0, 0, "Wrong result in function %s %p != %p", impl->name, res, + exp_res); + ret = 1; + return; + } TIMING_NOW (start); for (i = 0; i < iters; ++i) @@ -88,11 +98,12 @@ do_one_test (impl_t *impl, const CHAR *s, int c, const CHAR *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, int seek_char, int max_char) +do_test (json_ctx_t *json_ctx, size_t align, size_t pos, size_t len, + int seek_char, int max_char) /* For wcschr: align here means align not in bytes, but in wchar_ts, in bytes it will equal to align * (sizeof (wchar_t)) len for wcschr here isn't in bytes but it's number of wchar_t symbols. */ @@ -124,87 +135,110 @@ do_test (size_t align, size_t pos, size_t len, int seek_char, int max_char) else result = NULLRET (buf + align + len); - printf ("Length %4zd, alignment in bytes %2zd:", - pos, align * sizeof (CHAR)); + json_element_object_begin (json_ctx); + json_attr_uint (json_ctx, "length", len); + json_attr_uint (json_ctx, "pos", pos); + json_attr_uint (json_ctx, "seek_char", seek_char); + json_attr_uint (json_ctx, "max_char", max_char); + json_attr_uint (json_ctx, "alignment", align); + json_array_begin (json_ctx, "timings"); FOR_EACH_IMPL (impl, 0) - do_one_test (impl, buf + align, seek_char, result); + do_one_test (json_ctx, impl, buf + align, seek_char, 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 ("%20s", ""); + 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 < 8; ++i) { - do_test (0, 16 << i, 2048, SMALL_CHAR, MIDDLE_CHAR); - do_test (i, 16 << i, 2048, SMALL_CHAR, MIDDLE_CHAR); + do_test (&json_ctx, 0, 16 << i, 2048, SMALL_CHAR, MIDDLE_CHAR); + do_test (&json_ctx, i, 16 << i, 2048, SMALL_CHAR, MIDDLE_CHAR); } for (i = 1; i < 8; ++i) { - do_test (0, 16 << i, 4096, SMALL_CHAR, MIDDLE_CHAR); - do_test (i, 16 << i, 4096, SMALL_CHAR, MIDDLE_CHAR); + do_test (&json_ctx, 0, 16 << i, 4096, SMALL_CHAR, MIDDLE_CHAR); + do_test (&json_ctx, i, 16 << i, 4096, SMALL_CHAR, MIDDLE_CHAR); } for (i = 1; i < 8; ++i) { - do_test (i, 64, 256, SMALL_CHAR, MIDDLE_CHAR); - do_test (i, 64, 256, SMALL_CHAR, BIG_CHAR); + do_test (&json_ctx, i, 64, 256, SMALL_CHAR, MIDDLE_CHAR); + do_test (&json_ctx, i, 64, 256, SMALL_CHAR, BIG_CHAR); } for (i = 0; i < 8; ++i) { - do_test (16 * i, 256, 512, SMALL_CHAR, MIDDLE_CHAR); - do_test (16 * i, 256, 512, SMALL_CHAR, BIG_CHAR); + do_test (&json_ctx, 16 * i, 256, 512, SMALL_CHAR, MIDDLE_CHAR); + do_test (&json_ctx, 16 * i, 256, 512, SMALL_CHAR, BIG_CHAR); } for (i = 0; i < 32; ++i) { - do_test (0, i, i + 1, SMALL_CHAR, MIDDLE_CHAR); - do_test (0, i, i + 1, SMALL_CHAR, BIG_CHAR); + do_test (&json_ctx, 0, i, i + 1, SMALL_CHAR, MIDDLE_CHAR); + do_test (&json_ctx, 0, i, i + 1, SMALL_CHAR, BIG_CHAR); } for (i = 1; i < 8; ++i) { - do_test (0, 16 << i, 2048, 0, MIDDLE_CHAR); - do_test (i, 16 << i, 2048, 0, MIDDLE_CHAR); + do_test (&json_ctx, 0, 16 << i, 2048, 0, MIDDLE_CHAR); + do_test (&json_ctx, i, 16 << i, 2048, 0, MIDDLE_CHAR); } for (i = 1; i < 8; ++i) { - do_test (0, 16 << i, 4096, 0, MIDDLE_CHAR); - do_test (i, 16 << i, 4096, 0, MIDDLE_CHAR); + do_test (&json_ctx, 0, 16 << i, 4096, 0, MIDDLE_CHAR); + do_test (&json_ctx, i, 16 << i, 4096, 0, MIDDLE_CHAR); } for (i = 1; i < 8; ++i) { - do_test (i, 64, 256, 0, MIDDLE_CHAR); - do_test (i, 64, 256, 0, BIG_CHAR); + do_test (&json_ctx, i, 64, 256, 0, MIDDLE_CHAR); + do_test (&json_ctx, i, 64, 256, 0, BIG_CHAR); } for (i = 0; i < 8; ++i) { - do_test (16 * i, 256, 512, 0, MIDDLE_CHAR); - do_test (16 * i, 256, 512, 0, BIG_CHAR); + do_test (&json_ctx, 16 * i, 256, 512, 0, MIDDLE_CHAR); + do_test (&json_ctx, 16 * i, 256, 512, 0, BIG_CHAR); } for (i = 0; i < 32; ++i) { - do_test (0, i, i + 1, 0, MIDDLE_CHAR); - do_test (0, i, i + 1, 0, BIG_CHAR); + do_test (&json_ctx, 0, i, i + 1, 0, MIDDLE_CHAR); + do_test (&json_ctx, 0, i, i + 1, 0, BIG_CHAR); } + json_array_end (&json_ctx); + json_attr_object_end (&json_ctx); + json_attr_object_end (&json_ctx); + json_document_end (&json_ctx); + return ret; }