From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130047.outbound.protection.outlook.com [40.107.13.47]) by sourceware.org (Postfix) with ESMTPS id B27B1385741A for ; Tue, 25 Oct 2022 12:54:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B27B1385741A Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=GIeFJAQX/lTD1Ar8j8YaVpSomi7LVpRzGq5MAe5Y+SQityPWPDqTDr4Fxtxy7arbC/VtQeIoQ6XWwv/yrUbOeJuK+hLYJX5nDs5T171CmY3NBWFFdPiLq8RHHaV6FcLnpZU+TtEeqsxcMIeYk2Zou12fWdBtGrkTc8/yuV2Pv6Yuaog7KfAWR3KO4Sl3f0kg7Ca4j2/72IsOFywZBkrT10hXCBmPK/mdV18IpupuvF+O+/P/nZK5JHbjIuhoPXb5LJzB1baA7ak3Bj0Drbz/uHiSXn8K00jkTvoNpyURp8lfRQTM28tmcpT/BV4PT9+25xhD3muVXcJs2QP7GzRR+g== ARC-Message-Signature: i=2; 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=djd2OcOH81zV5ZIrx7v43nojvXYdiQaoaK7JTnvvvek=; b=AGRGndEJfesXTk31hbEWnZyjoYexNgmMJ+5zoYR3gB4WenTgWKgGtrC1gD+NEydaWyq/siFu2ZgDaPl9V4VONahSWqn1P+KdJ2BFcMpsbHpQO82519gSPW0rs6SAHM8dp6rlgf8ckPFTRZDzt3DPcLnsPJ+J7OkFV/Ng3jcIxmaMAnp30RmG3mOWYo6qPHA0ga+VpZMjFKXqOh7lvA/SSZJX6j1J4tQc8d+BoChM/H/CCox5ItVAyJnThFFfEvnqtQeKnVz/eiIxgoUNx4GtT54Gg7tRaHIByVGNH+rK+Odq8oYdvVNzmBVh6W9X44/Ezpj54O4F3ckT1nihBTkQGw== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=sourceware.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dkim=[1,1,header.d=arm.com] dmarc=[1,1,header.from=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=djd2OcOH81zV5ZIrx7v43nojvXYdiQaoaK7JTnvvvek=; b=YUDjmLbpOhYbn2aLjC09PWIMwJLiRHqbuP3RP5ChgfOJPqZ0qw9lvA5LGb5paOaOoEe7U9uQcEsiRkdG55LrBzPHyDI3GE39xSxrbJahHSk7GDNpfkJK3jgfXImN+YBB/gLBwT/rWMUy29UOQzGzafO6qAglaWLJvKpeHGrROBs= Received: from DU2PR04CA0304.eurprd04.prod.outlook.com (2603:10a6:10:2b5::9) by DB9PR08MB8460.eurprd08.prod.outlook.com (2603:10a6:10:3d4::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.34; Tue, 25 Oct 2022 12:53:56 +0000 Received: from DBAEUR03FT026.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:2b5:cafe::b2) by DU2PR04CA0304.outlook.office365.com (2603:10a6:10:2b5::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.21 via Frontend Transport; Tue, 25 Oct 2022 12:53:56 +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 DBAEUR03FT026.mail.protection.outlook.com (100.127.142.242) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.10 via Frontend Transport; Tue, 25 Oct 2022 12:53:56 +0000 Received: ("Tessian outbound 2ff13c8f2c05:v130"); Tue, 25 Oct 2022 12:53:56 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 3b007ec55db378e9 X-CR-MTA-TID: 64aa7808 Received: from 4b224bc2f542.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id C2A28D01-D6E9-4D56-BCC3-F4BAB4EE0F4C.1; Tue, 25 Oct 2022 12:53:49 +0000 Received: from EUR05-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 4b224bc2f542.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 25 Oct 2022 12:53:49 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZZYQChPuRK7fZg/m9qKCcYU6sImeZc3LHs75T3yHT/3c/s95ehWSTWKFmPMV1ybiz18FPzSdohANHeJn68+K0/txWFOeal/Nw/ZX6rcwlNuZ6dtmnbixHpjzd19tkuj3L4H9fMRBFG/zmxZcVPOVbElpwTHLk93E6D4BGE7o2HPCpTLINKgveXmnx5cvpiSCZq5cpKYasKvtrmviN7jdfaKf8w+ONzS6DJ8MSpUkDT4ilN5zTrmlXU92fxK/fGGN0MktobIpJW3QMvSRvx+C3l2cdTFT7K3n53BIyPKLpsVsLYykxLxnkznG1JiGoz7l6nfvY5VC1EKjI5YG1I2W1w== 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=djd2OcOH81zV5ZIrx7v43nojvXYdiQaoaK7JTnvvvek=; b=OsBSZrjV8odLBZ5Uj8+8LWH+yK6lMTDGisH4p67HJn1pjg7orL0tYux5y5SiHnG6DrlUpwR8C6fBldsuXP8oPpmYYe/pOyxLa06JdfvZMQsoSR2EAK5VCZWiILP3fF/A71VhOtg2SpW+X/FsWQVkKrj37Fc2khknJgDnfnMrJXnkSObKExZv5CiJw8l7NcoEt/2BxJDNdQo7aCIeb/CcyJa5ne1Gd37W1C7XlwzHoBadwMnGDqz5B01ERAIwV/NuiaMuFpqTjTUBQUGn8oCbUYq34Y0OTRqsrfeZ83yzviQWbCZPs6s3mNftTXH2P+GJ6j03XRMOVLy6H/mhooSJeA== 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=djd2OcOH81zV5ZIrx7v43nojvXYdiQaoaK7JTnvvvek=; b=YUDjmLbpOhYbn2aLjC09PWIMwJLiRHqbuP3RP5ChgfOJPqZ0qw9lvA5LGb5paOaOoEe7U9uQcEsiRkdG55LrBzPHyDI3GE39xSxrbJahHSk7GDNpfkJK3jgfXImN+YBB/gLBwT/rWMUy29UOQzGzafO6qAglaWLJvKpeHGrROBs= Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from DB9PR08MB7179.eurprd08.prod.outlook.com (2603:10a6:10:2cc::19) by AM8PR08MB6580.eurprd08.prod.outlook.com (2603:10a6:20b:369::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.23; Tue, 25 Oct 2022 12:53:42 +0000 Received: from DB9PR08MB7179.eurprd08.prod.outlook.com ([fe80::8999:7c8d:d088:d198]) by DB9PR08MB7179.eurprd08.prod.outlook.com ([fe80::8999:7c8d:d088:d198%5]) with mapi id 15.20.5723.029; Tue, 25 Oct 2022 12:53:42 +0000 Date: Tue, 25 Oct 2022 13:53:23 +0100 From: Szabolcs Nagy To: Wilco Dijkstra Cc: 'GNU C Library' Subject: Re: [PATCH] aarch64: Cleanup memset ifunc Message-ID: References: Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: X-ClientProxiedBy: SN4PR0501CA0112.namprd05.prod.outlook.com (2603:10b6:803:42::29) To DB9PR08MB7179.eurprd08.prod.outlook.com (2603:10a6:10:2cc::19) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: DB9PR08MB7179:EE_|AM8PR08MB6580:EE_|DBAEUR03FT026:EE_|DB9PR08MB8460:EE_ X-MS-Office365-Filtering-Correlation-Id: a4b1d260-fcd4-469e-3b21-08dab687fa8f 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: FyEZa5nf/rkmHfLnTrmMpYUIkCWfesipXNlPzrZFSg3byVlDj7tuqilcHZ++5aVHbmYQXYJdBjbUPgYwIZ0A4ci/RUBm/I/BxiP4FL2luAc/PIrv2AAtJc1qIvZFDmAz1CCBD6/vPnEtsioUBWC5PAw27wYYzSFmQuL7/6sqOPB+xcFqcgxCQopue/26GTj03om3A4u9CVD2vfv2Ia5jDNx3/6cboRoVQt3NAjga2ilzDKy1UWJUAaCj31NV0Zk4YYnqw6NttueD2hH1gW4LRU/zqeya/4EtPJ++uhUuLqx3GusKm9E0NyC/pSUPicQKiIgskdvJ3FnVIbak0l7Kpv//zhmRV/iG2k9xOUpSsu1cbDiFlHDK0yG6WiQmOtrget5EzplB8PYKtMuTWCRhsii/k6gFzeX9srZmHzCG3mSb0Nji7I9SvYtCjcylhGL/aDVnJ2C+PNVnL2MRFmRzW2a3Ek99I0wOH8y/v+XfH7xf2+S+tIilKfjxo42lqkZV9j6lJ8bBAPTjjoe7dWFOJsE20RzHcy9eb21c24tJ2hTX7wji+uTRoubHxBwDX0n+DghCAXl0Q3Li3xdRh4+G5QWvi6sZjmXQSb48OWS5Ph6OoNJLDYmoJ6kgVJgi8O00bmF/ht2IkQKz5H1sIIIYuJynmJquHNzh14NE2XzkiEBXBmM/0jbpEJy4BwgJlyWPpcN6CK7Zq+4ApLLO/WSg9w== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB9PR08MB7179.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(396003)(346002)(376002)(136003)(39860400002)(366004)(451199015)(6486002)(478600001)(86362001)(6636002)(66946007)(6506007)(66476007)(6512007)(66556008)(8676002)(4326008)(36756003)(8936002)(6862004)(5660300002)(41300700001)(37006003)(38100700002)(2616005)(186003)(44832011)(2906002)(6666004)(316002)(26005);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR08MB6580 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: DBAEUR03FT026.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: e4a94097-3f41-4fe0-ec1d-08dab687f165 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: K3SpIWtjd++huAB9JBZJIyd+BDhe87sSp48pvlMs9EWyF7aTC8oMLCfGbucPTE67NOKTXmOrPLnO620//A//oh3o/dnu7AW9HczljZHPBUWb4ERfp3Ee1fHR0/qIg4vmnAO1FnJH2bMqUQg6/fM+GlmaGH5A6LJZgei8gMQoz/TTj+6n9vq5/9aIrukrPRxXGwa6HCl+F/HmkAnkYKt4w3vlIrEC+eTbjhMfV8iGlgzbE1OTYxgMXMNigKZO4oZb95ArRoibHAfpu/6nG2xBnhGle+SO9vuas5RnvFOUsAWWywUYTCpZ1/ZpMy6DmR/WTWP+K5IypLGk+Pf4YHEnLWcny9U3ZcTZtRDQemJQ4CVHe7QDCbK+Ov8i4seT9Uq/1Ek6Nr5YONeW7uK+efcUbvRAY+Wf8/sY03eO3j39aVvTAvRTALlZBxcEuFKNc59Yg3lyieAL5xfMwS90sbFRA9NOmtXU6aFY8xTQlvpi3vDK1CujejaovpI8E5exjsOcl7Pc3YxaM4YMVG0eQI56p1uHiccgJ06Stds9fGe7toJ0VIkX8Yp9OzN1plLEBrW701Wm7WgPKNj3UI21u3s/vaSfVD88uEbMlRfclwFhuySQvwRgHl1kFXLKwEJQEgCHbG4/i+3zGhIj2RFiWNFhD/BKsm+OEmWoRODIz8wwHG9GegHyCCoPLcyLLPqGMWnutwpmw1UriOZ1/2bh/Z7JM+h08lKUekTk0mu8pVBt7NW1DmUBsSON7JsuYjflLpvrXlMKvUuVTHNBVR0Wre3sqA== 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:(13230022)(4636009)(346002)(136003)(396003)(376002)(39860400002)(451199015)(40470700004)(36840700001)(46966006)(86362001)(2906002)(36756003)(82740400003)(356005)(5660300002)(186003)(6636002)(6506007)(44832011)(40460700003)(40480700001)(6666004)(2616005)(6512007)(336012)(81166007)(26005)(36860700001)(70586007)(47076005)(41300700001)(478600001)(6486002)(82310400005)(6862004)(70206006)(37006003)(8936002)(8676002)(4326008)(316002);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2022 12:53:56.6721 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a4b1d260-fcd4-469e-3b21-08dab687fa8f 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: DBAEUR03FT026.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB8460 X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,FORGED_SPF_HELO,GIT_PATCH_0,KAM_DMARC_NONE,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,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 List-Id: The 10/12/2022 15:17, Wilco Dijkstra via Libc-alpha wrote: > > Cleanup memset ifunc selectors. The A64FX memset relies on a ZVA size of 256, > so add an explicit check. > > Passes regress, OK for commit? this is ok to commit, thanks. > > --- > > diff --git a/sysdeps/aarch64/multiarch/ifunc-impl-list.c b/sysdeps/aarch64/multiarch/ifunc-impl-list.c > index e7c4dcc0ed5a68ecd8dacc06256d0749b76912cb..ed61cac5448e345b8c93eec21d493af5aabe1d3a 100644 > --- a/sysdeps/aarch64/multiarch/ifunc-impl-list.c > +++ b/sysdeps/aarch64/multiarch/ifunc-impl-list.c > @@ -53,7 +53,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, > IFUNC_IMPL_ADD (array, i, memset, (zva_size == 64), __memset_emag) > IFUNC_IMPL_ADD (array, i, memset, 1, __memset_kunpeng) > #if HAVE_AARCH64_SVE_ASM > - IFUNC_IMPL_ADD (array, i, memset, sve, __memset_a64fx) > + IFUNC_IMPL_ADD (array, i, memset, sve && zva_size == 256, __memset_a64fx) > #endif > IFUNC_IMPL_ADD (array, i, memset, 1, __memset_generic)) > IFUNC_IMPL (i, name, memchr, > diff --git a/sysdeps/aarch64/multiarch/memset.c b/sysdeps/aarch64/multiarch/memset.c > index 884f08a3acbaeeaf5dafad3fe6e7d535c7a379f4..59bd0e64f894b4ab748fe385cdfb136f2707da94 100644 > --- a/sysdeps/aarch64/multiarch/memset.c > +++ b/sysdeps/aarch64/multiarch/memset.c > @@ -30,23 +30,31 @@ extern __typeof (__redirect_memset) __libc_memset; > > extern __typeof (__redirect_memset) __memset_emag attribute_hidden; > extern __typeof (__redirect_memset) __memset_kunpeng attribute_hidden; > -# if HAVE_AARCH64_SVE_ASM > extern __typeof (__redirect_memset) __memset_a64fx attribute_hidden; > -# endif > extern __typeof (__redirect_memset) __memset_generic attribute_hidden; > > -libc_ifunc (__libc_memset, > - IS_KUNPENG920 (midr) > - ?__memset_kunpeng > - : (IS_EMAG (midr) && zva_size == 64 > - ? __memset_emag > -# if HAVE_AARCH64_SVE_ASM > - : (IS_A64FX (midr) && sve > - ? __memset_a64fx > - : __memset_generic))); > -# else > - : __memset_generic)); > -# endif > +static inline __typeof (__redirect_memset) * > +select_memset_ifunc (void) > +{ > + INIT_ARCH (); > + > + if (sve && HAVE_AARCH64_SVE_ASM) > + { > + if (IS_A64FX (midr) && zva_size == 256) > + return __memset_a64fx; > + return __memset_generic; > + } > + > + if (IS_KUNPENG920 (midr)) > + return __memset_kunpeng; > + > + if (IS_EMAG (midr) && zva_size == 64) > + return __memset_emag; > + > + return __memset_generic; > +} > + > +libc_ifunc (__libc_memset, select_memset_ifunc ()); > > # undef memset > strong_alias (__libc_memset, memset); >