From patchwork Mon Jun 26 13:50:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Carlotti X-Patchwork-Id: 112954 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7497582vqr; Mon, 26 Jun 2023 06:51:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7MDedg5RInqaateJo9507wLiWCBRhaPqPt6RsZWvislJrbrueI1oKH1wZ8sHhgxsHD2JJZ X-Received: by 2002:a17:907:3d93:b0:988:6f63:e7c1 with SMTP id he19-20020a1709073d9300b009886f63e7c1mr23664196ejc.22.1687787486553; Mon, 26 Jun 2023 06:51:26 -0700 (PDT) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id j6-20020a170906254600b0098831afb89bsi2786146ejb.84.2023.06.26.06.51.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 06:51:26 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=jU76s8gP; arc=fail (signature failed); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 23FAA3858409 for ; Mon, 26 Jun 2023 13:51:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 23FAA3858409 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1687787485; bh=mGzXBlOuOVVlK/kzsnLrxid+pMNscvyaQLz7df7NtPI=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=jU76s8gPP6JecuV0WIvkOVUSJ9l9OeKHNvBK2/7jhA4WHj4ZgMfsJDIyQMj/vZaOz +pdEMFSgfZIF4mpCaeIepB5IWDixiaXbhMq72DQrx9AxQcL3KdM2XZf2FVfelJaLai tacV6zC4a7EeOSKY9bpSPxqC1W0R/goBARuaN4d4= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on2075.outbound.protection.outlook.com [40.107.15.75]) by sourceware.org (Postfix) with ESMTPS id 4CA7A3858D20 for ; Mon, 26 Jun 2023 13:51:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4CA7A3858D20 Received: from AS9PR06CA0087.eurprd06.prod.outlook.com (2603:10a6:20b:464::8) by VE1PR08MB5869.eurprd08.prod.outlook.com (2603:10a6:800:1b2::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Mon, 26 Jun 2023 13:51:11 +0000 Received: from AM7EUR03FT050.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:464:cafe::b0) by AS9PR06CA0087.outlook.office365.com (2603:10a6:20b:464::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.33 via Frontend Transport; Mon, 26 Jun 2023 13:51:11 +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 AM7EUR03FT050.mail.protection.outlook.com (100.127.141.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.16 via Frontend Transport; Mon, 26 Jun 2023 13:51:10 +0000 Received: ("Tessian outbound 7c913606c6e6:v142"); Mon, 26 Jun 2023 13:51:10 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: b32adb8303814a5f X-CR-MTA-TID: 64aa7808 Received: from e174c6245ec3.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 84DB7397-3E6D-433A-BD76-12E9CEAE5DB6.1; Mon, 26 Jun 2023 13:51:03 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id e174c6245ec3.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 26 Jun 2023 13:51:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k3fo2JJ1prgUoU/W9oTFGp7q/0pLoFfwwBAxqE8Dwm5CCnxqeWrzzdREJBxz438jWiYrwoJeI9wMdKPOZN9dTq0h1pouFvnYLEAA4GEPsITJBRpiTe8CgN///f1dYeBsTurKuqGGAd4LdjifDJD6hGOGGFtepDieM3ezpVL0egsCt0kZRx4jvbRD7M9vyskxkkGxGxKB/hDWbhVHS43C/C7HqbVi8FCMojnrWXTK6RSKdXlFCJDZQVo4EEQDlB2WfS0DDGOWWKd5jLtnh4nY7NqGfJ/V4pxeO/DA6VxdQDrt3Wb/00lnwsCVPvdALkU0sLECfNulUtodJjd73gh/Iw== 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=mGzXBlOuOVVlK/kzsnLrxid+pMNscvyaQLz7df7NtPI=; b=R1zWF9HjciXaXmibiar/sk3uo0juwCfzPbpNP+FxIXjSCeMkARYuGuBMARQLmoAiJLGPaFg2uQg2XUGoxYyAuCREEIvh9DSlBDhYIOaZjdy+RwhORvIqTuZK3ds9C5/+Pge5JxFyk0qcUunrh9aowmN4jPAfbVU1Ga3MLaiBm/KfC5hYkozgkPsMlH5B+U8GqIbng+qSREghP9ashps4OpKeX2CAYu6Adv1JuDWuaewcCht0PQbIvrmi9FWcQjrN+8D1K1OlgH27/ts61cYAI1I49EmMidaa1nx2DgapRHZCWQBJc/iEupPMNa0jK5IrHGRske4k2YoJtXW23ZuliA== 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 Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from AS8PR08MB6678.eurprd08.prod.outlook.com (2603:10a6:20b:398::8) by AM0PR08MB5330.eurprd08.prod.outlook.com (2603:10a6:208:17f::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Mon, 26 Jun 2023 13:51:01 +0000 Received: from AS8PR08MB6678.eurprd08.prod.outlook.com ([fe80::bcf:d5c1:39d2:8c41]) by AS8PR08MB6678.eurprd08.prod.outlook.com ([fe80::bcf:d5c1:39d2:8c41%5]) with mapi id 15.20.6521.026; Mon, 26 Jun 2023 13:51:01 +0000 Date: Mon, 26 Jun 2023 14:50:57 +0100 To: binutils@sourceware.org Subject: [PATCH] aarch64: Remove version dependencies from features Message-ID: Content-Disposition: inline X-ClientProxiedBy: LO4P265CA0191.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:311::19) To AS8PR08MB6678.eurprd08.prod.outlook.com (2603:10a6:20b:398::8) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: AS8PR08MB6678:EE_|AM0PR08MB5330:EE_|AM7EUR03FT050:EE_|VE1PR08MB5869:EE_ X-MS-Office365-Filtering-Correlation-Id: f82f059d-df4f-44de-5951-08db764c665a 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: 89U4LTGIAPswP/LikOQl+4OJ9fxjmMfrhHUar374OAwt4NTU7/1BrVrR8/RtZE93EoU1u8kmBQrAeYXiseN1JrO3J6qsQYhuOXyML7BJnQoni0VVFE1NcWY/82rEiya4qL85oKdjOG70/iHb4+5QysxY3Hv5ZhjDYf317iscGmoK6i3PXK+LlNJMj2MyR7+b9DaoJYZsP3Xqc7/EmRHsRtuy7HO7Wktuu4STtnQ44dCw1W2m11xrMh1DR6T3sRRHStvVZEB/EMk+91oaDgVffwSCv3H+VKY1vWtnThNjDUMhkbS9ktjHK5Er+8SV2GMSnC2S28b+6pfZstd53DHeXmSKc1SOXk4IFJR1iFpfDz75/4+Mq3a/mPisCXkKwssmN8F8GMMfVltw2AJTeI0RiOSuH9ZeRtPPm0lyeOqjHLWmjQz+fsT/7XpqgIPihgc8QJGxcsw+JwLVnbUahJqGFwYW+LU/DuoHivyDI8DdDUx0Pg4muFSnfLmnt8wBz69WzMSTVHB98cqfzDJO0aEeZfo9N9z7Tm/h+zr4chIXzSmVZJBD1BOtoldHekDLDsWz X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR08MB6678.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(346002)(396003)(376002)(136003)(366004)(39860400002)(451199021)(478600001)(6666004)(6486002)(83380400001)(26005)(186003)(6506007)(2906002)(5660300002)(44832011)(38100700002)(66946007)(316002)(31696002)(86362001)(8936002)(8676002)(41300700001)(6916009)(66556008)(66476007)(31686004)(6512007); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB5330 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: AM7EUR03FT050.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 8aa89a09-81f8-4b7d-c6fc-08db764c60b2 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8by9yy6pbmMt1q8p97/kXwpzNIV3QpEajImVBNTI7CBg1ql8emB0vyMDg8FUgGDBQoz/a9Zw/GSq8RLsIB74cKOhz4oJFX57LbmrpQnvyoHkguj41jPXiPOoSHh1FGcKIH+eohWDo8sw5OTi3SIxmvETrk9IMdGPsHQbpkA+xvS0P9HIn5RYh6G1qXXBULkHG4plqfUQKI7vDqBZlLrLqL1OKwH/1RjKrraStDfDyELNv+LVkCevKMwWwnC18ugqsaCRgRZBQyIDaeaem+ScREM8kYjzA+uXbbpQOXAeZQzZruA1JMflc7Kghm9LZtvxH3XSwmMFn3ypijcTFWBHV0pT+F8PLo3SJ5BLnrE76orQBQHHWb3gS5ph+exdmvs0NrsLIBdRvpRCrTa7jKYL0zBWuSDjzdgr7rF6wAuo9AeWwXgI++6Z9ibZ5vUZj3gFhYQN41A7thCegafjcv8N3m4yGofmnvD6juCl+7iLoOf8jNlXQO6pwg29b+CpDgJSG+QV1LPzli3NdkE3dtZ2Vys4s6g/oC+7C4VHRq1LulaLJDUjXNThVJGB1lIhwuP5ZEXxInG5yl2acB2ER9yPAH2APXzUzq95n1ChikWQA4QwYl3uQesmAoe5kmGSXef7ulssrfHt/7i8vJQVUxtoZWuJVNcukIbfGOBoKVXTSbDDJ6xa706lJXzDGRgLdkJ8jOxyaj1pMgvKdJ1EQzpEqZco3AsuKu2RO2B7xGJ2E+zmocPj4dFW0/LI5E9glMdF 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:(13230028)(4636009)(346002)(376002)(136003)(39850400004)(396003)(451199021)(36840700001)(40470700004)(46966006)(82310400005)(36860700001)(47076005)(6666004)(83380400001)(6486002)(336012)(26005)(6512007)(6506007)(186003)(2906002)(478600001)(5660300002)(356005)(44832011)(40460700003)(70206006)(81166007)(70586007)(31696002)(82740400003)(40480700001)(316002)(8936002)(8676002)(41300700001)(86362001)(6916009)(31686004); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2023 13:51:10.9065 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f82f059d-df4f-44de-5951-08db764c665a 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: AM7EUR03FT050.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB5869 X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FORGED_SPF_HELO, KAM_DMARC_NONE, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew Carlotti via Binutils From: Andrew Carlotti Reply-To: Andrew Carlotti Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769773451383569931?= X-GMAIL-MSGID: =?utf-8?q?1769773451383569931?= Many instructions were enabled only when both a feature flag and a minimum architecture version are specified. This behaviour differs from GCC, which (in most cases) allows features to be enabled at any architecture version. There is no need for the toolchain to restrict combinations of unrelated features in this way, so this patch removes the unnecessary dependencies. --- a/gas/testsuite/gas/aarch64/armv8_2-a-crypto-fp16-illegal.d +++ b/gas/testsuite/gas/aarch64/armv8_2-a-crypto-fp16-illegal.d @@ -1,3 +1,3 @@ -#as: -march=armv8.2-a+crypto+sm4+sha3 +#as: -march=armv8.2-a #source: armv8_2-a-illegal.s #error_output: armv8_2-a-illegal.l --- a/gas/testsuite/gas/aarch64/armv8_2-a-crypto-fp16.d +++ b/gas/testsuite/gas/aarch64/armv8_2-a-crypto-fp16.d @@ -1,4 +1,4 @@ -#as: -march=armv8.2-a+crypto+sm4+sha3+fp16fml +#as: -march=armv8-a+crypto+sm4+sha3+fp16fml #objdump: -dr .*: file format .* --- a/gas/testsuite/gas/aarch64/armv8_5-a-memtag.d +++ b/gas/testsuite/gas/aarch64/armv8_5-a-memtag.d @@ -1,4 +1,4 @@ -#as: -march=armv8.5-a+memtag +#as: -march=armv8-a+memtag # objdump: -d .*: .* --- a/gas/testsuite/gas/aarch64/dotproduct.d +++ b/gas/testsuite/gas/aarch64/dotproduct.d @@ -1,4 +1,4 @@ -#as: -march=armv8.2-a+dotprod +#as: -march=armv8-a+dotprod #as: -march=armv8.4-a #objdump: -dr --- a/gas/testsuite/gas/aarch64/f32mm.d +++ b/gas/testsuite/gas/aarch64/f32mm.d @@ -1,4 +1,4 @@ -#as: -march=armv8.6-a+sve+f32mm +#as: -march=armv8-a+sve+f32mm #objdump: -dr .*: file format .* --- a/gas/testsuite/gas/aarch64/f64mm.d +++ b/gas/testsuite/gas/aarch64/f64mm.d @@ -1,4 +1,4 @@ -#as: -march=armv8.6-a+sve+f64mm +#as: -march=armv8-a+sve+f64mm #objdump: -dr .*: file format .* --- a/gas/testsuite/gas/aarch64/i8mm.d +++ b/gas/testsuite/gas/aarch64/i8mm.d @@ -1,4 +1,5 @@ #as: -march=armv8.6-a+sve +#as: -march=armv8-a+sve+i8mm #objdump: -dr .*: file format .* --- a/gas/testsuite/gas/aarch64/illegal-dotproduct.d +++ b/gas/testsuite/gas/aarch64/illegal-dotproduct.d @@ -1,4 +1,4 @@ -#as: -march=armv8.2-a+dotprod +#as: -march=armv8-a+dotprod #as: -march=armv8.4-a #name: Invalid dotproduct instructions. #source: illegal-dotproduct.s --- a/gas/testsuite/gas/aarch64/illegal-memtag.d +++ b/gas/testsuite/gas/aarch64/illegal-memtag.d @@ -1,3 +1,3 @@ -#as: -march=armv8.5-a+memtag +#as: -march=armv8-a+memtag #source: illegal-memtag.s #error_output: illegal-memtag.l --- a/gas/testsuite/gas/aarch64/ls64-invalid.s +++ b/gas/testsuite/gas/aarch64/ls64-invalid.s @@ -1,6 +1,6 @@ /* Atomic 64-byte load/store instructions limit register number Rt to below condition: the register number should be even and <= 22. */ -.arch armv8.7-a+ls64 +.arch armv8-a+ls64 /* Single-copy Atomic 64-byte Load. */ ld64b x0, [x1] --- a/gas/testsuite/gas/aarch64/ls64.s +++ b/gas/testsuite/gas/aarch64/ls64.s @@ -1,5 +1,5 @@ /* Atomic 64-byte load/store instructions. */ -.arch armv8.6-a+ls64 +.arch armv8-a+ls64 /* Single-copy Atomic 64-byte Load. */ ld64b x0, [x1] --- a/gas/testsuite/gas/aarch64/sve-movprfx-mm.d +++ b/gas/testsuite/gas/aarch64/sve-movprfx-mm.d @@ -1,4 +1,4 @@ -#as: -march=armv8.6-a+f32mm+f64mm+sve +#as: -march=armv8-a+i8mm+f32mm+f64mm+sve #objdump: -dr .* file format .* --- a/opcodes/aarch64-tbl.h +++ b/opcodes/aarch64-tbl.h @@ -2453,7 +2453,12 @@ QLF3(V_4S, V_8H, S_H), \ } -/* Opcode table. */ +/* Opcode table. + + Any SVE or SVE2 feature must include AARCH64_FEATURE_{SVE|SVE2} in its + bitmask, even if this is implied by other selected feature bits. This + allows verify_constraints to identify SVE instructions when selecting an + error message for MOVPRFX constraint violations. */ static const aarch64_feature_set aarch64_feature_v8 = AARCH64_FEATURE (AARCH64_FEATURE_V8, 0); @@ -2488,7 +2493,7 @@ static const aarch64_feature_set aarch64_feature_compnum = static const aarch64_feature_set aarch64_feature_rcpc = AARCH64_FEATURE (AARCH64_FEATURE_RCPC, 0); static const aarch64_feature_set aarch64_feature_dotprod = - AARCH64_FEATURE (AARCH64_FEATURE_V8_2 | AARCH64_FEATURE_DOTPROD, 0); + AARCH64_FEATURE (AARCH64_FEATURE_DOTPROD, 0); static const aarch64_feature_set aarch64_feature_sha2 = AARCH64_FEATURE (AARCH64_FEATURE_V8 | AARCH64_FEATURE_SHA2, 0); static const aarch64_feature_set aarch64_feature_aes = @@ -2496,14 +2501,14 @@ static const aarch64_feature_set aarch64_feature_aes = static const aarch64_feature_set aarch64_feature_v8_4 = AARCH64_FEATURE (AARCH64_FEATURE_V8_4, 0); static const aarch64_feature_set aarch64_feature_sm4 = - AARCH64_FEATURE (AARCH64_FEATURE_V8_2 | AARCH64_FEATURE_SM4 - | AARCH64_FEATURE_SIMD | AARCH64_FEATURE_FP, 0); + AARCH64_FEATURE (AARCH64_FEATURE_SM4 | AARCH64_FEATURE_SIMD + | AARCH64_FEATURE_FP, 0); static const aarch64_feature_set aarch64_feature_sha3 = - AARCH64_FEATURE (AARCH64_FEATURE_V8_2 | AARCH64_FEATURE_SHA2 - | AARCH64_FEATURE_SHA3 | AARCH64_FEATURE_SIMD | AARCH64_FEATURE_FP, 0); + AARCH64_FEATURE (AARCH64_FEATURE_SHA2 | AARCH64_FEATURE_SHA3 + | AARCH64_FEATURE_SIMD | AARCH64_FEATURE_FP, 0); static const aarch64_feature_set aarch64_feature_fp_16_v8_2 = - AARCH64_FEATURE (AARCH64_FEATURE_V8_2 | AARCH64_FEATURE_F16_FML - | AARCH64_FEATURE_F16 | AARCH64_FEATURE_FP, 0); + AARCH64_FEATURE (AARCH64_FEATURE_F16_FML | AARCH64_FEATURE_F16 + | AARCH64_FEATURE_FP, 0); static const aarch64_feature_set aarch64_feature_v8_5 = AARCH64_FEATURE (AARCH64_FEATURE_V8_5, 0); static const aarch64_feature_set aarch64_feature_flagmanip = @@ -2515,7 +2520,7 @@ static const aarch64_feature_set aarch64_feature_sb = static const aarch64_feature_set aarch64_feature_predres = AARCH64_FEATURE (AARCH64_FEATURE_PREDRES, 0); static const aarch64_feature_set aarch64_feature_memtag = - AARCH64_FEATURE (AARCH64_FEATURE_V8_5 | AARCH64_FEATURE_MEMTAG, 0); + AARCH64_FEATURE (AARCH64_FEATURE_MEMTAG, 0); static const aarch64_feature_set aarch64_feature_bfloat16 = AARCH64_FEATURE (AARCH64_FEATURE_BFLOAT16, 0); static const aarch64_feature_set aarch64_feature_bfloat16_sve = @@ -2552,20 +2557,17 @@ static const aarch64_feature_set aarch64_feature_v8_6 = static const aarch64_feature_set aarch64_feature_v8_7 = AARCH64_FEATURE (AARCH64_FEATURE_V8_7, 0); static const aarch64_feature_set aarch64_feature_i8mm = - AARCH64_FEATURE (AARCH64_FEATURE_V8_2 | AARCH64_FEATURE_I8MM, 0); + AARCH64_FEATURE (AARCH64_FEATURE_I8MM, 0); static const aarch64_feature_set aarch64_feature_i8mm_sve = - AARCH64_FEATURE (AARCH64_FEATURE_V8_2 | AARCH64_FEATURE_I8MM - | AARCH64_FEATURE_SVE, 0); + AARCH64_FEATURE (AARCH64_FEATURE_I8MM | AARCH64_FEATURE_SVE, 0); static const aarch64_feature_set aarch64_feature_f32mm_sve = - AARCH64_FEATURE (AARCH64_FEATURE_V8_2 | AARCH64_FEATURE_F32MM - | AARCH64_FEATURE_SVE, 0); + AARCH64_FEATURE (AARCH64_FEATURE_F32MM | AARCH64_FEATURE_SVE, 0); static const aarch64_feature_set aarch64_feature_f64mm_sve = - AARCH64_FEATURE (AARCH64_FEATURE_V8_2 | AARCH64_FEATURE_F64MM - | AARCH64_FEATURE_SVE, 0); + AARCH64_FEATURE (AARCH64_FEATURE_F64MM | AARCH64_FEATURE_SVE, 0); static const aarch64_feature_set aarch64_feature_v8_r = AARCH64_FEATURE (AARCH64_FEATURE_V8_R, 0); static const aarch64_feature_set aarch64_feature_ls64 = - AARCH64_FEATURE (AARCH64_FEATURE_V8_6 | AARCH64_FEATURE_LS64, 0); + AARCH64_FEATURE (AARCH64_FEATURE_LS64, 0); static const aarch64_feature_set aarch64_feature_flagm = AARCH64_FEATURE (AARCH64_FEATURE_FLAGM, 0); static const aarch64_feature_set aarch64_feature_mops =