From patchwork Thu Feb 23 00:27:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Ellcey X-Patchwork-Id: 19351 Received: (qmail 71537 invoked by alias); 23 Feb 2017 00:27:47 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 71521 invoked by uid 89); 23 Feb 2017 00:27:46 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=H*M:171, mrs X-HELO: NAM03-CO1-obe.outbound.protection.outlook.com Authentication-Results: gmail.com; dkim=none (message not signed) header.d=none;gmail.com; dmarc=none action=none header.from=caviumnetworks.com; Message-ID: <1487809656.2866.171.camel@caviumnetworks.com> Subject: Re: [PATCH] Add ifunc memcpy and memmove for aarch64 From: Steve Ellcey To: Andrew Pinski , Szabolcs Nagy Cc: Siddhesh Poyarekar , Adhemerval Zanella , Wilco Dijkstra , nd , "libc-alpha@sourceware.org" Date: Wed, 22 Feb 2017 16:27:36 -0800 In-Reply-To: <1486688083.2866.82.camel@caviumnetworks.com> References: <1486509609.2866.59.camel@caviumnetworks.com> <805d8c52-1397-ddd0-71cc-93d019f8a7f2@gotplt.org> <1486598532.2866.66.camel@caviumnetworks.com> <589C4992.10505@arm.com> <1486688083.2866.82.camel@caviumnetworks.com> Mime-Version: 1.0 X-ClientProxiedBy: BN6PR20CA0007.namprd20.prod.outlook.com (10.173.158.145) To BY2PR07MB2437.namprd07.prod.outlook.com (10.166.115.17) X-MS-Office365-Filtering-Correlation-Id: 96c68eb0-1af4-475c-fbcf-08d45b82c735 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY2PR07MB2437; X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2437; 3:GcaA1nXgI1s5HdFEJgJbGE/QXNpqVIYnVFPhbprSN2Hs56qXeaMyRyFtMQDUlA1gUnleRu4ZvjnRnMmIajNEfsvmhJGA5I66vnuspsHWBFLgXfC6O7iCs0m5AWGA+VvLjb1n1km18pfckJ8/h3eF1RJhFl+ncoor2R02NKtSOpuCyK4upPreR46dfmQaWDtXB/7zQgYU0KcrB3xwYJUMTkRlcU9efXbnzVhiq6yFh7fWLhfwpj64kNJ8T1zQHoZXeaOjVwo/F6yo0NZ/wV9LKA==; 25:ez2uudtmUYFHayKYk5wL6isKsMOM4jV0spO0UzGoB1V4P6ogTw+kJrMXV4UQjApDW2uhmh9tWqlvL1bBv16dwRc7y34m84VDoeEawo5fBT60Ec5msug+K0pwcYvIVP7G3eLggcMyoRm3sj+T2A65kL8W7UxNOa5LZoeDsWBtLNyW1GM/hn1P4tirOZj9kumHBFWp6tRDu8Kms3qXECURoP3qj5b4Rmj6zeHqjziPoPJty5YmtzDhZ50COaluBY6f4wEof+kw/yyACnJwmibq5iw+SZ7A0qIJq4AN/MVIpxAJEcCGqjuMM83uaHb2GARgqCNjXNdPLC2DWA6okhjSt7lot7eclsViPOZCpSN6AQ9bjWkYKPQP4c82+/cA86KL0TMr67opWlmFGypHzhWuHGz4AUxEgDPbyGFqXm6wxzP0eFGxFLNzIVEGLUZ5lp7qDnnzkV97jB1HNfjxkx93AoVz7cteNff/swhMR1VH+0UhD4/GMxya+3Ahq2SR8FP1 X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2437; 31:zq0Ya6mcilVxyHzo1mt2W7c100Z8PKkxo+jeKBY5Nz3YqnA38sR7B5G0L0S6sA9b8Xd8y+Km+PKes2Mb6Ru6uQ3+PqPyFabnfbr/sHJhQgFyhubI3O7TGvo5NyvmR5Q8IVp3fjrjsO77v4yKh52BqyLZ36jXnT4Kj5OVs2UUxib6urEUJYjkA9za/frkL7marvMumQgE5M4hhszOsVZhrgY/UrsB9cIcP9OTDlLAjL0V/DEpKm/VV7ZKlLLxqDyqLvVeA9BIiBjhDDY3KpjEurtAaCTkJ/Kp8pfa69bTKcaVRMUV8Dn5jbpKv35M5kYWDYrrkULsLymjF9/WsNDIYA== X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2437; 20:xXJGYnh78JeqBO2/KQrxvu95yMY7J3Z0JOFpJ1RAV97qJm7XJuwG95xkWoW2M41e9jgGveFxrEBI1HcFE5S1GOxzmCejNZigDHMVcf0yhsYfAJr9swCl6BY7oIMzuwgFqjncrI3QcW4THb+L1kxVjUlzDv1bULoY9xHzI4IDo76q8mPqR2LnrclUYcuH6yYMkC+Mhb6OYUlpIY1oVJ1YvEWWRDCGcxR1OWAMl+QJPcH9Bw4N051qytVoYkjw+a/Sva4AE3XmASIj4sMgp41W/HQI5jIECvQ+hYWhCig+lkcM7XazEAtPDoNlQjNIwVEnX1Ifti9zzypUBIESryO9+6C9ZBZ6LeNyWoxurqRdNB+NhkJX0BgSAPWaq+Q9aq9RZaCWcKmKk1zjHPSJeb+1+v0QTF2AzwJF8p1/5dJF5fZ0lGOV3SBHgs2ropdWihboCNPZMG0sVuR5NNz8b5n2UiZVMF/9JC2J5eAUOOt++Qd8IJJb0IbVALiyU1xWmXnkNuwaGltL15QimO3Gx9yLJhO8wSWT2aTAZuKaIMjP679wCc2S49R+XjGtOr5kQks7S5fqv4xg/Qfxqxl8iZtuHIsOrq4Hs92GNldrfGhGf9g= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(102415395)(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123555025)(20161123562025)(20161123560025)(20161123558025)(20161123564025)(6072148); SRVR:BY2PR07MB2437; BCL:0; PCL:0; RULEID:; SRVR:BY2PR07MB2437; X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2437; 4:8hqb5m09LbcKZIvXP+7tIUtHNHxERcDrBiAt/yQDG8QfXNjQikoZXhx9cVBICz0mgVb1zFJ6vPCfhuFSnbiA7KLuq9VXGOYEeLXQKXLK1Cfiofq5XENy7tnAAzFLW4ri0RIV5/4bKl716h0Y5A1P48lK8iUk2wwWKq96ImORvcTXEGjtM6cwC1ppWEiMvtA6Y+fJScumDs9WqKsg4IhCwWbNfPsqxDEnHLVjY70qLLiY7IvlUSq6Fgs+hJf8V46wXZ4KhoSOW49tHjByW5rKKG0pw/134Vbf6OMPFWzX6ZQNjIi9tWOz2IOouhTHaGGpuWDKstxWfNEMSLd1B0g5QPLv1bqfnPkH4Qeh1ClSoQZHF6J8qQY+xepUh818hlN2fqeeyZievFvV0euyeG7vUwyqTtMetlWfqT77in2TEH/l+WWBOlB7MqnboOz+lbuyi1aIiPUGgxcb0Ur9PXwo+UqIPqum2Ked+wE7bU5syhxjiBwBd5K+Du6aMI7iqfwVdBqbpQFIoBhOeltO90yLZATP2hXJv9bh/jSKHyMKEebRFK0zB9tpkX/NXD7a9dbkSAPwohSeBWVc0OM70BzECIkbyJvjU6zSJiycXAaoTRB0Mzzblr7CP7IDi4T9p6dn X-Forefront-PRVS: 02272225C5 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(39450400003)(165144002)(377424004)(84326002)(36756003)(6512007)(4326007)(2906002)(42882006)(305945005)(6486002)(25786008)(2950100002)(6506006)(5660300001)(7736002)(6666003)(6116002)(512874002)(3846002)(229853002)(66066001)(2476003)(5890100001)(54906002)(4610100001)(93886004)(103116003)(33646002)(38730400002)(568964002)(53936002)(53416004)(6246003)(42186005)(50226002)(8676002)(92566002)(76176999)(50986999)(81166006)(189998001)(99106002); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR07MB2437; H:sellcey-dt.caveonetworks.com; FPR:; SPF:None; MLV:nspm; PTR:InfoNoRecords; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR07MB2437; 23:+Uwi4VrEalWXCwN40rjaxosYV/skvG2M5DQiYmiSN?= =?us-ascii?Q?LiwWOvQew846r8U8NpWSKwt+R0ROnYf3HV/OLsZsa+ZCxNnWkkEUHQoXgX3U?= =?us-ascii?Q?ekvkw9XiyYqpbsxmf4Q/3LQHB4q5hS0Wgfda32CY2F3NMT3mT3AEuoOyaBeO?= =?us-ascii?Q?CEpverLHZ00JmOHxUnEA/Yk6FBii3EOt0Yt8mCXuKJgwmolzonHm9R/ezkmz?= =?us-ascii?Q?TFLtdiCERNdwik9Yaz00sflgXL2JbPP18ugMg420nZZukKy8sgFO+ofBG1ed?= =?us-ascii?Q?uarJnwGOf2nQDrHcg2xnEZ1iEe2m6J8wheV+jovCb6FjWG3VoN6ewOAM8tQL?= =?us-ascii?Q?//hTq5oSozUEKPJpeONBoj261c+8UXmDAuFFjRlyfZZTqKqinfplVnI572AQ?= =?us-ascii?Q?BcUYWJ0p/LFLVezeGt0G2173zQZ26qlgSvLTok/UiKvJ8YOo+wLrpidNTYSd?= =?us-ascii?Q?AESnhNpkp/Dt85aSAqa5wlVFRaWV1tWLruAloVhNvvWRE9r6oKVeVZt37Roz?= =?us-ascii?Q?SD5TdfWxovYlq7tN5o/9nZC+zGjLm1a50liKkv6Exwg5i89XTa0SqFst4uvx?= =?us-ascii?Q?Qz3nIQyA+01h5U/E9yOELrqXKGY2gBMLOoiwkeRRvXXHMwIX8vMaDM8SvENv?= =?us-ascii?Q?UAq0ZUXxpTkIaBc0bubTHvG1HLMu/MdChx9xUvxAStonY/O2p5O6yagN87Qv?= =?us-ascii?Q?IW6642dznfHuag91u2XdyGA7XrIoXo81txdzSBUxquvVwxU0Eb7XFjTcknhV?= =?us-ascii?Q?GQutD4QIsaln3VRlzgJ7lhPsIQoluJyojTjPPEkKlj5tFCLLpvUDXZyNuNp2?= =?us-ascii?Q?YQ3e0PK58sGARqaLgBtgCl1OezJA+VGyEq9f8NjQ1CR0v297tYpf/KtuoS2Y?= =?us-ascii?Q?tQ1uo7pLsVmk64MxKBtbKR4RlXbdQlWcWRyvDY/kBBel7w0aw/ogaALcSguL?= =?us-ascii?Q?I0Qwq8Qx/oTKIOgpR3tdVrLtP3744TK83CCDnNBbzqBkpWIyWT0q0rB8rnhh?= =?us-ascii?Q?oSkKttsrYB2Ck6EYu2M5LQfzAiVifhnb4EW1S+SzUeU4f+EwKcmpXKbHVDEH?= =?us-ascii?Q?QJdgBbm203DrhF4mUWWAYoy9mPA4pGd78Ofo0PURKvQpcc9l+p79G7Z+tpfR?= =?us-ascii?Q?u4fUi3BI4lzCMUyHVrBdPACJwJapgx2?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2437; 6:nt07Pqdbg6d0gv5ImpxxAd5QyOlHmN2jaPA38KxyERqQA0z/RokSY4jtW2H1xHBLRAIOIuBBJKqOs3GI6nBkGoEWRSeOUeepqjDq1uzvAxO+7IOoykaC0RBYP0hzVv2SCFBay6CYZsqaXEuZ6VYdYlixaLObalwlehfilvlizgjazloOG1ysyZs/xnKThuOu0z6h6l3f/8UtGBhD7KdXEmUdLBAhHLozHnm/rDQIx6q5coRLi7idQJ0RAzY9U7DmFGFAdo49NWizx6hDO8jkbzCAh+ly3dfd8dM+qiXCnJGQhy/U/3JkdzWUpUjWG8RkPAGG8NlyU1lxbzBnDLZKaBN7tAW2X8fsggmyksJwnYyMYyemMHK77dNOUCkGKzt2V+ydK9xwLnsREVuykSMSMA==; 5:RW8s92j5FMhGiI2EESeUb9DOtgBigwoh9E2J7I+kraKofgyevqLksFRDkFh8u3C2Bb7xddzFKsQMafHqqeQ1IhyjhsDDF2/Ie2QilClNQDLFQiPoDJiWjeT30m/lIKCRqZDJM82TOUfXzamJqB+pew==; 24:2l1q9LMv4pzta5YKF8PIttzUb5jM5eHB5YVKp4CxxsB5xbaIAYQz79mMbm7JdTkBoDDFaUb9dkmY12GE21uR8Gup4TQ/IqEcGarDkSZS7x4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2437; 7:bsDLsD1uiyt9ZjKtubpK5EXI0oR/FwqfOD3WjLBcWHJKDrQMJ5kGkI2WrCT/tZdSiI7GXTBJ3amaTV3P0M0toiVf/mvD+2gkjaoq3cDXiMz13yVZCFwWGpBBFQ/DgvnLFegFOsXBGILex/JDx6sEuXZindjRwA3ciH8nG03RclAShYqzFInhBE9rwdSPxHS6QkvudtIrIyqNoQuvFufGBpzVmzV5CjZYOdoE4gIbkRkAIfFkhnGhKXA79mC7MJoG+k1INHn9e8CpmNOwpHxdYSO/jjxWAo9PGoMTLCjDssG/J3z227LM6PJs37+qf/uva0p63axbL8Dx/S5/jnJQeg== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2017 00:27:39.9349 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR07MB2437 Here is a new version of the IFUNC functionality for aarch64.  It does not include the memcpy changes to use it.  I tried to move the cpu feature check to later in the start up process so that I could check GLRO(dl_hwcap_mask) but it does not seem to be working.  I was wondering if anyone could look at this and see if I am doing something wrong. If I understand the code correctly, for a dynamically linked program, dl_main is going to get called before dl_sysdep_start and dl_main is where environment variables are processed and where dl_hwcap_mask should be getting set.  But when I check dl_hwcap_mask in init_cpu_features (called from dl_sysdep_start), it does not seem to have changed from its original value that is set in the new dl-procinfo.h header file. Any ideas on why this isn't working? Steve Ellcey sellcey@cavium.com 2017-02-22  Steve Ellcey       Adhemerval Zanella   * csu/libc-start.c (LIBC_START_MAIN): Use INIT_CPU_FEATURES. * elf/dl-sysdep.c (_dl_sysdep_start): Likewise. * sysdeps/aarch64/dl-procinfo.h: New file. * sysdeps/aarch64/ldsodefs.h: Include cpu-features.h. * sysdeps/unix/sysv/linux/aarch64/Makefile (sysdep_routines): Add cpu-features. * sysdeps/unix/sysv/linux/aarch64/cpu-features.c: New file. * sysdeps/unix/sysv/linux/aarch64/cpu-features.h: Likewise. * sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c: Likewise. diff --git a/csu/libc-start.c b/csu/libc-start.c index 9a56dcb..ec19466 100644 --- a/csu/libc-start.c +++ b/csu/libc-start.c @@ -182,6 +182,10 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), __tunables_init (__environ); +#ifdef INIT_CPU_FEATURES + INIT_CPU_FEATURES; +#endif + /* Perform IREL{,A} relocations. */ apply_irel (); diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c index 4053ff3..c963a1e 100644 --- a/elf/dl-sysdep.c +++ b/elf/dl-sysdep.c @@ -223,6 +223,10 @@ _dl_sysdep_start (void **start_argptr, __tunables_init (_environ); +#ifdef INIT_CPU_FEATURES + INIT_CPU_FEATURES; +#endif + #ifdef DL_SYSDEP_INIT DL_SYSDEP_INIT; #endif diff --git a/sysdeps/aarch64/dl-procinfo.h b/sysdeps/aarch64/dl-procinfo.h index e69de29..0e0829f 100644 --- a/sysdeps/aarch64/dl-procinfo.h +++ b/sysdeps/aarch64/dl-procinfo.h @@ -0,0 +1,50 @@ +/* Stub version of processor capability information handling macros. + Copyright (C) 1998-2017 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 + . */ + +#ifndef _DL_PROCINFO_H +#define _DL_PROCINFO_H 1 + +/* We cannot provide a general printing function. */ +#define _dl_procinfo(type, word) -1 + +/* There are no hardware capabilities defined. */ +#define _dl_hwcap_string(idx) "" + +/* There are no different platforms defined. */ +#define _dl_platform_string(idx) "" + +/* Needed here until this gets into kernel sources. */ +#ifndef HWCAP_CPUID +# define HWCAP_CPUID (1 << 11) +#endif + +/* By default there is no important hardware capability. */ +#define HWCAP_IMPORTANT (HWCAP_CPUID) + +/* There're no platforms to filter out. */ +#define _DL_HWCAP_PLATFORM 0 + +/* We don't have any hardware capabilities. */ +#define _DL_HWCAP_COUNT 0 + +#define _dl_string_hwcap(str) (-1) + +#define _dl_string_platform(str) (-1) + +#endif /* dl-procinfo.h */ diff --git a/sysdeps/aarch64/ldsodefs.h b/sysdeps/aarch64/ldsodefs.h index f277074..ba4ada3 100644 --- a/sysdeps/aarch64/ldsodefs.h +++ b/sysdeps/aarch64/ldsodefs.h @@ -20,6 +20,7 @@ #define _AARCH64_LDSODEFS_H 1 #include +#include struct La_aarch64_regs; struct La_aarch64_retval; diff --git a/sysdeps/unix/sysv/linux/aarch64/Makefile b/sysdeps/unix/sysv/linux/aarch64/Makefile index 6b4e620..d17dafe 100644 --- a/sysdeps/unix/sysv/linux/aarch64/Makefile +++ b/sysdeps/unix/sysv/linux/aarch64/Makefile @@ -1,5 +1,6 @@ ifeq ($(subdir),csu) sysdep_routines += __read_tp libc-__read_tp +sysdep_routines += cpu-features static-only-routines += __read_tp shared-only-routines += libc-__read_tp endif diff --git a/sysdeps/unix/sysv/linux/aarch64/cpu-features.c b/sysdeps/unix/sysv/linux/aarch64/cpu-features.c index e69de29..867e1ca 100644 --- a/sysdeps/unix/sysv/linux/aarch64/cpu-features.c +++ b/sysdeps/unix/sysv/linux/aarch64/cpu-features.c @@ -0,0 +1,45 @@ +/* Initialize CPU feature data. AArch64 version. + This file is part of the GNU C Library. + Copyright (C) 2017 Free Software Foundation, Inc. + + 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 + . */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef HWCAP_CPUID +# define HWCAP_CPUID (1 << 11) +#endif + +void +init_cpu_features (struct cpu_features *cpu_features) +{ + if (HWCAP_CPUID & GLRO(dl_hwcap) & GLRO(dl_hwcap_mask)) + { + register uint64_t id = 0; + asm volatile ("mrs %0, midr_el1" : "=r"(id)); + cpu_features->midr_el1 = id; + } + else + { + cpu_features->midr_el1 = 0; + } +} diff --git a/sysdeps/unix/sysv/linux/aarch64/cpu-features.h b/sysdeps/unix/sysv/linux/aarch64/cpu-features.h index e69de29..0b2a51b 100644 --- a/sysdeps/unix/sysv/linux/aarch64/cpu-features.h +++ b/sysdeps/unix/sysv/linux/aarch64/cpu-features.h @@ -0,0 +1,53 @@ +/* Initialize CPU feature data. AArch64 version. + This file is part of the GNU C Library. + Copyright (C) 2017 Free Software Foundation, Inc. + + 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 + . */ + +#ifndef _CPU_FEATURES_AARCH64_H +#define _CPU_FEATURES_AARCH64_H + +#include + +#define MIDR_PARTNUM_SHIFT 4 +#define MIDR_PARTNUM_MASK (0xfff << MIDR_PARTNUM_SHIFT) +#define MIDR_PARTNUM(midr) \ + (((midr) & MIDR_PARTNUM_MASK) >> MIDR_PARTNUM_SHIFT) +#define MIDR_ARCHITECTURE_SHIFT 16 +#define MIDR_ARCHITECTURE_MASK (0xf << MIDR_ARCHITECTURE_SHIFT) +#define MIDR_ARCHITECTURE(midr) \ + (((midr) & MIDR_ARCHITECTURE_MASK) >> MIDR_ARCHITECTURE_SHIFT) +#define MIDR_VARIANT_SHIFT 20 +#define MIDR_VARIANT_MASK (0xf << MIDR_VARIANT_SHIFT) +#define MIDR_VARIANT(midr) \ + (((midr) & MIDR_VARIANT_MASK) >> MIDR_VARIANT_SHIFT) +#define MIDR_IMPLEMENTOR_SHIFT 24 +#define MIDR_IMPLEMENTOR_MASK (0xff << MIDR_IMPLEMENTOR_SHIFT) +#define MIDR_IMPLEMENTOR(midr) \ + (((midr) & MIDR_IMPLEMENTOR_MASK) >> MIDR_IMPLEMENTOR_SHIFT) + +#define IS_THUNDERX(midr) (MIDR_IMPLEMENTOR(midr) == 'C' \ + && MIDR_PARTNUM(midr) == 0x0a1) + +struct cpu_features +{ + uint64_t midr_el1; +}; + +void init_cpu_features (struct cpu_features *cpu_features); + +#define INIT_CPU_FEATURES init_cpu_features(&GLRO(dl_aarch64_cpu_features)) + +#endif /* _CPU_FEATURES_AARCH64_H */ diff --git a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c index e69de29..438046a 100644 --- a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c +++ b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c @@ -0,0 +1,60 @@ +/* Data for AArch64 version of processor capability information. + Linux version. + Copyright (C) 2017 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 + . */ + +/* If anything should be added here check whether the size of each string + is still ok with the given array size. + + All the #ifdefs in the definitions are quite irritating but + necessary if we want to avoid duplicating the information. There + are three different modes: + + - PROCINFO_DECL is defined. This means we are only interested in + declarations. + + - PROCINFO_DECL is not defined: + + + if SHARED is defined the file is included in an array + initializer. The .element = { ... } syntax is needed. + + + if SHARED is not defined a normal array initialization is + needed. + */ + +#ifndef PROCINFO_CLASS +# define PROCINFO_CLASS +#endif + +#if !IS_IN (ldconfig) +# if !defined PROCINFO_DECL && defined SHARED + ._dl_aarch64_cpu_features +# else +PROCINFO_CLASS struct cpu_features _dl_aarch64_cpu_features +# endif +# ifndef PROCINFO_DECL += { } +# endif +# if !defined SHARED || defined PROCINFO_DECL +; +# else +, +# endif +#endif + +#undef PROCINFO_DECL +#undef PROCINFO_CLASS