From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2050.outbound.protection.outlook.com [40.107.7.50]) by sourceware.org (Postfix) with ESMTPS id 0BC503858D28 for ; Tue, 17 Jan 2023 10:23:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0BC503858D28 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=vxYpgBjsRXBhKna4eCBkM76PLk4zl9hflqrbv9jzdIc=; b=vwZOS97z0n/d4aqRRLkwuB3mzzrFiTvmwCiiaB1ViHIQBwDJU7JFFjCnIrAaXzdwVUmgr6gV2QwdpqkvAP0kLdYYR2v5mKI0XpIgb6wCQFUiizqid7xTTtevnZc89U6qLws2OnU4bgZEnx5rK4tVbR8h9CJZsSIi0XUEhQPXlBI= Received: from DB8PR09CA0018.eurprd09.prod.outlook.com (2603:10a6:10:a0::31) by DB3PR08MB8914.eurprd08.prod.outlook.com (2603:10a6:10:42a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.23; Tue, 17 Jan 2023 10:23:40 +0000 Received: from DBAEUR03FT023.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:a0:cafe::33) by DB8PR09CA0018.outlook.office365.com (2603:10a6:10:a0::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.19 via Frontend Transport; Tue, 17 Jan 2023 10:23:40 +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 DBAEUR03FT023.mail.protection.outlook.com (100.127.142.253) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.13 via Frontend Transport; Tue, 17 Jan 2023 10:23:40 +0000 Received: ("Tessian outbound 0d7b2ab0f13d:v132"); Tue, 17 Jan 2023 10:23:40 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: e7fb051e33146d61 X-CR-MTA-TID: 64aa7808 Received: from 1a76b38b2423.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 929147F9-CD8E-4067-B0D5-7B90C6BEFB11.1; Tue, 17 Jan 2023 10:23:34 +0000 Received: from EUR03-DBA-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 1a76b38b2423.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 17 Jan 2023 10:23:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Jr3ovX2DmS3BJto3/FFUGRFRO4HFHrL6SQj+wJnNqLxVyi1iOKv5E+5aANDN59U8kbaXRN2awFyY8twRVuZ96Weqr+J43WQOpXTvUvy5944eJUVgnFy5S5PKw7Nnb80NTax+73IuwKFP2W8EwfIsAvFEnHfO1ZyYCpAvOFNg8JwQmo4MCcgpLJTL1AS3/kLRq2+aoKGJi0IUIZUnkB56uiYia1U323Q71mGbjy4wJNLVB+xlASOpUZAqVvobhlDOzlVeLeJ0LS/UqthpMgg35mYQVMj6ZacylLbcsg8kBUUKoXBSxC6J8178ecM6tlhb+61oYxMWgFy4KMfTNcx2lA== 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=vxYpgBjsRXBhKna4eCBkM76PLk4zl9hflqrbv9jzdIc=; b=nkLkHrUwhbavJgV6tF3bhM3RMDudxWViIvhxVF71SQgB68AZMf3yS+b8frpcSUR6TCGYs0eEkfu34arjZ0ADvmmeJtfVeyP0y7SjS4KSMi1Bsx1+ttryC47gOwFSJNMTn/bI3c+2nL4SnO/Kzzvi+a1E28eYIKXrRbmVOmQsa5c3Qr2LCARe5Arb/KzjL9hDxL+l/KEkAxv8HTDgdGJrA1YZcwJZz48im4fehQzKupugN6uEZGMKjlSydjxsVpi0smBchXyDYqf8IYY/ohGQrR7Ye4CPoMx58wWCDmSaQis0u4vTESAHt68ZWwp4sx6m5ecVjrCK5fZJ+37pxkEygg== 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=vxYpgBjsRXBhKna4eCBkM76PLk4zl9hflqrbv9jzdIc=; b=vwZOS97z0n/d4aqRRLkwuB3mzzrFiTvmwCiiaB1ViHIQBwDJU7JFFjCnIrAaXzdwVUmgr6gV2QwdpqkvAP0kLdYYR2v5mKI0XpIgb6wCQFUiizqid7xTTtevnZc89U6qLws2OnU4bgZEnx5rK4tVbR8h9CJZsSIi0XUEhQPXlBI= Received: from PAXPR08MB6926.eurprd08.prod.outlook.com (2603:10a6:102:138::24) by AS2PR08MB9739.eurprd08.prod.outlook.com (2603:10a6:20b:605::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.19; Tue, 17 Jan 2023 10:23:32 +0000 Received: from PAXPR08MB6926.eurprd08.prod.outlook.com ([fe80::a7d2:445d:606d:7046]) by PAXPR08MB6926.eurprd08.prod.outlook.com ([fe80::a7d2:445d:606d:7046%2]) with mapi id 15.20.5986.023; Tue, 17 Jan 2023 10:23:32 +0000 From: Kyrylo Tkachov To: Tejas Belagod , "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: AQHZKXogJsRDI4vSI0uIJ25zcc0cvq6iaDQQ Date: Tue, 17 Jan 2023 10:23:32 +0000 Message-ID: References: <20230116071148.427-1-tejas.belagod@arm.com> In-Reply-To: <20230116071148.427-1-tejas.belagod@arm.com> 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: PAXPR08MB6926:EE_|AS2PR08MB9739:EE_|DBAEUR03FT023:EE_|DB3PR08MB8914:EE_ X-MS-Office365-Filtering-Correlation-Id: 44417168-08ce-4d05-edff-08daf874e756 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: 0B2C4URVm2Sdl4/rKsw35Xc5hvXT1NO4hU5gx7poz6zv/xkl3oKIlRoAoSsztpSs20LNCsjKWXalLei2IYElysAYNSIN60O/EiZm8FW3/7c4VuiBQe20cvQ4EtRozIjydExwPoacY9yv7Yml4bWs5sfsWof6DaAqR1zvZWIPGWgmiO9kCqIcF/57FOJ40vISpofaOQQahbdpuXGmxbNuVt4vT+KALIjK3m4973h5SQLS2paHnBSRC5xQJ0/YQrF7YxkmWH5YOkJUVReaZedaWyxytxmVCQRNTeSowz94AW5W/fMrZsnza4VM+uDd6HnQ3qEg+g8nFd43RrWy10ia3ckdf0XO4bI/japIp24EJXBZrQxRZbBnos44alUmFnJuRyv0hqAFZJKSnfRgzTzeDF+icoB993eocTsSdv99/bPxp3WzlspIBiLJiA7PnByQhmPIXv2nNENIY3IfWtOshJl+32k2Nv5GsIJpcNXK1GUVFbbzGd8EMDrdMWB8nawDQsl6SsRPaFRWWWR4IAkz92lDQX5WyKdmES0NcWgoEQZCiahk1zKR0ekMFYuFh5Vz41TlMnDgv6T1xrHEbZ7I3f6XNihyg2fSGxYsAIBf5WI5joNlkgz06tfSxN+JkgbIX+5hPw6p5Sj0aUutwTn+XPvbMSPahGfTS+5d/1KzAdVELP3a/JR++mXUL9KHhG/hPw3+AHOBnNah2KiAvpWNvq5DxKSpmh+oroDnFVgWTgWnZS2GfXzXLOrnTm/n0i7ASjAWRo8c2Y6kzOgC8U3e0ezLyPjylVWnKjLaHBXXiAqQMil5yiX1lPeefNXmSxgL X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR08MB6926.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(396003)(346002)(366004)(136003)(376002)(39860400002)(451199015)(86362001)(84970400001)(122000001)(6506007)(38100700002)(2906002)(55016003)(33656002)(71200400001)(110136005)(316002)(7696005)(38070700005)(54906003)(83380400001)(66476007)(4326008)(66946007)(41300700001)(64756008)(76116006)(66556008)(66446008)(53546011)(9686003)(5660300002)(8676002)(8936002)(186003)(52536014)(478600001)(26005);DIR:OUT;SFP:1101; Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR08MB9739 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: DBAEUR03FT023.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 83618968-95b9-4892-786a-08daf874e271 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cNztCt0GO4j00wOS5vucjnP4fPKJgSPc58uh56BtYoH3ww9pABMp81ewDhcUc0XjSP1yJa0DsFp6fNcgfLIgRdTl9BGJrb7m+gVzk7/71zsXgHoOIUx9udJpjGf0KfeA4fqQuFhg14aPli87F7Pi8KNW4zf+vrW8EK+xvJcliDb2NWO/hIwlCBWwdDvRPkYyvqQtt3reqWhCgQmvfqw7Grd5eopo+Nn7+GEERMT04JqcudKh01tIduK/ykg53iFaQFZaBWdbOXPCAWDrfnWZ155FVb7XE2ZCLqe6UgkqeeBbJwubzrc8jNWTIxkrlGmVQXpZg7aUWFFv82VNBgRmSwSl36ruhMInnL7kKZy9nTidKFUjqbtMRXvBClCUlboKhOIMOi3hJbpFCWEBwe7rfi46Jpw8tFbk96o2pkc3lntCRsj++c1ODmE/b9fvVXwyrTlDUye0rpD1sCrUpQ5cn2D3SK54S1bLxFyNDWHJQAD+k84UPW+OUyqz/cnWMlEGukVXQ/zR31gZIAcG6CJuwqDvOGVlZvgD37q0mmr+7Js83kyuc0wz+Y3A0Ghr9vCbTcZCS4sUazNICbrq+4f55O5jqfzEx30Pn+BmW3hykyeIr+84TdQkFzG33mAjbaO8Z9x5FKAcs7h8RS0T0zI8TxAzyLrkOUk7Tkr6OoNTXJuK4QoO9Cx8Jv6uwlvrDuI4U65GszsmTPFtS1tIdAU9Xqu6uHKeWHRbmXRGeiMXsLXJJi4FHgch7QlSUNwqOEZWPVyhTqd5kP995ZOlVSbZ3w== 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)(39860400002)(346002)(396003)(136003)(451199015)(36840700001)(46966006)(40470700004)(82740400003)(81166007)(36860700001)(86362001)(8936002)(356005)(5660300002)(33656002)(70206006)(70586007)(52536014)(2906002)(40480700001)(41300700001)(55016003)(82310400005)(4326008)(40460700003)(336012)(186003)(83380400001)(316002)(8676002)(26005)(9686003)(53546011)(110136005)(54906003)(47076005)(7696005)(6506007)(478600001)(84970400001);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2023 10:23:40.7318 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 44417168-08ce-4d05-edff-08daf874e756 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: DBAEUR03FT023.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR08MB8914 X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,FORGED_SPF_HELO,GIT_PATCH_0,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: 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 >=20 > 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'. >=20 > [1] Section D17.2.61, C7.2.215 >=20 > 2022-01-11 Tejas Belagod >=20 > 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 "nothi= ng+aes" For example. Ok with a fixed ChangeLog. Thanks, Kyrill >=20 > testsuite/ >=20 > * 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 >=20 > 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 >=20 > #pragma GCC push_options > -#pragma GCC target ("+nothing+crypto") > +#pragma GCC target ("+nothing+aes") > /* vaes */ >=20 > __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 >=20 > /* vcage */ > @@ -20772,7 +20788,7 @@ vrsrad_n_u64 (uint64_t __a, uint64_t __b, const > int __c) > } >=20 > #pragma GCC push_options > -#pragma GCC target ("+nothing+crypto") > +#pragma GCC target ("+nothing+sha2") >=20 > /* vsha1 */ >=20 > @@ -20849,21 +20865,6 @@ vsha256su1q_u32 (uint32x4_t __tw0_3, > uint32x4_t __w8_11, uint32x4_t __w12_15) > __w12_15); > } >=20 > -__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 >=20 > /* 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*-*-= * } } > }*/ >=20 > #include >=20 > 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*-*-= * } } > }*/ >=20 > #include >=20 > 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 @@ >=20 > /* { dg-do compile } */ > -/* { dg-options "-march=3Darmv8-a+crypto" } */ > +/* { dg-options "-march=3Darmv8-a+aes" } */ >=20 > #include "arm_neon.h" >=20 > 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 @@ >=20 > /* { dg-do compile } */ > -/* { dg-options "-O3 -march=3Darmv8-a+crypto" } */ > +/* { dg-options "-O3 -march=3Darmv8-a+aes" } */ >=20 > #include "arm_neon.h" >=20 > @@ -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" } } */ >=20 > 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 >=20 > #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 @@ >=20 > /* { dg-do compile } */ > -/* { dg-options "-march=3Darmv8-a+crypto" } */ > +/* { dg-options "-march=3Darmv8-a+sha2" } */ >=20 > #include "arm_neon.h" >=20 > 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 @@ >=20 > /* { dg-do compile } */ > -/* { dg-options "-march=3Darmv8-a+crypto" } */ > +/* { dg-options "-march=3Darmv8-a+sha2" } */ >=20 > #include "arm_neon.h" >=20 > 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. */ >=20 > -__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