From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2047.outbound.protection.outlook.com [40.107.22.47]) by sourceware.org (Postfix) with ESMTPS id 396D23858D1E for ; Fri, 20 Jan 2023 12:57:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 396D23858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=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=w16VYIz4dy1u0cNMBcQCuZmMGEhOWEPdBNI8bdhj2xo=; b=tEtGkORY5Jo9frRJuU/d+Ra+tMohW2SxHaW7jd40GLjOUs4ZXrSAne2eAcC6NcSR2iw73X9wJ3LUx80fzSzDnIZxHWZfZiKVR7JKvYpt+hfOXAcN8PLhTrq9uDEmPq4qi2pmxEOzw1z3swa5X/PdHxK00BvwkJ9H4ykP77mdtH0= Received: from AM5PR0202CA0018.eurprd02.prod.outlook.com (2603:10a6:203:69::28) by VI1PR08MB5488.eurprd08.prod.outlook.com (2603:10a6:803:137::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.27; Fri, 20 Jan 2023 12:57:02 +0000 Received: from AM7EUR03FT015.eop-EUR03.prod.protection.outlook.com (2603:10a6:203:69:cafe::8) by AM5PR0202CA0018.outlook.office365.com (2603:10a6:203:69::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.25 via Frontend Transport; Fri, 20 Jan 2023 12:57:01 +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 AM7EUR03FT015.mail.protection.outlook.com (100.127.140.173) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6023.16 via Frontend Transport; Fri, 20 Jan 2023 12:57:01 +0000 Received: ("Tessian outbound 6e565e48ed4a:v132"); Fri, 20 Jan 2023 12:57:01 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 71a6a7a0bda37e5e X-CR-MTA-TID: 64aa7808 Received: from 609baa4d69de.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 21156AAF-3A36-4BEF-B95F-9DFAB12CEF56.1; Fri, 20 Jan 2023 12:56:51 +0000 Received: from EUR02-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 609baa4d69de.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 20 Jan 2023 12:56:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S7qjCJXAuoKnGU6Crilm8u4ZalfyHSUQCdOPw20/lNpoogcytko7TT2rbTh6zq+Rwz0QyBig8GlzFSL+X33hEdETfVstwXcitxowZ1eQwGwhwklo8iWuJLNiL1Iqsjy+q2NmjnO9TEtoSPuDXVl4HjNEhqTQvAPqXgAKwbU4cAIgI/4Zax7u0/mOXLeeNBiM47CdIO2iseDSYP0OQbQoGA5vaPuNSKhc2agTpMXeN37rhZuQUN8qyDhQTa5I3HjUXbtooIEQR1lE0MpppN9xYUgzU+xNruvS6RjHbj+gwPRPxdYPXCfoQUAycvYq088LZQGzBoVl3QL0FceaRSXL5A== 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=w16VYIz4dy1u0cNMBcQCuZmMGEhOWEPdBNI8bdhj2xo=; b=UYgvm+T7zsjNYUMplFIqrEuC9HHLdJve6Je/P2dBFML/zwmuGvVAqV/wOFem5TQs+/4U8rpmexJu0c7pDMoSc8tZ/40jvHvqW/NZNkqoAyl3MYp5xbStBwT2KxVld4xteQ2p3Xx6Zxoo91hdXju29xH0RValiC6TC+l8fvy9WQ/MZ6e3OIgXaXuqevSH8xbnmAVv2m28j3Bzk83tilpZxIdqfT70T650yf6XPhvYBLuDupwBSPH4M4way7dZ8m3XCZLlykOLHUhzflJ5cQdQVjLA3PSX/BNBJ+OWyFH2p8oHNaExm7eoQsfR1yRTfyZ6QdI/++9mzFYxBWDE3icIPQ== 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=w16VYIz4dy1u0cNMBcQCuZmMGEhOWEPdBNI8bdhj2xo=; b=tEtGkORY5Jo9frRJuU/d+Ra+tMohW2SxHaW7jd40GLjOUs4ZXrSAne2eAcC6NcSR2iw73X9wJ3LUx80fzSzDnIZxHWZfZiKVR7JKvYpt+hfOXAcN8PLhTrq9uDEmPq4qi2pmxEOzw1z3swa5X/PdHxK00BvwkJ9H4ykP77mdtH0= Received: from AS8PR08MB7079.eurprd08.prod.outlook.com (2603:10a6:20b:400::12) by AS8PR08MB9242.eurprd08.prod.outlook.com (2603:10a6:20b:5a1::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.25; Fri, 20 Jan 2023 12:56:48 +0000 Received: from AS8PR08MB7079.eurprd08.prod.outlook.com ([fe80::615a:88c7:91f3:1d79]) by AS8PR08MB7079.eurprd08.prod.outlook.com ([fe80::615a:88c7:91f3:1d79%5]) with mapi id 15.20.6002.027; Fri, 20 Jan 2023 12:56:48 +0000 From: Tejas Belagod To: Kyrylo Tkachov , "gcc-patches@gcc.gnu.org" CC: Richard Sandiford , Richard Earnshaw Subject: Re: [PATCH] AArch64: Gate various crypto intrinsics availability based on features Thread-Topic: [PATCH] AArch64: Gate various crypto intrinsics availability based on features Thread-Index: AQHZKXnug50dBlD2y0GReAs3sCZKj66iaIsAgAThYVY= Date: Fri, 20 Jan 2023 12:56:47 +0000 Message-ID: References: <20230116071148.427-1-tejas.belagod@arm.com> In-Reply-To: Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; x-ms-traffictypediagnostic: AS8PR08MB7079:EE_|AS8PR08MB9242:EE_|AM7EUR03FT015:EE_|VI1PR08MB5488:EE_ X-MS-Office365-Filtering-Correlation-Id: 9a410473-5735-4f99-b2b0-08dafae5d2d8 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: WtSk0fLQdGHW0SJ5c5Ek6Pak9Jq0siGYtEDa4yC+bwtn2GE1UGLcUPatb6e3oVWUiUuOWKgIGtlp6zfdfpLJQgsBJpXGOaEihQAWbGCPqg7V4n5p8D1fLjVAuY8ZJPrpwOGiUQaZC8uCq5wOsXroXgExITgjKVJf7z7j2kI2pU21bofT0FtQFXfxs+IMDr+4AAXfKuZa0PCf6NNFidfCp3EXpmHit2IDJgoRMiQJaUQqSC16eWNtZT0W0ugd+Hwakd093L0Bz2tKikjOr3e9ZJ2zwUMA10XGM7SJgc+/Vg3s4bx/xIb/lkh92e5gJOJtKqLn/VzyhvFc6noRWNvSjYZsNKxYG4u6a5Z9v5oOrgKFv4TkrrtTzo1zXX/FCRlGae1Qnt0N5XxCyD2D6Bxa425JGeeuWRjHzrhQ82MjIiRFqsu3rIwR17ejR3doYgqdBBo6xIjgTHOuypHkabbmE71gQch9/sYCinVDcLgkaMn+PQ2zChlgp8AaOe/ROLXdOLiFgjH7MrWry5iDMoeuqquMf3VmKXN20E5Ap6Zgnt5IApXJPenOAXs+ZaswC5qOtThPJGG1JBTYnd//rmlCH4lafetacZzDDg7wfCC6g4p3kipVdKFcP56ZUia+2r2ZE+6v10fSvaViunrzsNIVqVRDhla0QaJhQbUQWoBHaPaOgYenKWwNeWsdi5g4klxOp4a4GJ8cOoZPpQBnqOKXuIFanA4GTfzNYZNJI42jUt6SKOo8ZbHBwMLSAz5Dzj9fmRvBXqeND/4ZR3CJTgdA6Q== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS8PR08MB7079.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(396003)(39860400002)(366004)(136003)(376002)(346002)(451199015)(84970400001)(2906002)(122000001)(38100700002)(33656002)(55016003)(8676002)(7696005)(71200400001)(86362001)(316002)(54906003)(66556008)(66476007)(66946007)(91956017)(41300700001)(53546011)(110136005)(4326008)(76116006)(64756008)(66446008)(38070700005)(5660300002)(83380400001)(6506007)(9686003)(8936002)(52536014)(26005)(186003)(478600001);DIR:OUT;SFP:1101; Content-Type: multipart/alternative; boundary="_000_AS8PR08MB70793DB16AFBEBC21F5E3BD6EAC59AS8PR08MB7079eurp_" MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB9242 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: AM7EUR03FT015.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 6751148a-9b82-47ef-52a2-08dafae5ca2d X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BafBIuowyzhgSAy2M554E2dqWWPINdeBlb8FYQAJBScM0bGbs8IGclEkFPq/f+2Ez0yVj9CUW98mSFWLbmyGQLBxmWcOmP0zNdD4qBt/C6UGTtZHvnZ/blRu+chEnsdzG/PMvncrYBWrl8VU3grs+SzkaXX3Bz42E7POXChAdqHzQSMS2TbnoOd3znmH+pFcQGUbkcPbWZoB0KlqBy0VxgQpr/LXAEMsFuHkXVaB0+0tS4bi8BFH86tRX5g+G6Kq38RIOI61ZIGWNypEZFmP6wB65l0o86tBDakbN4rtFBe92HnGkIar4G0jNTeuR8iQSQo+65hwzVdmgCR3I7yJ84BGqNKTwYhSY5hs2M3sEw6uyayunKa9ZEylutcpIXebkZ/Y9yq3WVCT5/9sv/YJnP/QV7Xpw7qeqp3GuY+5wvycBxBrlsFOJ9NCrLVhueKSsaIM2ILT78zV43dUA3k2quVCA0LmFKLchEIxYIlYsUbiLKx10Cwxu2/FxDBYcoQ4mD4y5gw+kpCurWXLOZMUne3z/mWXKhMrNpTGrxGM6k/zlP5dm2A7+SGS6zCSCnix7uwnQz8OC8QGrleWmLK/Qp19VDfgd7ImiOj23o8bSe+Ghsj8iEyAyi5d2mVDZ1arwWFAw9rcU5M8eBsdefRrkXS9K4/mk5AXbgryJwAwqmxpps71pR7criMP1Efwp840uPc1wVwMzySq9BQoxUVpT9U+BxR1+IwTrbaZbffHabpONmJj01wYm76IgVLka2gJS8qgPR2zkLkdpHtE+qk6hQ== 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)(376002)(396003)(346002)(39860400002)(136003)(451199015)(46966006)(36840700001)(40470700004)(2906002)(30864003)(33656002)(478600001)(83380400001)(36860700001)(7696005)(9686003)(6506007)(53546011)(186003)(26005)(47076005)(40480700001)(336012)(70586007)(70206006)(8676002)(356005)(55016003)(8936002)(4326008)(86362001)(5660300002)(81166007)(52536014)(82740400003)(41300700001)(110136005)(40460700003)(316002)(54906003)(84970400001)(82310400005);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 12:57:01.7436 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9a410473-5735-4f99-b2b0-08dafae5d2d8 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: AM7EUR03FT015.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB5488 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,FORGED_SPF_HELO,GIT_PATCH_0,HTML_MESSAGE,KAM_DMARC_NONE,KAM_SHORT,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: --_000_AS8PR08MB70793DB16AFBEBC21F5E3BD6EAC59AS8PR08MB7079eurp_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable From: Kyrylo Tkachov Date: Tuesday, January 17, 2023 at 3:53 PM To: Tejas Belagod , gcc-patches@gcc.gnu.org Cc: Richard Sandiford , Richard Earnshaw Subject: RE: [PATCH] AArch64: Gate various crypto intrinsics availability b= ased on features Hi Tejas, > -----Original Message----- > From: Gcc-patches bounces+kyrylo.tkachov=3Darm.com@gcc.gnu.org> On Behalf Of Tejas Belagod > via Gcc-patches > Sent: Monday, January 16, 2023 7:12 AM > To: gcc-patches@gcc.gnu.org > Cc: Tejas Belagod ; Richard Sandiford > ; Richard Earnshaw > > Subject: [PATCH] AArch64: Gate various crypto intrinsics availability bas= ed on > features > > The 64-bit variant of PMULL{2} and AES instructions are available if FEAT= _AES > is implemented according to the Arm ARM [1]. Similarly FEAT_SHA1 and > FEAT_SHA256 enable the use of SHA1 and SHA256 instruction variants. > This patch fixes arm_neon.h to correctly reflect the feature availability= based > on '+aes' and '+sha2' as opposed to the ambiguous catch-all '+crypto'. > > [1] Section D17.2.61, C7.2.215 > > 2022-01-11 Tejas Belagod > > gcc/ > * config/aarch64/arm_neon.h: Gate AES and PMULL64 intrinsics > under target feature +aes as opposed to +crypto. Gate SHA1 and > SHA2 > intrinsics under +sha2. The ChangeLog should list the intrinsics affected like * config/aarch64/arm_neon.h (vmull_p64, vmull_high_p64): Gate under= "nothing+aes" For example. Ok with a fixed ChangeLog. Thanks, Kyrill Thanks for the review Kyrill, now pushed to master. OK to backport to 12? Thanks, Tejas. > > testsuite/ > > * gcc.target/aarch64/acle/pmull64.c: New. > * gcc/testsuite/gcc.target/aarch64/aes-fuse-1.c: Replace '+crypto' > with > corresponding feature flag based on the intrinsic. > * gcc.target/aarch64/aes-fuse-2.c: Likewise. > * gcc.target/aarch64/aes_1.c: Likewise. > * gcc.target/aarch64/aes_2.c: Likewise. > * gcc.target/aarch64/aes_xor_combine.c: Likewise. > * gcc.target/aarch64/sha1_1.c: Likewise. > * gcc.target/aarch64/sha256_1.c: Likewise. > * gcc.target/aarch64/target_attr_crypto_ice_1.c: Likewise. > --- > gcc/config/aarch64/arm_neon.h | 35 ++++++++++--------- > .../gcc.target/aarch64/acle/pmull64.c | 14 ++++++++ > gcc/testsuite/gcc.target/aarch64/aes-fuse-1.c | 4 +-- > gcc/testsuite/gcc.target/aarch64/aes-fuse-2.c | 4 +-- > gcc/testsuite/gcc.target/aarch64/aes_1.c | 2 +- > gcc/testsuite/gcc.target/aarch64/aes_2.c | 4 ++- > .../gcc.target/aarch64/aes_xor_combine.c | 2 +- > gcc/testsuite/gcc.target/aarch64/sha1_1.c | 2 +- > gcc/testsuite/gcc.target/aarch64/sha256_1.c | 2 +- > .../aarch64/target_attr_crypto_ice_1.c | 2 +- > 10 files changed, 44 insertions(+), 27 deletions(-) > create mode 100644 gcc/testsuite/gcc.target/aarch64/acle/pmull64.c > > diff --git a/gcc/config/aarch64/arm_neon.h > b/gcc/config/aarch64/arm_neon.h > index cf6af728ca9..a795a387b38 100644 > --- a/gcc/config/aarch64/arm_neon.h > +++ b/gcc/config/aarch64/arm_neon.h > @@ -7496,7 +7496,7 @@ vqrdmlshs_laneq_s32 (int32_t __a, int32_t __b, > int32x4_t __c, const int __d) > #pragma GCC pop_options > > #pragma GCC push_options > -#pragma GCC target ("+nothing+crypto") > +#pragma GCC target ("+nothing+aes") > /* vaes */ > > __extension__ extern __inline uint8x16_t > @@ -7526,6 +7526,22 @@ vaesimcq_u8 (uint8x16_t data) > { > return __builtin_aarch64_crypto_aesimcv16qi_uu (data); > } > + > +__extension__ extern __inline poly128_t > +__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) > +vmull_p64 (poly64_t __a, poly64_t __b) > +{ > + return > + __builtin_aarch64_crypto_pmulldi_ppp (__a, __b); > +} > + > +__extension__ extern __inline poly128_t > +__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) > +vmull_high_p64 (poly64x2_t __a, poly64x2_t __b) > +{ > + return __builtin_aarch64_crypto_pmullv2di_ppp (__a, __b); > +} > + > #pragma GCC pop_options > > /* vcage */ > @@ -20772,7 +20788,7 @@ vrsrad_n_u64 (uint64_t __a, uint64_t __b, const > int __c) > } > > #pragma GCC push_options > -#pragma GCC target ("+nothing+crypto") > +#pragma GCC target ("+nothing+sha2") > > /* vsha1 */ > > @@ -20849,21 +20865,6 @@ vsha256su1q_u32 (uint32x4_t __tw0_3, > uint32x4_t __w8_11, uint32x4_t __w12_15) > __w12_15); > } > > -__extension__ extern __inline poly128_t > -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) > -vmull_p64 (poly64_t __a, poly64_t __b) > -{ > - return > - __builtin_aarch64_crypto_pmulldi_ppp (__a, __b); > -} > - > -__extension__ extern __inline poly128_t > -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) > -vmull_high_p64 (poly64x2_t __a, poly64x2_t __b) > -{ > - return __builtin_aarch64_crypto_pmullv2di_ppp (__a, __b); > -} > - > #pragma GCC pop_options > > /* vshl */ > diff --git a/gcc/testsuite/gcc.target/aarch64/acle/pmull64.c > b/gcc/testsuite/gcc.target/aarch64/acle/pmull64.c > new file mode 100644 > index 00000000000..6a1e99e2d0d > --- /dev/null > +++ b/gcc/testsuite/gcc.target/aarch64/acle/pmull64.c > @@ -0,0 +1,14 @@ > +/* { dg-do compile } */ > +/* { dg-additional-options "-march=3Darmv8.2-a" } */ > + > +#pragma push_options > +#pragma GCC target ("+aes") > + > +#include "arm_neon.h" > + > +int foo (poly64_t a, poly64_t b) > +{ > + return vgetq_lane_s32 (vreinterpretq_s32_p128 (vmull_p64 (a, b)), 0); > +} > + > +/* { dg-final { scan-assembler "\tpmull\tv" } } */ > diff --git a/gcc/testsuite/gcc.target/aarch64/aes-fuse-1.c > b/gcc/testsuite/gcc.target/aarch64/aes-fuse-1.c > index d7b4f89919d..1b4e10f78db 100644 > --- a/gcc/testsuite/gcc.target/aarch64/aes-fuse-1.c > +++ b/gcc/testsuite/gcc.target/aarch64/aes-fuse-1.c > @@ -1,6 +1,6 @@ > /* { dg-do compile } */ > -/* { dg-options "-O3 -mcpu=3Dcortex-a72+crypto -dp" } */ > -/* { dg-additional-options "-march=3Darmv8-a+crypto" { target { aarch64*= -*-* } > } }*/ > +/* { dg-options "-O3 -mcpu=3Dcortex-a72+aes -dp" } */ > +/* { dg-additional-options "-march=3Darmv8-a+aes" { target { aarch64*-*-= * } } > }*/ > > #include > > diff --git a/gcc/testsuite/gcc.target/aarch64/aes-fuse-2.c > b/gcc/testsuite/gcc.target/aarch64/aes-fuse-2.c > index dfe01b03a36..4c028b39083 100644 > --- a/gcc/testsuite/gcc.target/aarch64/aes-fuse-2.c > +++ b/gcc/testsuite/gcc.target/aarch64/aes-fuse-2.c > @@ -1,6 +1,6 @@ > /* { dg-do compile } */ > -/* { dg-options "-O3 -mcpu=3Dcortex-a72+crypto -dp" } */ > -/* { dg-additional-options "-march=3Darmv8-a+crypto" { target { aarch64*= -*-* } > } }*/ > +/* { dg-options "-O3 -mcpu=3Dcortex-a72+aes -dp" } */ > +/* { dg-additional-options "-march=3Darmv8-a+aes" { target { aarch64*-*-= * } } > }*/ > > #include > > diff --git a/gcc/testsuite/gcc.target/aarch64/aes_1.c > b/gcc/testsuite/gcc.target/aarch64/aes_1.c > index 5578e85dab7..754c4ab90e7 100644 > --- a/gcc/testsuite/gcc.target/aarch64/aes_1.c > +++ b/gcc/testsuite/gcc.target/aarch64/aes_1.c > @@ -1,6 +1,6 @@ > > /* { dg-do compile } */ > -/* { dg-options "-march=3Darmv8-a+crypto" } */ > +/* { dg-options "-march=3Darmv8-a+aes" } */ > > #include "arm_neon.h" > > diff --git a/gcc/testsuite/gcc.target/aarch64/aes_2.c > b/gcc/testsuite/gcc.target/aarch64/aes_2.c > index 70f113fb5ab..442c1006706 100644 > --- a/gcc/testsuite/gcc.target/aarch64/aes_2.c > +++ b/gcc/testsuite/gcc.target/aarch64/aes_2.c > @@ -1,6 +1,6 @@ > > /* { dg-do compile } */ > -/* { dg-options "-O3 -march=3Darmv8-a+crypto" } */ > +/* { dg-options "-O3 -march=3Darmv8-a+aes" } */ > > #include "arm_neon.h" > > @@ -76,4 +76,6 @@ test7 (uint8x16_t a, uint8x16_t b) > return result; > } > /* { dg-final { scan-assembler-not "mov" } } */ > +/* { dg-final { scan-assembler "aesd\tv" } } */ > +/* { dg-final { scan-assembler "aese\tv" } } */ > > diff --git a/gcc/testsuite/gcc.target/aarch64/aes_xor_combine.c > b/gcc/testsuite/gcc.target/aarch64/aes_xor_combine.c > index 833e9b3073b..ee0f0e99856 100644 > --- a/gcc/testsuite/gcc.target/aarch64/aes_xor_combine.c > +++ b/gcc/testsuite/gcc.target/aarch64/aes_xor_combine.c > @@ -1,5 +1,5 @@ > /* { dg-do compile } */ > -/* { dg-options "-O3 -mcpu=3Dcortex-a55+crypto" } */ > +/* { dg-options "-O3 -mcpu=3Dcortex-a55+aes" } */ > #include > > #define AESE(r, v, key) (r =3D vaeseq_u8 ((v), (key))); > diff --git a/gcc/testsuite/gcc.target/aarch64/sha1_1.c > b/gcc/testsuite/gcc.target/aarch64/sha1_1.c > index e208fe7d93f..ba56c04a118 100644 > --- a/gcc/testsuite/gcc.target/aarch64/sha1_1.c > +++ b/gcc/testsuite/gcc.target/aarch64/sha1_1.c > @@ -1,6 +1,6 @@ > > /* { dg-do compile } */ > -/* { dg-options "-march=3Darmv8-a+crypto" } */ > +/* { dg-options "-march=3Darmv8-a+sha2" } */ > > #include "arm_neon.h" > > diff --git a/gcc/testsuite/gcc.target/aarch64/sha256_1.c > b/gcc/testsuite/gcc.target/aarch64/sha256_1.c > index 2102daf20a3..c3860c6b537 100644 > --- a/gcc/testsuite/gcc.target/aarch64/sha256_1.c > +++ b/gcc/testsuite/gcc.target/aarch64/sha256_1.c > @@ -1,6 +1,6 @@ > > /* { dg-do compile } */ > -/* { dg-options "-march=3Darmv8-a+crypto" } */ > +/* { dg-options "-march=3Darmv8-a+sha2" } */ > > #include "arm_neon.h" > > diff --git a/gcc/testsuite/gcc.target/aarch64/target_attr_crypto_ice_1.c > b/gcc/testsuite/gcc.target/aarch64/target_attr_crypto_ice_1.c > index c74cc900f98..3b354c06110 100644 > --- a/gcc/testsuite/gcc.target/aarch64/target_attr_crypto_ice_1.c > +++ b/gcc/testsuite/gcc.target/aarch64/target_attr_crypto_ice_1.c > @@ -6,7 +6,7 @@ > /* Unless we do something about re-laying out the SIMD builtin types > this testcase ICEs during expansion of the crypto builtin. */ > > -__attribute__ ((target ("cpu=3Dcortex-a57+crypto"))) > +__attribute__ ((target ("cpu=3Dcortex-a57+sha2"))) > uint32x4_t > test_vsha1cq_u32 (uint32x4_t hash_abcd, uint32_t hash_e, uint32x4_t wk) > { > -- > 2.17.1 --_000_AS8PR08MB70793DB16AFBEBC21F5E3BD6EAC59AS8PR08MB7079eurp_--