From patchwork Tue Jul 13 08:22:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naohiro Tamura X-Patchwork-Id: 44332 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 80671394AC3E for ; Tue, 13 Jul 2021 08:23:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 80671394AC3E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626164588; bh=XAEl0kzfmO0aVxs3c8S79JcfLhq0FCrbKQI2bogxjOA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=egTsZWufrkNZ0OdvTyvcTtqHVAkH+Fxv+PoKJT8N3cAdB0L9Pl+kmO+lqx84K5gIa AA8hBjGLs2rIlY0t/cUGbE1eO7S+oDbcDWhTBtyCbqUuoPBP9eHI/ua63TMbqzxVkh d74i8PkU+WWeNZlUGKOs0orNsHfYNPWEayf3SuU0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa6.hc1455-7.c3s2.iphmx.com (esa6.hc1455-7.c3s2.iphmx.com [68.232.139.139]) by sourceware.org (Postfix) with ESMTPS id 08785389850B for ; Tue, 13 Jul 2021 08:22:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 08785389850B IronPort-SDR: FtXOX5TG/IAAX+d+4Vp09j4pEJJCtmknOZACVVdjjjdcbW+mh6aBhNbofZ8Hqr5U4Xb6aVP37t hD43Gu05pBPzwMCS/qtj2ciCUTHe4ZSGbx5fXUr/Zsee21FGXln2pKESaE+d6sfhI7jeVXNi67 KZQJckU07P7M+7eeDN0i8Dda6FqNsi6zcAPyru7P4phlNL8TEG5eTGKWLoFHXi3/oHBEwQQUgD AHsZqu7wJ2ltLXzlTZFz6jDQZikUNKsfZtAXe7oaYc1+bhBk9VkQ0ff/A0Y3RGf8Kbm5eRcmn3 MZPD3HCtWiZhgq8SbqFH4qae X-IronPort-AV: E=McAfee;i="6200,9189,10043"; a="36502269" X-IronPort-AV: E=Sophos;i="5.84,236,1620658800"; d="scan'208";a="36502269" Received: from unknown (HELO yto-r2.gw.nic.fujitsu.com) ([218.44.52.218]) by esa6.hc1455-7.c3s2.iphmx.com with ESMTP; 13 Jul 2021 17:22:43 +0900 Received: from yto-m2.gw.nic.fujitsu.com (yto-nat-yto-m2.gw.nic.fujitsu.com [192.168.83.65]) by yto-r2.gw.nic.fujitsu.com (Postfix) with ESMTP id 85C60A80C6 for ; Tue, 13 Jul 2021 17:22:41 +0900 (JST) Received: from m3051.s.css.fujitsu.com (m3051.s.css.fujitsu.com [10.134.21.209]) by yto-m2.gw.nic.fujitsu.com (Postfix) with ESMTP id D90349B60C for ; Tue, 13 Jul 2021 17:22:40 +0900 (JST) Received: from bionic.lxd (unknown [10.126.53.116]) by m3051.s.css.fujitsu.com (Postfix) with ESMTP id CE7348E; Tue, 13 Jul 2021 17:22:40 +0900 (JST) To: libc-alpha@sourceware.org Subject: [PATCH] benchtests: Add memset zero fill benchmark tests Date: Tue, 13 Jul 2021 08:22:14 +0000 Message-Id: <20210713082214.307529-1-naohirot@fujitsu.com> X-Mailer: git-send-email 2.17.1 X-TM-AS-GCONF: 00 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, KAM_SHORT, SPF_HELO_PASS, SPF_NONE, TXREP 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: Naohiro Tamura via Libc-alpha From: Naohiro Tamura Reply-To: Naohiro Tamura Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Memset takes 0 as the second parameter in most cases. More than 95% of memset takes 0 as the second parameter in case of Linux Kernel source code. However, we cannot measure the zero fill performance by bench-memset-zerofill.c and bench-memset-large-zerofill.c. This patch provides bench-memset-zerofill.c and bench-memset-large-zerofill.c which are suitable to see the performance of zero fill by fixing the second parameter to 0. --- benchtests/Makefile | 3 +- benchtests/bench-memset-large-zerofill.c | 125 ++++++++++++++++++ benchtests/bench-memset-zerofill.c | 156 +++++++++++++++++++++++ 3 files changed, 283 insertions(+), 1 deletion(-) create mode 100644 benchtests/bench-memset-large-zerofill.c create mode 100644 benchtests/bench-memset-zerofill.c diff --git a/benchtests/Makefile b/benchtests/Makefile index 1530939a8ce8..1261f7650fc7 100644 --- a/benchtests/Makefile +++ b/benchtests/Makefile @@ -53,7 +53,8 @@ string-benchset := memccpy memchr memcmp memcpy memmem memmove \ strncasecmp strncat strncmp strncpy strnlen strpbrk strrchr \ strspn strstr strcpy_chk stpcpy_chk memrchr strsep strtok \ strcoll memcpy-large memcpy-random memmove-large memset-large \ - memcpy-walk memset-walk memmove-walk + memcpy-walk memset-walk memmove-walk memset-zerofill \ + memset-large-zerofill # Build and run locale-dependent benchmarks only if we're building natively. ifeq (no,$(cross-compiling)) diff --git a/benchtests/bench-memset-large-zerofill.c b/benchtests/bench-memset-large-zerofill.c new file mode 100644 index 000000000000..d8eae9d9789f --- /dev/null +++ b/benchtests/bench-memset-large-zerofill.c @@ -0,0 +1,125 @@ +/* Measure memset functions with large data sizes. + Copyright (C) 2016-2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#define TEST_MAIN +#define TEST_NAME "memset" +#define START_SIZE (128 * 1024) +#define MIN_PAGE_SIZE (getpagesize () + 64 * 1024 * 1024) +#define TIMEOUT (20 * 60) +#include "bench-string.h" + +#include +#include "json-lib.h" + +void *generic_memset (void *, int, size_t); +typedef void *(*proto_t) (void *, int, size_t); + +IMPL (MEMSET, 1) +IMPL (generic_memset, 0) + +static void +do_one_test (json_ctx_t *json_ctx, impl_t *impl, CHAR *s, + int c __attribute ((unused)), size_t n) +{ + size_t i, iters = 16; + timing_t start, stop, cur; + + TIMING_NOW (start); + for (i = 0; i < iters; ++i) + { + CALL (impl, s, c, n); + } + TIMING_NOW (stop); + + TIMING_DIFF (cur, start, stop); + + json_element_double (json_ctx, (double) cur / (double) iters); +} + +static void +do_test (json_ctx_t *json_ctx, size_t align, int c, size_t len) +{ + align &= 63; + if ((align + len) * sizeof (CHAR) > page_size) + return; + + json_element_object_begin (json_ctx); + json_attr_uint (json_ctx, "length", len); + json_attr_uint (json_ctx, "alignment", align); + json_attr_int (json_ctx, "char", c); + json_array_begin (json_ctx, "timings"); + + FOR_EACH_IMPL (impl, 0) + { + do_one_test (json_ctx, impl, (CHAR *) (buf1) + align, c, len); + alloc_bufs (); + } + + json_array_end (json_ctx); + json_element_object_end (json_ctx); +} + +int +test_main (void) +{ + json_ctx_t json_ctx; + size_t i; + int c; + + test_init (); + + 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", "large-zerofill"); + + json_array_begin (&json_ctx, "ifuncs"); + FOR_EACH_IMPL (impl, 0) + json_element_string (&json_ctx, impl->name); + json_array_end (&json_ctx); + + json_array_begin (&json_ctx, "results"); + + c = 0; + for (i = START_SIZE; i <= MIN_PAGE_SIZE; i <<= 1) + { + do_test (&json_ctx, 0, c, i); + do_test (&json_ctx, 3, c, i); + } + + json_array_end (&json_ctx); + json_attr_object_end (&json_ctx); + json_attr_object_end (&json_ctx); + json_document_end (&json_ctx); + + return ret; +} + +#include + +#define libc_hidden_builtin_def(X) +#define libc_hidden_def(X) +#define libc_hidden_weak(X) +#define weak_alias(X,Y) +#undef MEMSET +#define MEMSET generic_memset +#include diff --git a/benchtests/bench-memset-zerofill.c b/benchtests/bench-memset-zerofill.c new file mode 100644 index 000000000000..ac20ae4c6537 --- /dev/null +++ b/benchtests/bench-memset-zerofill.c @@ -0,0 +1,156 @@ +/* Measure memset functions. + Copyright (C) 2013-2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#define TEST_MAIN +#ifndef WIDE +# define TEST_NAME "memset" +#else +# define TEST_NAME "wmemset" +# define generic_memset generic_wmemset +#endif /* WIDE */ +#define MIN_PAGE_SIZE 131072 +#include "bench-string.h" + +#include "json-lib.h" + +#ifdef WIDE +CHAR *generic_wmemset (CHAR *, CHAR, size_t); +#else +void *generic_memset (void *, int, size_t); +#endif + +typedef void *(*proto_t) (void *, int, size_t); + +IMPL (MEMSET, 1) +IMPL (generic_memset, 0) + +static void +do_one_test (json_ctx_t *json_ctx, impl_t *impl, CHAR *s, + int c __attribute ((unused)), size_t n) +{ + size_t i, iters = INNER_LOOP_ITERS; + timing_t start, stop, cur; + + TIMING_NOW (start); + for (i = 0; i < iters; ++i) + { + CALL (impl, s, c, n); + } + TIMING_NOW (stop); + + TIMING_DIFF (cur, start, stop); + + json_element_double (json_ctx, (double) cur / (double) iters); +} + +static void +do_test (json_ctx_t *json_ctx, size_t align, int c, size_t len) +{ + align &= 4095; + if ((align + len) * sizeof (CHAR) > page_size) + return; + + json_element_object_begin (json_ctx); + json_attr_uint (json_ctx, "length", len); + json_attr_uint (json_ctx, "alignment", align); + json_attr_int (json_ctx, "char", c); + json_array_begin (json_ctx, "timings"); + + FOR_EACH_IMPL (impl, 0) + { + do_one_test (json_ctx, impl, (CHAR *) (buf1) + align, c, len); + alloc_bufs (); + } + + json_array_end (json_ctx); + json_element_object_end (json_ctx); +} + +int +test_main (void) +{ + json_ctx_t json_ctx; + size_t i; + int c = 0; + + test_init (); + + 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", "default-zerofill"); + + json_array_begin (&json_ctx, "ifuncs"); + FOR_EACH_IMPL (impl, 0) + json_element_string (&json_ctx, impl->name); + json_array_end (&json_ctx); + + json_array_begin (&json_ctx, "results"); + + c = 0; + for (i = 0; i < 18; ++i) + do_test (&json_ctx, 0, c, 1 << i); + for (i = 1; i < 64; ++i) + { + do_test (&json_ctx, i, c, i); + do_test (&json_ctx, 4096 - i, c, i); + do_test (&json_ctx, 4095, c, i); + if (i & (i - 1)) + do_test (&json_ctx, 0, c, i); + } + for (i = 32; i < 512; i+=32) + { + do_test (&json_ctx, 0, c, i); + do_test (&json_ctx, i, c, i); + } + do_test (&json_ctx, 1, c, 14); + do_test (&json_ctx, 3, c, 1024); + do_test (&json_ctx, 4, c, 64); + do_test (&json_ctx, 2, c, 25); + for (i = 33; i <= 256; i += 4) + { + do_test (&json_ctx, 0, c, 32 * i); + do_test (&json_ctx, i, c, 32 * i); + } + + json_array_end (&json_ctx); + json_attr_object_end (&json_ctx); + json_attr_object_end (&json_ctx); + json_document_end (&json_ctx); + + return ret; +} + +#include + +#define libc_hidden_builtin_def(X) +#define libc_hidden_def(X) +#define libc_hidden_weak(X) +#define weak_alias(X,Y) +#ifndef WIDE +# undef MEMSET +# define MEMSET generic_memset +# include +#else +# define WMEMSET generic_wmemset +# include +#endif From patchwork Tue Jul 20 06:35:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naohiro Tamura X-Patchwork-Id: 44433 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 D2C87398547E for ; Tue, 20 Jul 2021 06:35:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D2C87398547E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626762939; bh=ynxQCmjt/FnjC/ZI7KIu0TgdtKzdlC8OP2hUFgP6FmA=; 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=Nhyf35wlR51rP2V6ov6/NzQUmXxEzOF1LDce/Nd2DhYoGonyiRPwfV4I1IIG4Dlsm jNbqsVqDWqAUV2EXnNfuGUWv2E4mvTxHVliHsrnkFUM5RN2exO9/juepbS7xH/30UR Iss23hPhsN7OnDe4BsGRAglu438caj/+tmtt+oZ4= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa9.hc1455-7.c3s2.iphmx.com (esa9.hc1455-7.c3s2.iphmx.com [139.138.36.223]) by sourceware.org (Postfix) with ESMTPS id 8A7973985808 for ; Tue, 20 Jul 2021 06:35:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8A7973985808 IronPort-SDR: j9edmNf3mAQ1ZIcmX0zDIB/5ZUl9YV9yLE8bEk3b9DTf3sV1ojHnfbT1gKUYnCOBZFXMhIlfMJ EbK/NFmM8R52tKOL7f5tNut9as8Vq4vjfnyjCjEOlLbify2nIBrS0vftKPgKPAxjzawRv/9DO5 vHf59in3mkFl7p6CmVRiKsBPiCA9QOlzdgJvp05RwSgygeC3Aw4MUUayWW01dv4x1RMSFHxzvC PXOZ6LVd9IVQLpfwosz5/r1cjyM+4gukYaQ8YKurzgs9V26c3Y+UxnJP2ITtKZWjARWPaIF6+C vIrOZM8felspxHC2qz887r8+ X-IronPort-AV: E=McAfee;i="6200,9189,10050"; a="25295082" X-IronPort-AV: E=Sophos;i="5.84,254,1620658800"; d="scan'208";a="25295082" Received: from unknown (HELO oym-r4.gw.nic.fujitsu.com) ([210.162.30.92]) by esa9.hc1455-7.c3s2.iphmx.com with ESMTP; 20 Jul 2021 15:35:07 +0900 Received: from oym-m3.gw.nic.fujitsu.com (oym-nat-oym-m3.gw.nic.fujitsu.com [192.168.87.60]) by oym-r4.gw.nic.fujitsu.com (Postfix) with ESMTP id 0C82532F7C6 for ; Tue, 20 Jul 2021 15:35:07 +0900 (JST) Received: from m3051.s.css.fujitsu.com (m3051.s.css.fujitsu.com [10.134.21.209]) by oym-m3.gw.nic.fujitsu.com (Postfix) with ESMTP id 32B8942C3EF for ; Tue, 20 Jul 2021 15:35:06 +0900 (JST) Received: from bionic.lxd (unknown [10.126.53.116]) by m3051.s.css.fujitsu.com (Postfix) with ESMTP id 0ED99A2; Tue, 20 Jul 2021 15:35:06 +0900 (JST) To: Noah Goldstein , Wilco Dijkstra , "Lucas A. M. Magalhaes" , libc-alpha@sourceware.org Subject: [PATCH v2 2/5] benchtests: Add memset zero fill benchtest Date: Tue, 20 Jul 2021 06:35:00 +0000 Message-Id: <20210720063500.362313-1-naohirot@fujitsu.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210713082214.307529-1-naohirot@fujitsu.com> References: <20210713082214.307529-1-naohirot@fujitsu.com> X-TM-AS-GCONF: 00 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, KAM_SHORT, SPF_HELO_PASS, SPF_NONE, TXREP 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: Naohiro Tamura via Libc-alpha From: Naohiro Tamura Reply-To: Naohiro Tamura Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Memset takes 0 as the second parameter in most cases. However, we cannot measure the zero fill performance by bench-memset.c and bench-memset-large.c precisely. X86_64 micro-architecture has some zero-over-zero optimization, and AArch64 micro-architecture also has some optimization for DC ZVA instruction. This patch provides bench-memset-zerofill.c which is suitable to analyze the zero fill performance by zero-over-zero and zero-over-one test cases from 16KB(L1), through L2 and L3, to 64MB(RAM). --- benchtests/Makefile | 2 +- benchtests/bench-memset-zerofill.c | 128 +++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 benchtests/bench-memset-zerofill.c diff --git a/benchtests/Makefile b/benchtests/Makefile index 1530939a8ce8..21b95c736190 100644 --- a/benchtests/Makefile +++ b/benchtests/Makefile @@ -53,7 +53,7 @@ string-benchset := memccpy memchr memcmp memcpy memmem memmove \ strncasecmp strncat strncmp strncpy strnlen strpbrk strrchr \ strspn strstr strcpy_chk stpcpy_chk memrchr strsep strtok \ strcoll memcpy-large memcpy-random memmove-large memset-large \ - memcpy-walk memset-walk memmove-walk + memcpy-walk memset-walk memmove-walk memset-zerofill # Build and run locale-dependent benchmarks only if we're building natively. ifeq (no,$(cross-compiling)) diff --git a/benchtests/bench-memset-zerofill.c b/benchtests/bench-memset-zerofill.c new file mode 100644 index 000000000000..2579b6edd09e --- /dev/null +++ b/benchtests/bench-memset-zerofill.c @@ -0,0 +1,128 @@ +/* Measure memset functions with zero fill data. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#define TEST_MAIN +#define TEST_NAME "memset" +#define START_SIZE (16 * 1024) +#define MIN_PAGE_SIZE (getpagesize () + 64 * 1024 * 1024) +#define TIMEOUT (20 * 60) +#include "bench-string.h" + +#include "json-lib.h" + +void *generic_memset (void *, int, size_t); +typedef void *(*proto_t) (void *, int, size_t); + +IMPL (MEMSET, 1) +IMPL (generic_memset, 0) + +static void +do_one_test (json_ctx_t *json_ctx, impl_t *impl, CHAR *s, + int c1 __attribute ((unused)), int c2 __attribute ((unused)), + size_t n) +{ + size_t i, iters = 16; + timing_t start, stop, cur; + + TIMING_NOW (start); + for (i = 0; i < iters; i += 2) + { + CALL (impl, s, c1, n); + CALL (impl, s, c2, n); + } + TIMING_NOW (stop); + + TIMING_DIFF (cur, start, stop); + + json_element_double (json_ctx, (double) cur / (double) iters); +} + +static void +do_test (json_ctx_t *json_ctx, size_t align, int c1, int c2, size_t len) +{ + align &= 63; + if ((align + len) * sizeof (CHAR) > page_size) + return; + + json_element_object_begin (json_ctx); + json_attr_uint (json_ctx, "length", len); + json_attr_uint (json_ctx, "alignment", align); + json_attr_int (json_ctx, "char1", c1); + json_attr_int (json_ctx, "char2", c2); + json_array_begin (json_ctx, "timings"); + + FOR_EACH_IMPL (impl, 0) + { + do_one_test (json_ctx, impl, (CHAR *) (buf1) + align, c1, c2, len); + alloc_bufs (); + } + + json_array_end (json_ctx); + json_element_object_end (json_ctx); +} + +int +test_main (void) +{ + json_ctx_t json_ctx; + size_t i; + int c1, c2; + + test_init (); + + 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", "zerofill"); + + json_array_begin (&json_ctx, "ifuncs"); + FOR_EACH_IMPL (impl, 0) + json_element_string (&json_ctx, impl->name); + json_array_end (&json_ctx); + + json_array_begin (&json_ctx, "results"); + + c2 = 0; + for (c1 = 0; c1 < 2; c1++) + for (i = START_SIZE; i <= MIN_PAGE_SIZE; i <<= 1) + { + do_test (&json_ctx, 0, c1, c2, i); + do_test (&json_ctx, 3, c1, c2, i); + } + + json_array_end (&json_ctx); + json_attr_object_end (&json_ctx); + json_attr_object_end (&json_ctx); + json_document_end (&json_ctx); + + return ret; +} + +#include + +#define libc_hidden_builtin_def(X) +#define libc_hidden_def(X) +#define libc_hidden_weak(X) +#define weak_alias(X,Y) +#undef MEMSET +#define MEMSET generic_memset +#include From patchwork Tue Jul 20 06:35:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naohiro Tamura X-Patchwork-Id: 44434 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 9B6C73985800 for ; Tue, 20 Jul 2021 06:36:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9B6C73985800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626762989; bh=xq7A6Fiku7Y4glqtT2xxv+4VSXS0nQKDMa0WFXaADvo=; 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=sw+1133rTdVvXEu8FUXVPYny4PR9BCKdIVVXIMVan8pgLcc27hS19nQO26vYZL0WF Hkx2L4kvLp7RwbbeRUjbP9VqeousMsB11xKhdaSM29ehzd0MYR0lrFZW6epvBTk7HR UdaGwNqAULuDuObrCmXtPkeEIfU78EVwmPHk2cyw= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa9.hc1455-7.c3s2.iphmx.com (esa9.hc1455-7.c3s2.iphmx.com [139.138.36.223]) by sourceware.org (Postfix) with ESMTPS id 85D16385043C for ; Tue, 20 Jul 2021 06:35:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 85D16385043C IronPort-SDR: 5KPOkYJmZVV01eYiYZh/X+g+KkEZBjE7uLBZt9yfz5q3hijXuIe2bp6FMDO8tw5XiuWezIbVoc 2iJo0Af+NU4XMJq6gK8c/FET01nBcpWr4DBg4u4dpM8yBVRzN1Pnx1mdVPl8taKmlXISNuD2LG fli9ydQoPhQHBiGt+cqW0WyzqHbhnoKjLvx+evSoNACqchfboqYFBcjCm4+FMv1rEOLcLFgc1o Bud7tr+u+i/gZQEyCl9RltSxJY8mqKBfbtbvh2UuaFM4UP7dE7xlP7yRuDVdB3W8Say7xhaYdf 80R9O++oV58tmHL87aUayXHr X-IronPort-AV: E=McAfee;i="6200,9189,10050"; a="25295240" X-IronPort-AV: E=Sophos;i="5.84,254,1620658800"; d="scan'208";a="25295240" Received: from unknown (HELO yto-r4.gw.nic.fujitsu.com) ([218.44.52.220]) by esa9.hc1455-7.c3s2.iphmx.com with ESMTP; 20 Jul 2021 15:35:44 +0900 Received: from yto-m4.gw.nic.fujitsu.com (yto-nat-yto-m4.gw.nic.fujitsu.com [192.168.83.67]) by yto-r4.gw.nic.fujitsu.com (Postfix) with ESMTP id 5909D21EC04 for ; Tue, 20 Jul 2021 15:35:44 +0900 (JST) Received: from m3050.s.css.fujitsu.com (msm.b.css.fujitsu.com [10.134.21.208]) by yto-m4.gw.nic.fujitsu.com (Postfix) with ESMTP id A8B3258BEA0 for ; Tue, 20 Jul 2021 15:35:43 +0900 (JST) Received: from bionic.lxd (unknown [10.126.53.116]) by m3050.s.css.fujitsu.com (Postfix) with ESMTP id A46D9AB; Tue, 20 Jul 2021 15:35:43 +0900 (JST) To: Noah Goldstein , Wilco Dijkstra , "Lucas A. M. Magalhaes" , libc-alpha@sourceware.org Subject: [PATCH v2 3/5] benchtests: Add a script to convert benchout string JSON to CSV Date: Tue, 20 Jul 2021 06:35:40 +0000 Message-Id: <20210720063540.362366-1-naohirot@fujitsu.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210713082214.307529-1-naohirot@fujitsu.com> References: <20210713082214.307529-1-naohirot@fujitsu.com> X-TM-AS-GCONF: 00 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, KAM_SHORT, SPF_HELO_PASS, SPF_NONE, TXREP 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: Naohiro Tamura via Libc-alpha From: Naohiro Tamura Reply-To: Naohiro Tamura Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" This patch adds "benchout_string2csv.sh" script to convert benchout string JSON to CSV so that we can visualize performance data by any spreadsheet such as MS Excel and Google Sheet. Usage: benchout_string2csv.sh read benchout string JSON from standard input write CSV to standard output ex: $ cat bench-memset.out | benchout_string2csv.sh > bench-memset.csv --- benchtests/scripts/benchout_string2csv.sh | 44 +++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100755 benchtests/scripts/benchout_string2csv.sh diff --git a/benchtests/scripts/benchout_string2csv.sh b/benchtests/scripts/benchout_string2csv.sh new file mode 100755 index 000000000000..045870fed162 --- /dev/null +++ b/benchtests/scripts/benchout_string2csv.sh @@ -0,0 +1,44 @@ +#!/bin/bash +# Copyright (C) 2021 Free Software Foundation, Inc. +# This file is part of the GNU C Library. +# Contributed by Ulrich Drepper , 1998. + +# The GNU C Library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. + +# The GNU C Library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. + +# You should have received a copy of the GNU Lesser General Public +# License along with the GNU C Library; if not, see +# . + +# +# Convert benchout string JSON to CSV +# +if [[ $1 == "-h" ]] || [[ $# != 0 ]]; then + echo "Usage: ${0##*/}" + echo " read benchout string JSON from standard input" + echo " write CSV to standard output" + echo "ex:" + echo " $ cat bench-memset.out | ${0##*/} > bench-memset.csv" +exit 1 +fi + +jq -r ' + . as $root | + . as {$functions} | + $functions | to_entries | .[0].value as $func_value | + $func_value as {$_, $ifuncs, $results} | + (["timing_type", $root.timing_type] | @csv), + (["functions", ($functions | keys | .[0]), + "bench-variant", $func_value."bench-variant"] | @csv), + ($results[0] | to_entries | map([.key]) | flatten | @csv), + ($results[0] | reduce range(1; . | length) as $_ ([]; . + [""]) + + $ifuncs | @csv), + ($results[] | to_entries | map([.value]) | flatten | @csv) +' From patchwork Tue Jul 20 06:36:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naohiro Tamura X-Patchwork-Id: 44435 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 D8D023985814 for ; Tue, 20 Jul 2021 06:37:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D8D023985814 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626763033; bh=Z1ULZBgmPi2MP3u8XvwXcgxJWZZDhDRou5a4lB2uL8E=; 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=j0KWTzBUds4iYSrEzjPl0np56C7LdBwldPXV00DkioTZ8+sA93tROi4Oz3nPQun8S d4BTccdesRuOPFvTE1+F9LXP6gFtFU9c/8ijMhJgj7UT0ixcns/AVd0v9tXAFYvfFG Bd2ti/0dIRKSADRLvtmU3egZwUy9mhaTxxiNDbeM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa12.hc1455-7.c3s2.iphmx.com (esa12.hc1455-7.c3s2.iphmx.com [139.138.37.100]) by sourceware.org (Postfix) with ESMTPS id 4C79F398580F for ; Tue, 20 Jul 2021 06:36:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4C79F398580F IronPort-SDR: eGVRRFmw73s3P1roA02wph4xqSkAGumdE44lBIE92OEWTLvI8kujAiCMmXFLc8IA3g8qQ4Z1ku YWU1qbGdxmpO6y+t5F1v8ySAZ5Wgf7+ThyOWPenrEW+Qjv4GAu5KEmtq02F/m+BwSR1jEMsqOQ tevjQKQUxvLvSZRxdO0bC/O0EWp/meVbhYmBW4CoXMf7Nd56W9FLOy18uX6S3PRYQBJ/64x9dv /e6oP/eR78PU5lbU240J8yHM/CrjXEu47jOnpinBHSTeaIcS4+LM5TL7bUXyLex3lgobYrjOAb 3PZYA4IsWVP/B2eN7Xi2sN+L X-IronPort-AV: E=McAfee;i="6200,9189,10050"; a="17244015" X-IronPort-AV: E=Sophos;i="5.84,254,1620658800"; d="scan'208";a="17244015" Received: from unknown (HELO yto-r3.gw.nic.fujitsu.com) ([218.44.52.219]) by esa12.hc1455-7.c3s2.iphmx.com with ESMTP; 20 Jul 2021 15:36:32 +0900 Received: from yto-m4.gw.nic.fujitsu.com (yto-nat-yto-m4.gw.nic.fujitsu.com [192.168.83.67]) by yto-r3.gw.nic.fujitsu.com (Postfix) with ESMTP id 9B2421F50CB for ; Tue, 20 Jul 2021 15:36:31 +0900 (JST) Received: from m3051.s.css.fujitsu.com (m3051.s.css.fujitsu.com [10.134.21.209]) by yto-m4.gw.nic.fujitsu.com (Postfix) with ESMTP id E4AC858BEA3 for ; Tue, 20 Jul 2021 15:36:30 +0900 (JST) Received: from bionic.lxd (unknown [10.126.53.116]) by m3051.s.css.fujitsu.com (Postfix) with ESMTP id D60CBA2; Tue, 20 Jul 2021 15:36:30 +0900 (JST) To: Noah Goldstein , Wilco Dijkstra , "Lucas A. M. Magalhaes" , libc-alpha@sourceware.org Subject: [PATCH v2 4/5] benchtests: Remove redundant assert.h Date: Tue, 20 Jul 2021 06:36:27 +0000 Message-Id: <20210720063627.362419-1-naohirot@fujitsu.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210713082214.307529-1-naohirot@fujitsu.com> References: <20210713082214.307529-1-naohirot@fujitsu.com> X-TM-AS-GCONF: 00 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, SPF_HELO_PASS, SPF_NONE, TXREP 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: Naohiro Tamura via Libc-alpha From: Naohiro Tamura Reply-To: Naohiro Tamura Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" This patch removed redundant "#include " from bench-memset-large.c and bench-memset-walk.c. --- benchtests/bench-memset-large.c | 1 - benchtests/bench-memset-walk.c | 1 - 2 files changed, 2 deletions(-) diff --git a/benchtests/bench-memset-large.c b/benchtests/bench-memset-large.c index 97ed78d0d6a1..3fd20b79e53d 100644 --- a/benchtests/bench-memset-large.c +++ b/benchtests/bench-memset-large.c @@ -23,7 +23,6 @@ #define TIMEOUT (20 * 60) #include "bench-string.h" -#include #include "json-lib.h" void *generic_memset (void *, int, size_t); diff --git a/benchtests/bench-memset-walk.c b/benchtests/bench-memset-walk.c index 0dcad09c484f..5fb315384992 100644 --- a/benchtests/bench-memset-walk.c +++ b/benchtests/bench-memset-walk.c @@ -23,7 +23,6 @@ #define TIMEOUT (20 * 60) #include "bench-string.h" -#include #include "json-lib.h" void *generic_memset (void *, int, size_t); From patchwork Tue Jul 20 06:37:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naohiro Tamura X-Patchwork-Id: 44436 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 E91CD3985808 for ; Tue, 20 Jul 2021 06:37:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E91CD3985808 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626763077; bh=vtnme6zsFx6MVE7z98T+KbfjrtZ0HVb6rW4DiikKyhs=; 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=hfxfja/KfVa1IAIGEzGWgMii9adYYX5A+LmZNskcv8QItIvJWBADRpaD6cZDFWiaT jnx/9XASR69AVMM8vaAQxqaw2q5eUjbAblyVdw26MGvGvwNlDx4qCdDKjBTJSK+QIk YS/pemJ5Pjsea9L4BsE30Flz628QfavS1zQhfhfg= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa12.hc1455-7.c3s2.iphmx.com (esa12.hc1455-7.c3s2.iphmx.com [139.138.37.100]) by sourceware.org (Postfix) with ESMTPS id 972133985800 for ; Tue, 20 Jul 2021 06:37:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 972133985800 IronPort-SDR: HjPzBjEi8m3g4hOBmanNYRsaRSVBAFb2zta2LY3j3v0Gczq8f5vd1/hn8JILVx/cJTxDIVDNb6 c/Hadr9hwFYt4hHiUZGyrbkAd+tNNq6Q4k3VBBcZqGF3PriQwdT/8M0JCGHLhuAD034q4gT+Wj HQ/pX5vnfxkQVlJbDO6LZkCC7MyS/VII0S8YwA10S/u/gP5kKUlG5hc0CuE0gIKberfbDpU17Y 1cDAAvsgzKGjXRQvuAvgMqYO/i/tS6J/H0Zown9v6mGKIIX5DHaQ/eZX/+vLh0XS04lm8vy56C gDgih36HEnad86HwzsyJdWOD X-IronPort-AV: E=McAfee;i="6200,9189,10050"; a="17244140" X-IronPort-AV: E=Sophos;i="5.84,254,1620658800"; d="scan'208";a="17244140" Received: from unknown (HELO yto-r2.gw.nic.fujitsu.com) ([218.44.52.218]) by esa12.hc1455-7.c3s2.iphmx.com with ESMTP; 20 Jul 2021 15:37:06 +0900 Received: from yto-m4.gw.nic.fujitsu.com (yto-nat-yto-m4.gw.nic.fujitsu.com [192.168.83.67]) by yto-r2.gw.nic.fujitsu.com (Postfix) with ESMTP id 3AC14A80C2 for ; Tue, 20 Jul 2021 15:37:06 +0900 (JST) Received: from m3050.s.css.fujitsu.com (msm.b.css.fujitsu.com [10.134.21.208]) by yto-m4.gw.nic.fujitsu.com (Postfix) with ESMTP id 879CA58BEAA for ; Tue, 20 Jul 2021 15:37:05 +0900 (JST) Received: from bionic.lxd (unknown [10.126.53.116]) by m3050.s.css.fujitsu.com (Postfix) with ESMTP id 844E3AB; Tue, 20 Jul 2021 15:37:05 +0900 (JST) To: Noah Goldstein , Wilco Dijkstra , "Lucas A. M. Magalhaes" , libc-alpha@sourceware.org Subject: [PATCH v2 5/5] benchtests: Fix validate_benchout.py exceptions Date: Tue, 20 Jul 2021 06:37:03 +0000 Message-Id: <20210720063703.362472-1-naohirot@fujitsu.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210713082214.307529-1-naohirot@fujitsu.com> References: <20210713082214.307529-1-naohirot@fujitsu.com> X-TM-AS-GCONF: 00 X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, SPF_HELO_PASS, SPF_NONE, TXREP 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: Naohiro Tamura via Libc-alpha From: Naohiro Tamura Reply-To: Naohiro Tamura Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" This patch fixed validate_benchout.py two exceptions, AttributeError if benchout_strings.schema.json is specified and json.decoder.JSONDecodeError if benchout is not JSON. --- benchtests/scripts/import_bench.py | 5 ++++- benchtests/scripts/validate_benchout.py | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/benchtests/scripts/import_bench.py b/benchtests/scripts/import_bench.py index a799b4e1b7dc..e3337ca5d638 100644 --- a/benchtests/scripts/import_bench.py +++ b/benchtests/scripts/import_bench.py @@ -104,7 +104,10 @@ def do_for_all_timings(bench, callback): """ for func in bench['functions'].keys(): for k in bench['functions'][func].keys(): - if 'timings' not in bench['functions'][func][k].keys(): + try: + if 'timings' not in bench['functions'][func][k].keys(): + continue + except AttributeError: continue callback(bench, func, k) diff --git a/benchtests/scripts/validate_benchout.py b/benchtests/scripts/validate_benchout.py index 47df33ed0252..00d5fa0ee5eb 100755 --- a/benchtests/scripts/validate_benchout.py +++ b/benchtests/scripts/validate_benchout.py @@ -73,11 +73,15 @@ def main(args): except bench.validator.ValidationError as e: return print_and_exit("Invalid benchmark output: %s" % e.message, - os.EX_DATAERR) + os.EX_DATAERR) except bench.validator.SchemaError as e: return print_and_exit("Invalid schema: %s" % e.message, os.EX_DATAERR) + except json.decoder.JSONDecodeError as e: + return print_and_exit("Benchmark output in %s is not JSON." % args[0], + os.EX_DATAERR) + print("Benchmark output in %s is valid." % args[0]) return os.EX_OK