From patchwork Tue Jun 9 16:08:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Butler X-Patchwork-Id: 39529 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 E84003887003; Tue, 9 Jun 2020 16:08:24 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2055.outbound.protection.outlook.com [40.107.21.55]) by sourceware.org (Postfix) with ESMTPS id 266883840C14 for ; Tue, 9 Jun 2020 16:08:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 266883840C14 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=Alex.Butler@arm.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rw8cTWn682Q/gPmsAOhOp4KFKwGRObpe1Ki8Pb+eauU=; b=wqqAhlnKdEFrArXEiFJpIzdrrF3Il6/x4GBaP1m1Ob/5Dm4yjbrFF3ebeUmZ0GLPvqKofF7FuNr2N/t5iABYKloI2TWbMJVdNIGptN5lF0C0/K0v9SaNP7uqmnlGDZ/yxG1XGyNeNgCS2spOxd6+jY9tA1Lt7EQt83yyezejvW0= Received: from DB6PR0301CA0006.eurprd03.prod.outlook.com (2603:10a6:4:3e::16) by VI1PR0802MB2176.eurprd08.prod.outlook.com (2603:10a6:800:99::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3066.18; Tue, 9 Jun 2020 16:08:16 +0000 Received: from DB5EUR03FT051.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:3e:cafe::da) by DB6PR0301CA0006.outlook.office365.com (2603:10a6:4:3e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3088.18 via Frontend Transport; Tue, 9 Jun 2020 16:08:16 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; sourceware.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; sourceware.org; dmarc=bestguesspass 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; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT051.mail.protection.outlook.com (10.152.21.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3066.18 via Frontend Transport; Tue, 9 Jun 2020 16:08:15 +0000 Received: ("Tessian outbound 1145f7a293ca:v59"); Tue, 09 Jun 2020 16:08:15 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: c97473de26805504 X-CR-MTA-TID: 64aa7808 Received: from 16b30123fba3.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 576A5ABC-6882-4BA3-9529-313075550512.1; Tue, 09 Jun 2020 16:08:09 +0000 Received: from EUR01-DB5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 16b30123fba3.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 09 Jun 2020 16:08:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l7M8qSgLg1RNJXzr97PgsxLxgiRPhR1h32Kp/uvOebra992cYiNvGxABMwQShjMQ1akEhz8Rmqj2WaoCD0dTe1FRe+R29V/4llEC/9Ewj+zTeLYzZoo3F/CFFOwM1htEFjirkDUCBY31kJKE1Xq+rvQmMGuqWICO4lW/Z9ndWzBxfXPzE3yxvOFgqLortmg0HApSaCp31jgWY+L593Xxa42qLkCRWOfxp3oKSK6RpQiEZ5nME8dTJjcw7ZkCkBPa1/PD8atuMV3hylmZdjQJ4qL+qgVg5uD0tlAJqn4BdcQekEM4ziZ98c2YRTOAdE1czpJOLTU++ItHPMw+jhx3cw== 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-SenderADCheck; bh=rw8cTWn682Q/gPmsAOhOp4KFKwGRObpe1Ki8Pb+eauU=; b=Gg0nmFGh2S84s4vAobJ/HYcP6hILmkJN/3sRAIo2CNkP6yNo54W2wqLm90WHJDJCrC1M4Mwyz78eaiSaPgdpvgbe5wFaqxQcrzLdePzxFl2WBBl4M0qDcaS3clTOXXuPJ6vHbIVhCCSSAJjVaDWmm1Ux6Kcy2CArG4ilzXsBIB2UnWNAvJXJ/hbU4z5auIXLgNQ54lIxxwgLUSeV3p9wYAKgrIwGOQ4Of8HEN8YODiXXmrGor5C2tHRaLUfB8fruU2jW4MXh/XLnDCDiTWuFq1xbqcuioRYfyCw/Hgw7t4yIuBAWphDYQF1AxH1qsVdJGnsrztqDP42+tOCx9mKbdg== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rw8cTWn682Q/gPmsAOhOp4KFKwGRObpe1Ki8Pb+eauU=; b=wqqAhlnKdEFrArXEiFJpIzdrrF3Il6/x4GBaP1m1Ob/5Dm4yjbrFF3ebeUmZ0GLPvqKofF7FuNr2N/t5iABYKloI2TWbMJVdNIGptN5lF0C0/K0v9SaNP7uqmnlGDZ/yxG1XGyNeNgCS2spOxd6+jY9tA1Lt7EQt83yyezejvW0= Received: from VI1PR08MB3663.eurprd08.prod.outlook.com (2603:10a6:803:85::26) by VI1PR08MB5485.eurprd08.prod.outlook.com (2603:10a6:803:138::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3066.19; Tue, 9 Jun 2020 16:08:08 +0000 Received: from VI1PR08MB3663.eurprd08.prod.outlook.com ([fe80::dda9:2735:3473:b60c]) by VI1PR08MB3663.eurprd08.prod.outlook.com ([fe80::dda9:2735:3473:b60c%6]) with mapi id 15.20.3066.023; Tue, 9 Jun 2020 16:08:07 +0000 From: Alex Butler To: "libc-alpha@sourceware.org" Subject: [PATCH] aarch64: MTE compatible memrchr Thread-Topic: [PATCH] aarch64: MTE compatible memrchr Thread-Index: AQHWPnf4BA1UdJGpikitutRZ7YW/Qw== Date: Tue, 9 Jun 2020 16:08:07 +0000 Message-ID: Accept-Language: en-GB, en-US Content-Language: en-GB X-MS-Has-Attach: yes X-MS-TNEF-Correlator: Authentication-Results-Original: sourceware.org; dkim=none (message not signed) header.d=none;sourceware.org; dmarc=none action=none header.from=arm.com; x-originating-ip: [82.70.46.126] x-ms-publictraffictype: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 1e9d1097-a5b4-4b50-6682-08d80c8f5162 x-ms-traffictypediagnostic: VI1PR08MB5485:|VI1PR0802MB2176: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true nodisclaimer: true x-ms-oob-tlc-oobclassifiers: OLM:9508;OLM:9508; x-forefront-prvs: 042957ACD7 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: zpXCTOR07K7vjT7S0MOejAd3wk61hZ7hLz9N8LRZIuUikGaYY09xAiz2/y6/pklKhlsaG/qByMI3mXHfZC7YHtoqFpaBu5WbX2OYLLBrWZpCzdCLC/cPyri+hw+hazp124cSoCD0uhxhrvysKdWYGQjQEbDObafawIc12SddnkRNDNUQaF4Xh2ldB0C18rGMrGzMMF3g34I1voXwluLz1yxiFOeRpC5rQUPt9gfW8oggBGxS/Hg2DWhuz4r05Ui4Ss5JzadpwFnuTWV5bdr1WIouZkwzcoeutpZYZIezlHjeXpbklVqvsSx1cd1heKHdW+2QkH+9CWZpKmWXcO1+KQ== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR08MB3663.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(136003)(366004)(376002)(346002)(396003)(39860400002)(6506007)(5660300002)(66476007)(8676002)(99936003)(52536014)(6916009)(66616009)(8936002)(30864003)(66446008)(91956017)(66946007)(26005)(76116006)(64756008)(33656002)(66556008)(186003)(2906002)(9686003)(55016002)(86362001)(478600001)(316002)(71200400001)(7696005)(19627405001)(83380400001)(579004); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: vD/MQVrpHmkbSQCrESe9e6T6wkFRDo+aeDEDMdfQ+x87RS7RtcPdqsFjAAGQfDXXx4xO/HiXvuMML8aSYcbLMUqAazYa/Kthem2AeMpizzQhclrbhF8LcV5XdljIV1PxW8fF8gqDSLG5Tp0cf/bsvqJLVlFsWviEFNbNxbMy3waGWW8WbkJMskqeCJ/1DMP8J2MbNaTtTsMYvVoiCXRtfQHfbJEIdxvzbJZDiliHrZXMLoWKJ/1+HxlAb/CHSS14YEu1yuq3CJwy321ekSWmkJMWLFINfKrhkM7bpZTmDPsDda/4jcKWLcmtw+msZ4MFOfpRlgEGihXxUzyokq4IQ6s0gbXTpb4XBanI9RG/b/WXELAw6azGkv0S3Nl9m4tgHcMHpRJ9hNYz1LGiQUf/kS6htYgREXyvIyYgSvmzKDXQZbyjV5CSaDgz7sNVSEootGiQpEG5Kad8PTX1QKkUrDVHZqJgqSOj7thNU5WMtEE= x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB5485 Original-Authentication-Results: sourceware.org; dkim=none (message not signed) header.d=none; sourceware.org; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT051.eop-EUR03.prod.protection.outlook.com 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; SFTY:; SFS:(4636009)(39860400002)(136003)(396003)(346002)(376002)(46966005)(8936002)(8676002)(9686003)(478600001)(316002)(86362001)(7696005)(55016002)(6916009)(5660300002)(235185007)(81166007)(70586007)(70206006)(19627405001)(83380400001)(66616009)(47076004)(186003)(356005)(99936003)(82310400002)(33656002)(52536014)(30864003)(26005)(6506007)(2906002)(82740400003)(336012)(559001)(579004); DIR:OUT; SFP:1101; X-MS-Office365-Filtering-Correlation-Id-Prvs: 20af8ddb-36a4-4605-2073-08d80c8f4cb3 X-Forefront-PRVS: 042957ACD7 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bP/UdJy9X+wijPELDg0TSn2OUXnzkyjIO1Ls4cSXXvt1uf6tCjmHGtNypkKGa5GjkIN0FHytvJ2oRXZqwm07uEqEUAdv2LJbQ+wRclPAOM/qdpv34Ejv8Y5rKXx1cztIKO3Ig9gpc31nRe7BhceCiokIAdSWuEWlx4Ge/AhLir0cPVqF8gBIZsz889DoJige7GtGZn9Ug8lP5FmE7/3qD9U7aesu1knG08RvzGtMduUbgNAsUnN24CQlTiy76noLZEFsQjyZSyZjueUVV9vfYPdiq152j27MWalycIKjUZQEoMKBlNKUulPZ78GgQrfGJGKjmimtaU6GDMPmRrLpfDHHu5vqDTfp6RafpLIvIDV6ErVj7sMnB2Yztv3k4ub+Kp+vP59ZjZwMPGjFr7fnow== X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2020 16:08:15.8105 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1e9d1097-a5b4-4b50-6682-08d80c8f5162 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-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0802MB2176 X-Spam-Status: No, score=-17.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, HTML_MESSAGE, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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: , Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" This patch adds an MTE compatible implementation of memrchr. Please see the benchmark results for the performance uplift. | length | position | alignment | uplift A72 | uplift A53 | uplift N1 | |--------+----------+-----------+-------------|-------------|-------------| | 2048 | 32 | 0 | 0.87x | 0.81x | 0.87x | | 256 | 64 | 1 | 1.03x | 0.93x | 0.99x | | 2048 | 32 | 0 | 0.88x | 0.81x | 0.87x | | 256 | 64 | 1 | 1.06x | 0.93x | 1.01x | | 256 | 1 | 0 | 0.95x | 0.85x | 0.89x | | 256 | 1 | 0 | 0.93x | 0.85x | 0.91x | | 256 | 1 | 1 | 1.01x | 0.92x | 1.03x | | 256 | 1 | 1 | 1.00x | 0.91x | 1.01x | | 2048 | 64 | 0 | 0.89x | 0.81x | 0.88x | | 256 | 64 | 2 | 1.06x | 0.93x | 0.99x | | 2048 | 64 | 0 | 0.89x | 0.81x | 0.88x | | 256 | 64 | 2 | 1.07x | 0.93x | 0.99x | | 256 | 2 | 0 | 0.94x | 0.85x | 0.94x | | 256 | 2 | 0 | 0.93x | 0.85x | 0.94x | | 256 | 2 | 2 | 1.01x | 0.91x | 1.02x | | 256 | 2 | 2 | 1.01x | 0.91x | 1.02x | | 2048 | 128 | 0 | 0.89x | 0.81x | 0.87x | | 256 | 64 | 3 | 1.04x | 0.93x | 1.02x | | 2048 | 128 | 0 | 0.88x | 0.81x | 0.86x | | 256 | 64 | 3 | 1.04x | 0.93x | 1.00x | | 256 | 3 | 0 | 0.93x | 0.85x | 0.92x | | 256 | 3 | 0 | 0.93x | 0.85x | 0.94x | | 256 | 3 | 3 | 1.01x | 0.91x | 1.00x | | 256 | 3 | 3 | 1.01x | 0.91x | 0.99x | | 2048 | 256 | 0 | 0.89x | 0.81x | 0.87x | | 256 | 64 | 4 | 1.05x | 0.93x | 0.99x | | 2048 | 256 | 0 | 0.89x | 0.81x | 0.87x | | 256 | 64 | 4 | 1.03x | 0.93x | 1.01x | | 256 | 4 | 0 | 0.93x | 0.85x | 0.91x | | 256 | 4 | 0 | 0.91x | 0.85x | 0.90x | | 256 | 4 | 4 | 1.00x | 0.91x | 1.02x | | 256 | 4 | 4 | 1.00x | 0.91x | 1.03x | | 2048 | 512 | 0 | 0.91x | 0.81x | 0.87x | | 256 | 64 | 5 | 1.01x | 0.93x | 0.99x | | 2048 | 512 | 0 | 0.91x | 0.81x | 0.87x | | 256 | 64 | 5 | 1.03x | 0.93x | 0.99x | | 256 | 5 | 0 | 0.95x | 0.85x | 0.92x | | 256 | 5 | 0 | 0.94x | 0.85x | 0.91x | | 256 | 5 | 5 | 0.99x | 0.92x | 1.01x | | 256 | 5 | 5 | 0.99x | 0.91x | 1.02x | | 2048 | 1024 | 0 | 0.92x | 0.82x | 0.86x | | 256 | 64 | 6 | 1.05x | 0.93x | 1.00x | | 2048 | 1024 | 0 | 0.92x | 0.82x | 0.86x | | 256 | 64 | 6 | 1.01x | 0.93x | 1.01x | | 256 | 6 | 0 | 0.94x | 0.85x | 0.91x | | 256 | 6 | 0 | 0.92x | 0.85x | 0.91x | | 256 | 6 | 6 | 1.00x | 0.91x | 0.99x | | 256 | 6 | 6 | 1.00x | 0.92x | 0.98x | | 2048 | 2048 | 0 | 0.87x | 0.81x | 0.87x | | 256 | 64 | 7 | 1.04x | 0.93x | 1.00x | | 2048 | 2048 | 0 | 0.87x | 0.81x | 0.88x | | 256 | 64 | 7 | 1.03x | 0.93x | 0.99x | | 256 | 7 | 0 | 0.93x | 0.85x | 0.92x | | 256 | 7 | 0 | 0.93x | 0.85x | 0.92x | | 256 | 7 | 7 | 1.00x | 0.91x | 1.00x | | 256 | 7 | 7 | 1.00x | 0.91x | 1.02x | | 2 | 1 | 0 | 1.26x | 1.82x | 1.73x | | 2 | 1 | 0 | 1.26x | 1.82x | 1.74x | | 2 | 1 | 1 | 1.26x | 1.78x | 1.73x | | 2 | 1 | 1 | 1.26x | 1.76x | 1.73x | | 2 | 1 | 0 | 1.26x | 1.78x | 1.72x | | 2 | 2 | 0 | 1.36x | 1.50x | 1.72x | | 3 | 2 | 0 | 1.26x | 1.77x | 1.73x | | 3 | 2 | 0 | 1.26x | 1.75x | 1.53x | | 3 | 2 | 2 | 1.26x | 1.78x | 1.52x | | 3 | 2 | 2 | 1.26x | 1.77x | 1.54x | | 3 | 1 | 0 | 1.26x | 1.77x | 1.54x | | 3 | 2 | 0 | 1.26x | 1.82x | 1.54x | | 4 | 3 | 0 | 1.26x | 1.80x | 1.54x | | 4 | 3 | 0 | 1.26x | 1.82x | 1.54x | | 4 | 3 | 3 | 1.26x | 1.76x | 1.55x | | 4 | 3 | 3 | 1.26x | 1.78x | 1.54x | | 4 | 1 | 0 | 1.26x | 1.80x | 1.54x | | 4 | 2 | 0 | 1.26x | 1.78x | 1.55x | | 5 | 4 | 0 | 1.26x | 1.78x | 1.54x | | 5 | 4 | 0 | 1.26x | 1.82x | 1.54x | | 5 | 4 | 4 | 1.26x | 1.77x | 1.53x | | 5 | 4 | 4 | 1.26x | 1.75x | 1.54x | | 5 | 1 | 0 | 1.26x | 1.77x | 1.54x | | 5 | 2 | 0 | 1.26x | 1.81x | 1.54x | | 6 | 5 | 0 | 1.26x | 1.78x | 1.84x | | 6 | 5 | 0 | 1.26x | 1.75x | 1.86x | | 6 | 5 | 5 | 1.26x | 1.78x | 1.73x | | 6 | 5 | 5 | 1.26x | 1.75x | 1.73x | | 6 | 1 | 0 | 1.26x | 1.77x | 1.74x | | 6 | 2 | 0 | 1.26x | 1.77x | 1.73x | | 7 | 6 | 0 | 1.26x | 1.76x | 1.54x | | 7 | 6 | 0 | 1.26x | 1.78x | 1.60x | | 7 | 6 | 6 | 1.26x | 1.76x | 1.60x | | 7 | 6 | 6 | 1.26x | 1.82x | 1.61x | | 7 | 1 | 0 | 1.26x | 1.80x | 1.60x | | 7 | 2 | 0 | 1.26x | 1.82x | 1.60x | | 8 | 7 | 0 | 1.26x | 1.80x | 1.54x | | 8 | 7 | 0 | 1.26x | 1.82x | 1.54x | | 8 | 7 | 7 | 1.26x | 1.76x | 1.53x | | 8 | 7 | 7 | 1.26x | 1.78x | 1.53x | | 8 | 1 | 0 | 1.26x | 1.76x | 1.54x | | 8 | 2 | 0 | 1.26x | 1.82x | 1.54x | | 9 | 8 | 0 | 1.26x | 1.82x | 1.83x | | 9 | 8 | 0 | 1.26x | 1.76x | 1.83x | | 9 | 8 | 0 | 1.26x | 1.82x | 1.84x | | 9 | 8 | 0 | 1.26x | 1.82x | 1.85x | | 9 | 1 | 0 | 1.26x | 1.79x | 1.83x | | 9 | 2 | 0 | 1.26x | 1.82x | 1.84x | | 10 | 9 | 0 | 1.26x | 1.78x | 1.83x | | 10 | 9 | 0 | 1.26x | 1.78x | 1.85x | | 10 | 9 | 1 | 1.26x | 1.82x | 1.84x | | 10 | 9 | 1 | 1.26x | 1.82x | 1.84x | | 10 | 1 | 0 | 1.26x | 1.82x | 1.86x | | 10 | 2 | 0 | 1.26x | 1.82x | 1.83x | | 11 | 10 | 0 | 1.26x | 1.82x | 1.83x | | 11 | 10 | 0 | 1.26x | 1.75x | 1.85x | | 11 | 10 | 2 | 1.26x | 1.77x | 1.85x | | 11 | 10 | 2 | 1.26x | 1.75x | 1.85x | | 11 | 1 | 0 | 1.26x | 1.77x | 1.84x | | 11 | 2 | 0 | 1.26x | 1.81x | 1.92x | | 12 | 11 | 0 | 1.26x | 1.82x | 1.92x | | 12 | 11 | 0 | 1.26x | 1.78x | 1.83x | | 12 | 11 | 3 | 1.26x | 1.76x | 1.85x | | 12 | 11 | 3 | 1.26x | 1.78x | 1.84x | | 12 | 1 | 0 | 1.26x | 1.76x | 1.84x | | 12 | 2 | 0 | 1.26x | 1.82x | 1.84x | | 13 | 12 | 0 | 1.26x | 1.82x | 1.84x | | 13 | 12 | 0 | 1.26x | 1.75x | 1.85x | | 13 | 12 | 4 | 1.26x | 1.78x | 1.92x | | 13 | 12 | 4 | 1.26x | 1.75x | 1.81x | | 13 | 1 | 0 | 1.26x | 1.78x | 1.81x | | 13 | 2 | 0 | 1.26x | 1.82x | 1.73x | | 14 | 13 | 0 | 1.26x | 1.82x | 1.72x | | 14 | 13 | 0 | 1.26x | 1.76x | 1.73x | | 14 | 13 | 5 | 1.26x | 1.78x | 1.85x | | 14 | 13 | 5 | 1.26x | 1.76x | 1.84x | | 14 | 1 | 0 | 1.26x | 1.78x | 1.84x | | 14 | 2 | 0 | 1.26x | 1.82x | 1.84x | | 15 | 14 | 0 | 1.26x | 1.82x | 1.86x | | 15 | 14 | 0 | 1.26x | 1.79x | 1.83x | | 15 | 14 | 6 | 1.26x | 1.77x | 1.84x | | 15 | 14 | 6 | 1.26x | 1.79x | 1.92x | | 15 | 1 | 0 | 1.26x | 1.81x | 1.91x | | 15 | 2 | 0 | 1.26x | 1.82x | 1.84x | | 16 | 15 | 0 | 1.26x | 1.82x | 1.55x | | 16 | 15 | 0 | 1.26x | 1.82x | 1.54x | | 16 | 15 | 7 | 1.26x | 1.78x | 1.54x | | 16 | 15 | 7 | 1.26x | 1.76x | 1.53x | | 16 | 1 | 0 | 1.26x | 1.82x | 1.54x | | 16 | 2 | 0 | 1.26x | 1.82x | 1.52x | | 17 | 16 | 0 | 1.26x | 1.82x | 1.54x | | 17 | 16 | 0 | 1.26x | 1.77x | 1.54x | | 17 | 16 | 0 | 1.26x | 1.82x | 1.54x | | 17 | 16 | 0 | 1.26x | 1.77x | 1.54x | | 17 | 1 | 0 | 1.17x | 1.17x | 1.07x | | 17 | 2 | 0 | 1.17x | 1.19x | 1.06x | | 18 | 17 | 0 | 1.26x | 1.82x | 1.47x | | 18 | 17 | 0 | 1.26x | 1.82x | 1.53x | | 18 | 17 | 1 | 1.26x | 1.78x | 1.53x | | 18 | 17 | 1 | 1.26x | 1.77x | 1.54x | | 18 | 1 | 0 | 1.17x | 1.18x | 1.06x | | 18 | 2 | 0 | 1.17x | 1.19x | 1.06x | | 19 | 18 | 0 | 1.26x | 1.82x | 1.54x | | 19 | 18 | 0 | 1.26x | 1.79x | 1.53x | | 19 | 18 | 2 | 1.26x | 1.77x | 1.54x | | 19 | 18 | 2 | 1.26x | 1.82x | 1.45x | | 19 | 1 | 0 | 1.17x | 1.16x | 1.25x | | 19 | 2 | 0 | 1.17x | 1.18x | 1.26x | | 20 | 19 | 0 | 1.26x | 1.82x | 1.84x | | 20 | 19 | 0 | 1.26x | 1.82x | 1.84x | | 20 | 19 | 3 | 1.26x | 1.78x | 1.82x | | 20 | 19 | 3 | 1.26x | 1.78x | 1.84x | | 20 | 1 | 0 | 1.17x | 1.16x | 1.26x | | 20 | 2 | 0 | 1.17x | 1.19x | 1.25x | | 21 | 20 | 0 | 1.26x | 1.82x | 1.73x | | 21 | 20 | 0 | 1.26x | 1.82x | 1.73x | | 21 | 20 | 4 | 1.26x | 1.78x | 1.74x | | 21 | 20 | 4 | 1.26x | 1.76x | 1.72x | | 21 | 1 | 0 | 1.17x | 1.16x | 1.26x | | 21 | 2 | 0 | 1.17x | 1.19x | 1.26x | | 22 | 21 | 0 | 1.26x | 1.78x | 1.54x | | 22 | 21 | 0 | 1.26x | 1.76x | 1.54x | | 22 | 21 | 5 | 1.26x | 1.78x | 1.53x | | 22 | 21 | 5 | 1.26x | 1.76x | 1.53x | | 22 | 1 | 0 | 1.17x | 1.18x | 1.06x | | 22 | 2 | 0 | 1.17x | 1.19x | 1.25x | | 23 | 22 | 0 | 1.26x | 1.78x | 1.83x | | 23 | 22 | 0 | 1.26x | 1.82x | 1.85x | | 23 | 22 | 6 | 1.26x | 1.78x | 1.85x | | 23 | 22 | 6 | 1.26x | 1.78x | 1.85x | | 23 | 1 | 0 | 1.17x | 1.14x | 1.24x | | 23 | 2 | 0 | 1.17x | 1.19x | 1.22x | | 24 | 23 | 0 | 1.26x | 1.82x | 1.83x | | 24 | 23 | 0 | 1.26x | 1.82x | 1.54x | | 24 | 23 | 7 | 1.26x | 1.77x | 1.55x | | 24 | 23 | 7 | 1.26x | 1.79x | 1.54x | | 24 | 1 | 0 | 1.17x | 1.15x | 1.06x | | 24 | 2 | 0 | 1.17x | 1.19x | 1.06x | | 25 | 24 | 0 | 1.26x | 1.82x | 1.53x | | 25 | 24 | 0 | 1.26x | 1.79x | 1.55x | | 25 | 24 | 0 | 1.26x | 1.76x | 1.54x | | 25 | 24 | 0 | 1.26x | 1.79x | 1.84x | | 25 | 1 | 0 | 1.17x | 1.15x | 1.24x | | 25 | 2 | 0 | 1.17x | 1.19x | 1.26x | | 26 | 25 | 0 | 1.26x | 1.82x | 1.53x | | 26 | 25 | 0 | 1.26x | 1.78x | 1.54x | | 26 | 25 | 1 | 1.26x | 1.76x | 1.55x | | 26 | 25 | 1 | 1.26x | 1.78x | 1.54x | | 26 | 1 | 0 | 1.17x | 1.14x | 1.06x | | 26 | 2 | 0 | 1.17x | 1.19x | 1.07x | | 27 | 26 | 0 | 1.26x | 1.82x | 1.85x | | 27 | 26 | 0 | 1.26x | 1.76x | 1.84x | | 27 | 26 | 2 | 1.26x | 1.78x | 1.84x | | 27 | 26 | 2 | 1.26x | 1.76x | 1.85x | | 27 | 1 | 0 | 1.17x | 1.16x | 1.26x | | 27 | 2 | 0 | 1.17x | 1.19x | 1.18x | | 28 | 27 | 0 | 1.26x | 1.82x | 1.84x | | 28 | 27 | 0 | 1.26x | 1.82x | 1.84x | | 28 | 27 | 3 | 1.26x | 1.78x | 1.79x | | 28 | 27 | 3 | 1.26x | 1.76x | 1.73x | | 28 | 1 | 0 | 1.17x | 1.16x | 1.26x | | 28 | 2 | 0 | 1.17x | 1.19x | 1.27x | | 29 | 28 | 0 | 1.26x | 1.82x | 1.80x | | 29 | 28 | 0 | 1.26x | 1.76x | 1.81x | | 29 | 28 | 4 | 1.16x | 1.54x | 1.58x | | 29 | 28 | 4 | 1.16x | 1.54x | 1.53x | | 29 | 1 | 0 | 1.17x | 1.14x | 1.23x | | 29 | 2 | 0 | 1.17x | 1.19x | 1.26x | | 30 | 29 | 0 | 1.26x | 1.82x | 1.84x | | 30 | 29 | 0 | 1.26x | 1.78x | 1.83x | | 30 | 29 | 5 | 1.15x | 1.53x | 1.57x | | 30 | 29 | 5 | 1.15x | 1.54x | 1.52x | | 30 | 1 | 0 | 1.17x | 1.19x | 1.26x | | 30 | 2 | 0 | 1.17x | 1.19x | 1.26x | | 31 | 30 | 0 | 1.26x | 1.82x | 1.83x | | 31 | 30 | 0 | 1.26x | 1.75x | 1.84x | | 31 | 30 | 6 | 1.16x | 1.53x | 1.58x | | 31 | 30 | 6 | 1.15x | 1.54x | 1.53x | | 31 | 1 | 0 | 1.17x | 1.17x | 1.26x | | 31 | 2 | 0 | 1.17x | 1.19x | 1.26x | | 32 | 31 | 0 | 1.19x | 1.61x | 1.63x | | 32 | 31 | 0 | 1.19x | 1.61x | 1.62x | | 32 | 31 | 7 | 1.15x | 1.54x | 1.58x | | 32 | 31 | 7 | 1.16x | 1.54x | 1.52x | | 32 | 1 | 0 | 1.11x | 1.05x | 1.11x | | 32 | 2 | 0 | 1.11x | 1.05x | 1.12x | This patch passes the tests with no regressions. 8< --- 8< --- 8< Add support for MTE to memrchr. Regression tested with xcheck and benchmarked with glibc's benchtests on the Cortex-A53, Cortex-A72, and Neoverse N1. The existing implementation assumes that any access to the pages in which the string resides is safe. This assumption is not true when MTE is enabled. This patch updates the algorithm to ensure that accesses remain within the bounds of an MTE tag (16-byte chunks) and improves overall performance. Co-authored-by: Wilco Dijkstra From 4b59f2c1dd07df6e5c2f48a085f5dac079fdfcbd Mon Sep 17 00:00:00 2001 From: Alex Butler Date: Wed, 13 May 2020 23:38:05 +0100 Subject: [PATCH] aarch64: add MTE compatible memrchr --- sysdeps/aarch64/memrchr.S | 199 +++++++++++++++++++--------------------------- 1 file changed, 83 insertions(+), 116 deletions(-) diff --git a/sysdeps/aarch64/memrchr.S b/sysdeps/aarch64/memrchr.S index ace5a94..c25f430 100644 --- a/sysdeps/aarch64/memrchr.S +++ b/sysdeps/aarch64/memrchr.S @@ -22,144 +22,111 @@ /* Assumptions: * - * ARMv8-a, AArch64 - * Neon Available. + * ARMv8-a, AArch64, Advanced SIMD. + * MTE compatible. */ /* Arguments and results. */ #define srcin x0 #define chrin w1 #define cntin x2 - -#define seek_dstin x11 -#define seek_dst x12 #define result x0 #define src x3 -#define tmp x4 -#define wtmp2 w5 -#define synd x6 -#define soff x9 -#define cntrem x10 +#define cntrem x4 +#define synd x5 +#define shift x6 +#define tmp x7 +#define wtmp w7 +#define end x8 +#define endm1 x9 #define vrepchr v0 -#define vdata1 v1 -#define vdata2 v2 - -#define vhas_chr1 v3 -#define vhas_chr2 v4 -#define vrepmask v5 -#define vend v6 +#define qdata q1 +#define vdata v1 +#define vhas_chr v2 +#define vrepmask v3 +#define vend v4 +#define dend d4 /* - * Core algorithm: - * - * For each 32-byte chunk we calculate a 64-bit syndrome value, with two bits - * per byte. For each tuple, bit 0 is set if the relevant byte matched the - * requested character and bit 1 is not used (faster than using a 32bit - * syndrome). Since the bits in the syndrome reflect exactly the order in which - * things occur in the original string, counting trailing zeros allows to - * identify exactly which byte has matched. - */ + Core algorithm: + For each 16-byte chunk we calculate a 64-bit syndrome value with four bits + per byte. For even bytes, bits 0-3 are set if the relevant byte matched the + requested character or the byte is NUL. Bits 4-7 must be zero. Bits 4-7 are + set likewise for odd bytes so that adjacent bytes can be merged. Since the + bits in the syndrome reflect the order in which things occur in the original + string, counting trailing zeros identifies exactly which byte matched. */ ENTRY (__memrchr) - /* Do not dereference srcin if no bytes to compare. */ - cbz cntin, L(zero_length) - /* - * Magic constant 0x40100401 allows us to identify which lane matches - * the requested byte. - */ - mov wtmp2, #0x0401 - movk wtmp2, #0x4010, lsl #16 + DELOUSE (0) + DELOUSE (2) + add end, srcin, cntin + sub endm1, end, 1 + bic src, endm1, 15 + cbz cntin, L(nomatch) + ld1 {vdata.16b}, [src] dup vrepchr.16b, chrin - /* Work with aligned 32-byte chunks */ - add seek_dstin, cntin, srcin - add tmp, seek_dstin, #31 - bic seek_dst, tmp, #31 - dup vrepmask.4s, wtmp2 - ands soff, seek_dstin, #31 - mov tmp, #32 - sub soff,tmp,soff - and cntrem, cntin, #31 - b.eq L(loop) - - /* - * Input string is not 32-byte aligned. We calculate the syndrome - * value for the aligned 32 bytes block containing the first bytes - * and mask the irrelevant part. - */ - - sub seek_dst, seek_dst, #32 - ld1 {vdata1.16b, vdata2.16b}, [seek_dst] - sub tmp, soff, #32 - adds cntin, cntin, tmp - cmeq vhas_chr1.16b, vdata1.16b, vrepchr.16b - cmeq vhas_chr2.16b, vdata2.16b, vrepchr.16b - and vhas_chr1.16b, vhas_chr1.16b, vrepmask.16b - and vhas_chr2.16b, vhas_chr2.16b, vrepmask.16b - addp vend.16b, vhas_chr1.16b, vhas_chr2.16b /* 256->128 */ - addp vend.16b, vend.16b, vend.16b /* 128->64 */ - mov synd, vend.2d[0] - /* Clear the (32-soff)*2 upper bits */ - lsl tmp, soff, #1 - lsl synd, synd, tmp - lsr synd, synd, tmp - /* The first block can also be the last */ - b.ls L(masklast) - /* Have we found something already? */ - cbnz synd, L(tail) - -L(loop): - sub seek_dst, seek_dst, #32 - ld1 {vdata1.16b, vdata2.16b}, [seek_dst] - subs cntin, cntin, #32 - cmeq vhas_chr1.16b, vdata1.16b, vrepchr.16b - cmeq vhas_chr2.16b, vdata2.16b, vrepchr.16b - /* If we're out of data we finish regardless of the result */ - b.ls L(end) - /* Use a fast check for the termination condition */ - orr vend.16b, vhas_chr1.16b, vhas_chr2.16b - addp vend.2d, vend.2d, vend.2d - mov synd, vend.2d[0] - /* We're not out of data, loop if we haven't found the character */ - cbz synd, L(loop) + mov wtmp, 0xf00f + dup vrepmask.8h, wtmp + cmeq vhas_chr.16b, vdata.16b, vrepchr.16b + neg shift, end, lsl 2 + and vhas_chr.16b, vhas_chr.16b, vrepmask.16b + addp vend.16b, vhas_chr.16b, vhas_chr.16b /* 128->64 */ + fmov synd, dend + lsl synd, synd, shift + cbz synd, L(start_loop) + clz synd, synd + sub result, endm1, synd, lsr 2 + cmp cntin, synd, lsr 2 + csel result, result, xzr, hi + ret + +L(start_loop): + sub tmp, end, src + subs cntrem, cntin, tmp + b.ls L(nomatch) + + /* Make sure that it won't overread by a 16-byte chunk */ + add tmp, cntrem, 15 + tbnz tmp, 4, L(loop32_2) + + .p2align 4 +L(loop32): + ldr qdata, [src, -16]! + cmeq vhas_chr.16b, vdata.16b, vrepchr.16b + umaxp vend.16b, vhas_chr.16b, vhas_chr.16b /* 128->64 */ + fmov synd, dend + cbnz synd, L(end) + +L(loop32_2): + ldr qdata, [src, -16]! + subs cntrem, cntrem, 32 + cmeq vhas_chr.16b, vdata.16b, vrepchr.16b + b.ls L(end) + umaxp vend.16b, vhas_chr.16b, vhas_chr.16b /* 128->64 */ + fmov synd, dend + cbz synd, L(loop32) L(end): - /* Termination condition found, let's calculate the syndrome value */ - and vhas_chr1.16b, vhas_chr1.16b, vrepmask.16b - and vhas_chr2.16b, vhas_chr2.16b, vrepmask.16b - addp vend.16b, vhas_chr1.16b, vhas_chr2.16b /* 256->128 */ - addp vend.16b, vend.16b, vend.16b /* 128->64 */ - mov synd, vend.2d[0] - /* Only do the clear for the last possible block */ - b.hi L(tail) - -L(masklast): - /* Clear the (32 - ((cntrem + (32-soff)) % 32)) * 2 lower bits */ - add tmp, cntrem, soff - and tmp, tmp, #31 - sub tmp, tmp, #32 - neg tmp, tmp, lsl #1 - lsr synd, synd, tmp - lsl synd, synd, tmp - -L(tail): - /* Compensate the last post-increment*/ - add seek_dst, seek_dst, #32 - /* Check that we have found a character */ - cmp synd, #0 - /* And count the leading zeros */ + and vhas_chr.16b, vhas_chr.16b, vrepmask.16b + addp vend.16b, vhas_chr.16b, vhas_chr.16b /* 128->64 */ + fmov synd, dend + + add tmp, src, 15 +#ifdef __AARCH64EB__ + rbit synd, synd +#endif clz synd, synd - /* Compute the potential result */ - sub result, seek_dst, synd, lsr #1 - sub result, result, #1 - /* Select result or NULL */ - csel result, xzr, result, eq + sub tmp, tmp, synd, lsr 2 + cmp tmp, srcin + csel result, tmp, xzr, hs ret -L(zero_length): - mov result, #0 +L(nomatch): + mov result, 0 ret + END (__memrchr) weak_alias (__memrchr, memrchr) libc_hidden_builtin_def (memrchr) -- 2.7.4