From patchwork Wed Mar 8 10:53:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilco Dijkstra X-Patchwork-Id: 66122 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 675A33854178 for ; Wed, 8 Mar 2023 10:54:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 675A33854178 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678272851; bh=cqfNpNggPyqFiZn+SeTSDnXR6IQe7GCVxschEKwO8a4=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=CxyroDSfUP/c/C+MzMwne/P/HKri/TmLqi4oJybAaIE/urXrC19NZZyaBb3HtzY8E NoXKOaFtk5X1yUR6l2fwo1/IrlxT/M33TdUTxGK7XMFWpUcMcL3d39wkoUzJB+Xmy8 wY0u12sDfQvbI8R61/F4n38VbQOCUHA5+LVr5otY= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2062a.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::62a]) by sourceware.org (Postfix) with ESMTPS id 1BFDF3857B8E for ; Wed, 8 Mar 2023 10:53:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1BFDF3857B8E Received: from DB6PR0301CA0080.eurprd03.prod.outlook.com (2603:10a6:6:30::27) by DBBPR08MB6315.eurprd08.prod.outlook.com (2603:10a6:10:209::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.29; Wed, 8 Mar 2023 10:53:44 +0000 Received: from DBAEUR03FT009.eop-EUR03.prod.protection.outlook.com (2603:10a6:6:30:cafe::78) by DB6PR0301CA0080.outlook.office365.com (2603:10a6:6:30::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.17 via Frontend Transport; Wed, 8 Mar 2023 10:53:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DBAEUR03FT009.mail.protection.outlook.com (100.127.143.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.18 via Frontend Transport; Wed, 8 Mar 2023 10:53:44 +0000 Received: ("Tessian outbound 2ba0ed2ebb9f:v135"); Wed, 08 Mar 2023 10:53:44 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: bce22d72bcb7e62f X-CR-MTA-TID: 64aa7808 Received: from a1cd7538eaf5.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 960FAFD9-A10D-4070-9256-1817F565603B.1; Wed, 08 Mar 2023 10:53:38 +0000 Received: from EUR01-DB5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id a1cd7538eaf5.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 08 Mar 2023 10:53:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IDUkwPx/IhqXjG5WyM5a0Z+Xa40jAnq6FhsbCR/D5nJay1+utGXhwXfSa+WJ+4Bpc5le49J4b6xkdD6Mkoby4zupYhe3Zj/rZXxNMyXiFzeFsjpGru+T8TnrAiBj4Z11+mBnSzZe/H75xgroWbF5H3kVGM/GLh830qB7ZKUQi6Sv+peIIT2KfFAQeod5Y5Lo65fr97PcITvsfPE0bTGjfaSFXB45+VQ6Y1C6yrU2dZ+5Kbq9lPARQmAyspTfkZZP1Rpj7gIf+7Kz9MQ7YywbwPTYwpqEV+AhZE4RtHCWD0xk00G/5mwmD+6BQkXp4pyTUbB5T6Uh3XZvHZXKN1hVwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cqfNpNggPyqFiZn+SeTSDnXR6IQe7GCVxschEKwO8a4=; b=OAzZRlFOENjVcfsb1hSfFfB43QxE2/tEitOIlF1paTCb6VHcEqfg8SzoMu5l99EDe6NGZIUD0CPGADRoIsS6qCM/IN7H0mdtIPS6ZuxBPbTe2UTyFukF1qRgqawqb+JTp3r5arAWZvFUwdcL/4LXATPde/nwwCdzcfs/lDR0NVpH6Jd1EyZsW4H9KTmr6lKL9Snkzqm8X1XDzcqUsmjsH8ko5HiU6l9C3pSNnnA3lKFHlbO9UK/RwiGqqE6qn1L5/qw4TKVeoRZmYAsPZpBJ9y3Pt60x15HweALFYk8/SYcOM0cGGt70B/CAwokCExB6u/90QVWNl5NuZvIWnIhAEA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none Received: from PAWPR08MB8982.eurprd08.prod.outlook.com (2603:10a6:102:33f::20) by PA4PR08MB6110.eurprd08.prod.outlook.com (2603:10a6:102:e1::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.29; Wed, 8 Mar 2023 10:53:29 +0000 Received: from PAWPR08MB8982.eurprd08.prod.outlook.com ([fe80::dc17:8fa2:cce5:3573]) by PAWPR08MB8982.eurprd08.prod.outlook.com ([fe80::dc17:8fa2:cce5:3573%7]) with mapi id 15.20.6156.025; Wed, 8 Mar 2023 10:53:29 +0000 To: 'GNU C Library' Subject: [PATCH] Benchtests: Remove simple_strcpy_chk Thread-Topic: [PATCH] Benchtests: Remove simple_strcpy_chk Thread-Index: AQHZUawUXAW9WQnt4kWlZRJtkC0F8Q== Date: Wed, 8 Mar 2023 10:53:29 +0000 Message-ID: Accept-Language: en-GB, en-US Content-Language: en-GB X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; x-ms-traffictypediagnostic: PAWPR08MB8982:EE_|PA4PR08MB6110:EE_|DBAEUR03FT009:EE_|DBBPR08MB6315:EE_ X-MS-Office365-Filtering-Correlation-Id: a2bb6291-11fe-46f4-72fe-08db1fc3634d x-checkrecipientrouted: true nodisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 5fHcQG7Eu++RPiPHu9vHPyyhskWNlCfOc3LqD/TwijNiXXXailUemj182d+k51gDCnZG0Xv2MsEUr99aEFm0IcsJKDiekAhSAVGd56072kDnZVIZkrcR/CzBKp6MVebtXp0ma3Huiy7qtACAVX4VSvyZPGIxSaByX0ZsdnawI7A32jAuLSRDNp0lEDSXM1+yx21Cb/p+/wKRrJMZTknPaIOwR6sdc4ys6NtBCIQfgLyKEg1dCqXQq+n1eO691irqCQ1kIeeYrHKYrXA8oPnckbHBBNggDP9rI1TDWlzpnxfQK4Ul2iwxFakMmDC6LZn4bbabf7mn/xX+dGyuGAJd/CJBNP2cNU4PBtRM8SNYGPML9zzTtP167kv9HR6o7a52lyOF4N96u8Q7I4cB05agOO3CTUi69tmfJciZRIp+q9afrSlRPhDgGbdbaipb5sDRoeyMxTocnlTQrH+A2KMBAdrPz12rg2UdJKHA4tb9Xamq8OuuKgrLrp5DDBbRLiAujyhOa1z+PozSGnIBGLaqAKOfw4HBEKsIsFc+CZclAaBUAFaDpHj/hR6+/AHOSSPFay6SVNwXsdxuAzW07jBLvIBhIgXk7j2dTOjb4qej338NpDlqNKvRz0O2uha+DRyw5i3FZeC4BrJmLBLKKzimipRpOh7wtLc5HHnkxGypGW1oO/EuP1ooBz4KVi3O/lvP44PSkuQRISDzquvwPhj31Q== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAWPR08MB8982.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(366004)(396003)(136003)(39860400002)(346002)(376002)(451199018)(91956017)(316002)(66476007)(76116006)(66946007)(8676002)(66556008)(66446008)(64756008)(6916009)(186003)(38100700002)(86362001)(122000001)(9686003)(38070700005)(26005)(55016003)(478600001)(33656002)(6506007)(7696005)(71200400001)(5660300002)(2906002)(41300700001)(52536014)(8936002); DIR:OUT; SFP:1101; MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB6110 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT009.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: be990080-7673-45e9-93bb-08db1fc35a17 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Shq9w3IErFxzRuzw5yDl8OKuC9czquE0Mg3qZPSA5YV7X/lAH7js7okD0FQ7uRcCMe0DyfXbsk14CeUe0mxNOX1/fVandwhM+8laNS/sgzsl+OjNwrmhOYzRAlVxRE4SjxedCiMnZRq7vQziF8Sj5m6q8B0nv4rnYQ/59CFy5oVpS4eUPs5jC/ltjldN3Efn9XxxxUDNf+PFvEdVGMXeDH554Liv3dJ3ixSfJO0EBqpS8pb1KijTb6Bmrey7wyXl41xF574T4HXGIAhLzDq3FddiAn8exLMAFveDYmqBSjjLHYnAY1YTmQaPq1yi8O0teOcbgxHJFhiIiDIgrbg+0rt1P//yofWTKPJiEn9leEVF/4sp574GwjsGvOzPWBp5/YenVsk2mOZzVxl9yrCy7ekH+PaAxz7UihyNTp6RRrOtcrTfb3xmQ9BbFx1Kug1ykJGbpimtDln35rja6QAlv8g7F4RnRq0LrD4cuF2Ni+dGqmXyjOIRqjDYu5fZLEkc1gzV6fP9jQMzhQb8iVFAuBBhQLuWIMBKVAOR/H/mxq/MoFIa7deucNfGYYIoHuOBrfkL2J/GCQUGRtNiabZQL40hMC7IQAP+9geaCkHR2pXostxX46b8kAPC2+m6NJq7Ygyeoon1Ajlg3bXCKAxgtbEZ5YYiFyswip856G93diglHDaz43PXdiruKNfEnN4wUuL/WbugaOi7Vo2RKBATZw== X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(13230025)(4636009)(39860400002)(136003)(376002)(396003)(346002)(451199018)(46966006)(36840700001)(40470700004)(2906002)(5660300002)(8936002)(52536014)(41300700001)(70586007)(70206006)(6916009)(8676002)(33656002)(478600001)(316002)(7696005)(47076005)(40460700003)(6506007)(26005)(40480700001)(82310400005)(336012)(55016003)(9686003)(186003)(81166007)(86362001)(82740400003)(356005)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2023 10:53:44.8004 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a2bb6291-11fe-46f4-72fe-08db1fc3634d X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DBAEUR03FT009.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB6315 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_NONE, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NONE, TXREP, UNPARSEABLE_RELAY 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: Wilco Dijkstra via Libc-alpha From: Wilco Dijkstra Reply-To: Wilco Dijkstra Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Remove the slow byte oriented simple_strcpy_chk and simple_stpcpy_chk. Adjust iteration count to increase benchmark time. Reviewed-by: Adhemerval Zanella diff --git a/benchtests/bench-stpcpy_chk.c b/benchtests/bench-stpcpy_chk.c index aaacd336bad6e5f5f4f420773480749ed05ee9ac..85d5a5e9240110533ca7b25103c2e5e64bc0e948 100644 --- a/benchtests/bench-stpcpy_chk.c +++ b/benchtests/bench-stpcpy_chk.c @@ -22,24 +22,11 @@ #include "bench-string.h" extern void __attribute__ ((noreturn)) __chk_fail (void); -char *simple_stpcpy_chk (char *, const char *, size_t); extern char *normal_stpcpy (char *, const char *, size_t) __asm ("stpcpy"); extern char *__stpcpy_chk (char *, const char *, size_t); -IMPL (simple_stpcpy_chk, 0) IMPL (normal_stpcpy, 1) IMPL (__stpcpy_chk, 2) -char * -simple_stpcpy_chk (char *dst, const char *src, size_t len) -{ - if (! len) - __chk_fail (); - while ((*dst++ = *src++) != '\0') - if (--len == 0) - __chk_fail (); - return dst - 1; -} - #include "bench-strcpy_chk.c" diff --git a/benchtests/bench-strcpy_chk.c b/benchtests/bench-strcpy_chk.c index 6fce90cc9879d7b9bdc5b13a84eaaaadbde97a5b..48ecaaf392201cbce41a6f1520c630d68b59aacb 100644 --- a/benchtests/bench-strcpy_chk.c +++ b/benchtests/bench-strcpy_chk.c @@ -26,26 +26,13 @@ symbol, which is part of the public ABI and may be used externally. */ extern void __attribute__ ((noreturn)) __chk_fail (void); -char *simple_strcpy_chk (char *, const char *, size_t); extern char *normal_strcpy (char *, const char *, size_t) __asm ("strcpy"); extern char *__strcpy_chk (char *, const char *, size_t); -IMPL (simple_strcpy_chk, 0) IMPL (normal_strcpy, 1) IMPL (__strcpy_chk, 2) -char * -simple_strcpy_chk (char *dst, const char *src, size_t len) -{ - char *ret = dst; - if (! len) - __chk_fail (); - while ((*dst++ = *src++) != '\0') - if (--len == 0) - __chk_fail (); - return ret; -} #endif #include @@ -77,7 +64,7 @@ do_one_test (impl_t *impl, char *dst, const char *src, size_t len, size_t dlen) { char *res; - size_t i, iters = INNER_LOOP_ITERS8; + size_t i, iters = INNER_LOOP_ITERS_LARGE; timing_t start, stop, cur; if (dlen <= len)