From patchwork Tue Jul 14 16:37:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilco Dijkstra X-Patchwork-Id: 1328991 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-armh-onmicrosoft-com header.b=linQkP3g; dkim=pass (1024-bit key) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-armh-onmicrosoft-com header.b=linQkP3g; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B5mQC61kZz9s1x for ; Wed, 15 Jul 2020 02:37:23 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 765D0386102E; Tue, 14 Jul 2020 16:37:21 +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-vi1eur05on2086.outbound.protection.outlook.com [40.107.21.86]) by sourceware.org (Postfix) with ESMTPS id B9658385BF81 for ; Tue, 14 Jul 2020 16:37:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org B9658385BF81 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=Wilco.Dijkstra@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=83pEyi6Y/vxmaquRuXklYNoX0PpPeSi8hNCXv5JvAgA=; b=linQkP3gSWSfyuYXNBXYu9FiifO29WZjftxkCotqZiE8juFvNThry7X5/xHGrIeF/sJjK5esvfVKN49eIwyv9FJnQErKK0QZ8uYg0vGItQnbw3NfxHbMTCSIXVSBsCTVnIHJAOYriqg4/mRTh24uWAUbLOS/mhTMbH14FCceYGw= Received: from AM5PR0402CA0013.eurprd04.prod.outlook.com (2603:10a6:203:90::23) by AM5PR0801MB1986.eurprd08.prod.outlook.com (2603:10a6:203:4a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.20; Tue, 14 Jul 2020 16:37:17 +0000 Received: from AM5EUR03FT053.eop-EUR03.prod.protection.outlook.com (2603:10a6:203:90:cafe::5f) by AM5PR0402CA0013.outlook.office365.com (2603:10a6:203:90::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.21 via Frontend Transport; Tue, 14 Jul 2020 16:37:17 +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 AM5EUR03FT053.mail.protection.outlook.com (10.152.16.210) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.21 via Frontend Transport; Tue, 14 Jul 2020 16:37:16 +0000 Received: ("Tessian outbound c4059ed8d7bf:v62"); Tue, 14 Jul 2020 16:37:16 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 59b7736102df80bc X-CR-MTA-TID: 64aa7808 Received: from 86ebbc189961.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 82F9858D-BD52-44E8-8D88-9EBB7B9535F0.1; Tue, 14 Jul 2020 16:37:11 +0000 Received: from EUR02-VE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 86ebbc189961.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 14 Jul 2020 16:37:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S4CFyxQEtQ45857c5QLGdLj91bYRn+5C2Q7gndh6dKtj6hAxFxAPv/TU5WRjAZadS5y+9oBcvfEsZFWtZJBEqCpZyvKkmfvuAtb40R/M72f2xT/gog2/dC6JZVvxYDG+w3kqzBdBeZMy8SG2Ub9YMCPIMkYSM2tLISG8Ct0JvgYvw1aWibTy/X1Uj4z0mPjf5oDLupDnKORxkqPO9DcFnlqGq7PtnDs2v0lKrLyt1T8wSjlYinFM7jsRJiTf8RTw60Dg/L8XTQJRd5TJ1ojrBf+yLX74dIbPi/bQBHvv33UmCgILOIervvLbB32/R4Xguz+NrodGNUUbcS8XDCSlHQ== 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=83pEyi6Y/vxmaquRuXklYNoX0PpPeSi8hNCXv5JvAgA=; b=DzcImkNK8IV5jK/bDyHcaisedkljTR3Tl4vxu8IysnQ8vTuop0wrI5kE8ONm54BLSJqVxNsQWBkrjDWcrSLy5ICsjq8pTHFz7IRvXb5YGHMIenZxSWvEms54wyva+qhQwrfelyrG5vrT8r/ZQ/TcGqatulKO0SmAFUo8vjl6rTadihDLRYikQEm5MNpFCRRXFhQyALNgAVzaN+FVG4DJEdEbcwB0UC9slOWD3Nj1G6rz9so2mi1uRgbopq4OFtBToL9Bd92fOJDaJyW9Vlp2CxooOXkfUe0vn0Bt7nnCDDrNLmBMAk8hDRYgjrKkVX+f54Vp/kWkz15FawFhWjdU4w== 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=83pEyi6Y/vxmaquRuXklYNoX0PpPeSi8hNCXv5JvAgA=; b=linQkP3gSWSfyuYXNBXYu9FiifO29WZjftxkCotqZiE8juFvNThry7X5/xHGrIeF/sJjK5esvfVKN49eIwyv9FJnQErKK0QZ8uYg0vGItQnbw3NfxHbMTCSIXVSBsCTVnIHJAOYriqg4/mRTh24uWAUbLOS/mhTMbH14FCceYGw= Received: from DB8PR08MB5036.eurprd08.prod.outlook.com (2603:10a6:10:ed::20) by DB6PR08MB2808.eurprd08.prod.outlook.com (2603:10a6:6:1d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.24; Tue, 14 Jul 2020 16:37:10 +0000 Received: from DB8PR08MB5036.eurprd08.prod.outlook.com ([fe80::40e3:3b43:9af2:d4ff]) by DB8PR08MB5036.eurprd08.prod.outlook.com ([fe80::40e3:3b43:9af2:d4ff%3]) with mapi id 15.20.3174.026; Tue, 14 Jul 2020 16:37:10 +0000 From: Wilco Dijkstra To: 'GNU C Library' Subject: [PATCH] AArch64: Rename IS_ARES to IS_NEOVERSE_N1 Thread-Topic: [PATCH] AArch64: Rename IS_ARES to IS_NEOVERSE_N1 Thread-Index: AQHWWfyOya0KqAmPVUae9/7Qn6sNyQ== Date: Tue, 14 Jul 2020 16:37:10 +0000 Message-ID: Accept-Language: en-GB, en-US Content-Language: en-GB X-MS-Has-Attach: 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.24.199.97] x-ms-publictraffictype: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 4ff7c1f0-4128-4410-9a7e-08d828142ba8 x-ms-traffictypediagnostic: DB6PR08MB2808:|AM5PR0801MB1986: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true nodisclaimer: true x-ms-oob-tlc-oobclassifiers: OLM:94;OLM:94; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: EphH+3XkN77Rix7w0796HZ4wiRYdPC1tRMbu1Ce0g6lkbMb/6Nr9+z6HPBtMcDJ3YuBWju5GUS/F3i8Opz1BJyof47jcqrrcsQsSFWIo5BmGBn5nptD4ZiVayS6NWoo6vu1Raz9GKtE4KW5hGSE279VHac7KjNKMVDKlrBpnwa9fyivPgoWs7DfIdMMMLWTXlVh68hlwJ5HCKXTHVCQbfoY7C+fn82+1uMdYU1cxhcmLcqx1kTSREaHQqaVHNI1TMrmF+OU851lL3pvnyqTlW4n02hYcqyyvDk2xfK1pgXOLRfWMqYgZ9RqSisrQG3k6j459bQqvJIQibIO3Ys8sLw== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB8PR08MB5036.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(396003)(39860400002)(346002)(376002)(136003)(366004)(5660300002)(26005)(186003)(478600001)(76116006)(2906002)(66946007)(33656002)(71200400001)(6506007)(8936002)(66556008)(66476007)(86362001)(6916009)(8676002)(52536014)(66446008)(7696005)(55016002)(9686003)(64756008)(316002); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: EeDDPACJ3KhGDhUqTU0dSAT1Xj2o8YHQPpm08Is1MA9WVTErICcGqmX71rjL6zWaN3PO7WvcBazJ1QtqsPBpFDLjoer1uGrDy9a3qhOezyErXuvdltrHE6m4pWjMEEslbT9TJdzhHLujdhtrf68mzMMOUEYpvgtrRQxYQZu0DnglEgunfnw/TjETjthzRhJRXVuEFv4lBqg1HC9wN1KQNo5izBgn3mxE+QmTueXVcd7rEyXtHC35Kg0ao2VbV3yQynRMN/7aldh2EFSgMM3/jpdtL0lItMqLcAt7pFlhO95/H9VdLYa5a7NF7M8BCDIUjG5MLgGT7KbpUalcO7BiZG/Qj9oZ9CiajtKx8TwW6s+jMLCL9Edil7RZPHxm6i1k1g5qI8p1PpAcj0hD7wF4DfaoNm9aq0WYYKxnGN129fKE0acbteg1uSHuB+MG/jI3rOplPtTyUqD/nceo6d9xPSRXnTqXoeNu3C8RUO9RmBA= x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR08MB2808 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: AM5EUR03FT053.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)(136003)(396003)(346002)(39860400002)(376002)(46966005)(86362001)(2906002)(33656002)(55016002)(26005)(70206006)(70586007)(82310400002)(7696005)(186003)(6506007)(336012)(9686003)(478600001)(81166007)(5660300002)(356005)(6916009)(52536014)(8936002)(8676002)(36906005)(82740400003)(47076004)(316002); DIR:OUT; SFP:1101; X-MS-Office365-Filtering-Correlation-Id-Prvs: ff41ebe9-55dd-4043-e72b-08d8281427af X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9uoYiLrQ3CvCaJhkdmVTBju9xX95JoOfy1trsQu/wmkw+p8LTYC7aPOM63WStV8Rp6tXsYvtIDEHHd/w3w0/gd4/fawYuK+rxnfLpFyJ1I0nCvNlDxSpHLks0d1WmvQeDlcezCUOhf5w86H/2gFaSGIy44azIImDyE961kUw43MChYwxiSYZiwzim7jZP/NxWNhSrm5VW8RT71GCCwSzGzrZBWJOfhWYIkq1UND2A+D/Ed1Bv0YeK98DV0dMdJ35S00MYbNOzsheQKh9BOLHLtw9eiRKUcRzeqdYzx+UOdkkTARERIiith8Sk0iEqXVbjTBkh6AAPV9OQsMHWG7Nh+2pS1aylhIMyanHg3Mdz37ee+ttVM5a5G1cIxSgrJZ+r9nyKJzgK42a2lVa7K6Gug== X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2020 16:37:16.9172 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4ff7c1f0-4128-4410-9a7e-08d828142ba8 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: AM5EUR03FT053.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1986 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_LOTSOFHASH, KAM_NUMSUBJECT, RCVD_IN_BARRACUDACENTRAL, 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-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" Rename IS_ARES to IS_NEOVERSE_N1 since that is a bit clearer. OK for commit? Reviewed-by: Carlos O'Donell diff --git a/sysdeps/aarch64/multiarch/memcpy.c b/sysdeps/aarch64/multiarch/memcpy.c index e6f3ae116701097d71a02e2a1f6bfdadc1eec34a..7cf5f033e8fcdcbfdfbfe73e6ad24d8b3fc79b66 100644 --- a/sysdeps/aarch64/multiarch/memcpy.c +++ b/sysdeps/aarch64/multiarch/memcpy.c @@ -41,7 +41,9 @@ libc_ifunc (__libc_memcpy, ? __memcpy_falkor : (IS_THUNDERX2 (midr) || IS_THUNDERX2PA (midr) ? __memcpy_thunderx2 - : (IS_ARES (midr) ? __memcpy_simd : __memcpy_generic))))); + : (IS_NEOVERSE_N1 (midr) + ? __memcpy_simd + : __memcpy_generic))))); # undef memcpy strong_alias (__libc_memcpy, memcpy); diff --git a/sysdeps/aarch64/multiarch/memmove.c b/sysdeps/aarch64/multiarch/memmove.c index 1229f8b89296eddd2e711490bb7fc0b35726b6f5..ad10aa8ac6fba884ffb3736ed6e73d16b6eaa60c 100644 --- a/sysdeps/aarch64/multiarch/memmove.c +++ b/sysdeps/aarch64/multiarch/memmove.c @@ -41,7 +41,9 @@ libc_ifunc (__libc_memmove, ? __memmove_falkor : (IS_THUNDERX2 (midr) || IS_THUNDERX2PA (midr) ? __memmove_thunderx2 - : (IS_ARES (midr) ? __memmove_simd : __memmove_generic))))); + : (IS_NEOVERSE_N1 (midr) + ? __memmove_simd + : __memmove_generic))))); # undef memmove strong_alias (__libc_memmove, memmove); diff --git a/sysdeps/unix/sysv/linux/aarch64/cpu-features.h b/sysdeps/unix/sysv/linux/aarch64/cpu-features.h index a81f186ec2df43387c50956b74844a4b1ca8d334..fc688450ee0e0f7cf58e73920263631a0ea7c8d6 100644 --- a/sysdeps/unix/sysv/linux/aarch64/cpu-features.h +++ b/sysdeps/unix/sysv/linux/aarch64/cpu-features.h @@ -52,8 +52,8 @@ #define IS_PHECDA(midr) (MIDR_IMPLEMENTOR(midr) == 'h' \ && MIDR_PARTNUM(midr) == 0x000) -#define IS_ARES(midr) (MIDR_IMPLEMENTOR(midr) == 'A' \ - && MIDR_PARTNUM(midr) == 0xd0c) +#define IS_NEOVERSE_N1(midr) (MIDR_IMPLEMENTOR(midr) == 'A' \ + && MIDR_PARTNUM(midr) == 0xd0c) #define IS_EMAG(midr) (MIDR_IMPLEMENTOR(midr) == 'P' \ && MIDR_PARTNUM(midr) == 0x000)