From patchwork Mon May 23 22:41:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 54323 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 BD2803856DEC for ; Mon, 23 May 2022 22:42:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BD2803856DEC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1653345745; bh=Ug7FfNijHHmjYZsT5NjZhLjPWxijYm0E07TWu/YWVDs=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Rw/5vvL5eAVng/Y1FBAtVEfs8Gvb1xyRDhWrwvBroR1Vvg55307xCbyeQUYShpXRa U8c8RFyOg3CKln35ipScxOYqD2hTesw+Amy5v+m//oeHcPRu8+ys/pS1OlavP8t1ms m6gBNVSTkdEtTf7vB2pQ1OhthxCE890j+HFU5VKs= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) by sourceware.org (Postfix) with ESMTPS id 0EB0F3857C50 for ; Mon, 23 May 2022 22:42:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0EB0F3857C50 Received: by mail-il1-x12c.google.com with SMTP id t15so4470632ilg.13 for ; Mon, 23 May 2022 15:42:03 -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=Ug7FfNijHHmjYZsT5NjZhLjPWxijYm0E07TWu/YWVDs=; b=akVCyclsUYSx+h1Z6f7lmKUgwVHNkRrRu66u91O8oZ0+N4LQNgtEikoMq+6xsifHba k9HVXV8SVlJfoYX9jleCIZcFhH2uz/sbj8NA/o+CKJaavmLSI+hftxw2j+4BjBEcf98P 3mcdUZBoltcH72sKKfCx5TutvjwkAvpLop7oRB8cdg+r+8FjKmNwQEuJDd3W8NIAGs54 Mxmw9eu/0tFg0Wzy3kR3I6FZZXjV0u0zu1mDqH65r0EDcJTeXmCqOrdl2IivtbB2x2r/ kNjbn2EZA4+gVPaVB5WQSaU7mfXK6TvWrkd0nQJPtBurrABhrnS7BKv3Pfy7yfMUscJ+ aDUA== X-Gm-Message-State: AOAM533+YmOwdYCFTu6y4vQe/wrOd7zokiujZKqRHqsFOAylh8TilFaC zk2EFPjwpUlCfGQywZQI0OeA3IkHaIE= X-Google-Smtp-Source: ABdhPJwcxZgsuq/PyA2g9cn1La4IfjJeqER4sobfv/Lipuq54Z8Zq8tkVdAszQRSehCDbzwFtbsD4w== X-Received: by 2002:a05:6e02:1147:b0:2d1:9a59:844d with SMTP id o7-20020a056e02114700b002d19a59844dmr5293367ill.212.1653345722183; Mon, 23 May 2022 15:42:02 -0700 (PDT) Received: from noah-tgl.. (node-17-161.flex.volo.net. [76.191.17.161]) by smtp.gmail.com with ESMTPSA id 6-20020a021d06000000b0032e2d3cc08csm3035106jaj.132.2022.05.23.15.42.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 May 2022 15:42:02 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v1] benchtests: Improve bench-strnlen.c Date: Mon, 23 May 2022 17:41:55 -0500 Message-Id: <20220523224155.3834736-1-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.3 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.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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" 1. Output results in json format so its easier to parse 2. Increase max alignment to `getpagesize () - 1` to make it possible to test page cross cases. Reviewed-by: H.J. Lu --- benchtests/bench-strnlen.c | 77 +++++++++++++++++++++++++------------- 1 file changed, 52 insertions(+), 25 deletions(-) diff --git a/benchtests/bench-strnlen.c b/benchtests/bench-strnlen.c index f4904bd0de..2cd561dfd5 100644 --- a/benchtests/bench-strnlen.c +++ b/benchtests/bench-strnlen.c @@ -25,6 +25,7 @@ # define memchr_strnlen wcschr_wcsnlen #endif /* WIDE */ #include "bench-string.h" +#include "json-lib.h" #define BIG_CHAR MAX_CHAR @@ -49,15 +50,16 @@ IMPL (memchr_strnlen, 0) IMPL (generic_strnlen, 0) static void -do_one_test (impl_t *impl, const CHAR *s, size_t maxlen, size_t exp_len) +do_one_test (json_ctx_t *json_ctx, impl_t *impl, const CHAR *s, size_t maxlen, + size_t exp_len) { size_t len = CALL (impl, s, maxlen), i, iters = INNER_LOOP_ITERS_LARGE; timing_t start, stop, cur; if (len != exp_len) { - error (0, 0, "Wrong result in function %s %zd %zd", impl->name, - len, exp_len); + error (0, 0, "Wrong result in function %s %zd %zd", impl->name, len, + exp_len); ret = 1; return; } @@ -71,76 +73,101 @@ do_one_test (impl_t *impl, const CHAR *s, size_t maxlen, size_t exp_len) 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 len, size_t maxlen, int max_char) +do_test (json_ctx_t *json_ctx, size_t align, size_t len, size_t maxlen, + int max_char) { size_t i; - align &= 63; + align &= getpagesize () - 1; if ((align + len) * sizeof (CHAR) >= page_size) return; CHAR *buf = (CHAR *) (buf1); + json_element_object_begin (json_ctx); + json_attr_uint (json_ctx, "len", len); + json_attr_uint (json_ctx, "maxlen", maxlen); + json_attr_uint (json_ctx, "max_char", max_char); + json_attr_uint (json_ctx, "align", align); + json_array_begin (json_ctx, "timings"); + for (i = 0; i < len; ++i) buf[align + i] = 1 + 7 * i % max_char; buf[align + len] = 0; - printf ("Length %4zd, alignment %2zd:", len, align); - FOR_EACH_IMPL (impl, 0) - do_one_test (impl, (CHAR *) (buf + align), maxlen, MIN (len, maxlen)); + do_one_test (json_ctx, impl, (CHAR *) (buf + align), maxlen, + MIN (len, maxlen)); - putchar ('\n'); + json_array_end (json_ctx); + json_element_object_end (json_ctx); } int test_main (void) { size_t i; + json_ctx_t json_ctx; 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, i, i - 1, MIDDLE_CHAR); - do_test (0, i, i, MIDDLE_CHAR); - do_test (0, i, i + 1, MIDDLE_CHAR); + do_test (&json_ctx, 0, i, i - 1, MIDDLE_CHAR); + do_test (&json_ctx, 0, i, i, MIDDLE_CHAR); + do_test (&json_ctx, 0, i, i + 1, MIDDLE_CHAR); } for (i = 1; i < 8; ++i) { - do_test (i, i, i - 1, MIDDLE_CHAR); - do_test (i, i, i, MIDDLE_CHAR); - do_test (i, i, i + 1, MIDDLE_CHAR); + do_test (&json_ctx, i, i, i - 1, MIDDLE_CHAR); + do_test (&json_ctx, i, i, i, MIDDLE_CHAR); + do_test (&json_ctx, i, i, i + 1, MIDDLE_CHAR); } for (i = 2; i <= 10; ++i) { - do_test (0, 1 << i, 5000, MIDDLE_CHAR); - do_test (1, 1 << i, 5000, MIDDLE_CHAR); + do_test (&json_ctx, 0, 1 << i, 5000, MIDDLE_CHAR); + do_test (&json_ctx, 1, 1 << i, 5000, MIDDLE_CHAR); } for (i = 1; i < 8; ++i) - do_test (0, i, 5000, BIG_CHAR); + do_test (&json_ctx, 0, i, 5000, BIG_CHAR); for (i = 1; i < 8; ++i) - do_test (i, i, 5000, BIG_CHAR); + do_test (&json_ctx, i, i, 5000, BIG_CHAR); for (i = 2; i <= 10; ++i) { - do_test (0, 1 << i, 5000, BIG_CHAR); - do_test (1, 1 << i, 5000, BIG_CHAR); + do_test (&json_ctx, 0, 1 << i, 5000, BIG_CHAR); + do_test (&json_ctx, 1, 1 << i, 5000, 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; }