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 8F8B33875A2C for ; Thu, 30 Jun 2022 12:55:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8F8B33875A2C ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DeJ+GKRhDiNFgehCPA8RfjFrfVM5lmQwMgU9Ndo5hTbydskmPrkJSUhTu103VjCuPQ7EPKlK5CTV8be+5qFoKEo93wpOSJoL5XKB635slhXnez96CYUtA5Q6wz4Tj2OjakuZSypfwOA5PCmT8Ri+lEE41r+w9Xib+uAU0k8T1Rov658uslf5Iue5Gj3tponypugXnULxAZNFOiLC1YjCkad6WRMR52lAwIYs/xrlwKbizOvxCSCptrzjvdy/H/EM5Dtoi460zXaY/Tmj8M6qC+WHSttjLlfVKtYpej8nWLJLzsnf2QikcwHJpvY9yGtzLzMUmykDo68xjtwmME075Q== 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=yibl2B84v+qsfE4GmMh5St0n71s/GzUxvZ1ZZ2Cbe68=; b=WgoGAm11qWltgSYsLIyfGB8PaTJSUgs/PsRljhanwAnwQM9FU85BAxjRomyul0M+6KAWeJXLZJwwE7wSvbA0QsBd/OLw927KmbJNaGDo9g4n7zatxMUaD2JUWTr5QqSzuFTiXpZFXhGwRWx4ckHoD4dZCfpkUxIExvueSNui6W8EWqKf6580yupZW7NyGGfFVsA74ApI91kIzzlu2T89u6MG066fSoR3193Q8HeOk4r1N+IGYW6fiQDGJqf7STjiCPDJpkYHI1TL3qt01MTAbmE4whtzJChCAhosYS+mSfae4CRU3qfA7sxtfe3NR2vq8NEwbQ/8vGIJMllHvtfWYg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AM6PR04MB4629.eurprd04.prod.outlook.com (2603:10a6:20b:24::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14; Thu, 30 Jun 2022 12:55:18 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b%7]) with mapi id 15.20.5395.014; Thu, 30 Jun 2022 12:55:18 +0000 Message-ID: <384252a8-9c09-02f6-ef86-bf22d79db036@suse.com> Date: Thu, 30 Jun 2022 14:55:17 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Subject: [PATCH 6/7] x86: generalize disabling of sub-architectures Content-Language: en-US To: Binutils References: <01f502ff-5b51-86d3-ed54-646df7d22037@suse.com> From: Jan Beulich In-Reply-To: <01f502ff-5b51-86d3-ed54-646df7d22037@suse.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: AS9PR07CA0053.eurprd07.prod.outlook.com (2603:10a6:20b:46b::20) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 29bbcca6-f63c-4251-adaa-08da5a97c902 X-MS-TrafficTypeDiagnostic: AM6PR04MB4629:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4/1B6AjpQsEjx0wP6doCHemi7Td5ePLyFJFhNgSrc4OcdcmcOV3OryC6eTcEygdDnmEuxO0YOrgE9iauQd4PspKQqdZco3pMPAQ8Mt0wHApHFexZqlrp8tvw55MzC7bvKSA/y8OoNj2DvZwa/Bcq5BWc8dpd0XNTZcpJgWOJPZnaIIVsCS0xku6udGFos+pZoP6QWbKUCbZ/bestNqCc+gJ2nsPo6RhgHz4V7PB+FaUGq3t5aEoyF2Ez2x/2M33gPgjzAlZ16erSNwBDmTbn3cSIbLHUfIC1Y6IuF7Deizaz9eWB/XOOehfK7ozPuwSo7nwTeToDEGx/rFLYm/HYjENKz2A+3GCj/jQHugxu7aRvI+MDerVOZdcO/dOyz3C49hYgpR9iGJ05tsTKP/+6Yef5eX2vdJx/4rOo9lAlTfbmoHWKslMPMZxfrwOrO9DFgVZssAjly5OOJ2Iz9kCjGJ2G7hJg1mAI2vkQsQt0coYSCRFafm/fX+ie6gO+E4+abaATCyylpoUfk89qxDigMjVMmzz7/atdAWNebXGw7a8Mm4o1b4TUIkJ02wjmfE7fuxVXbgLb2zI9rsvzbwrmtI9zzcawv28KnYgdU3iUdrrPDXoJaoWOxFob8ZLDr74Ce3q87AQaELsXxa5EusWSViU/WWlBin7X4wlFsasz/+cw1cPMGvkNEMd59HIVRbsJGUSIa5yN3pVqZ0Trt+0Uutgs6z7jBoGpN9zbmBJ9koyjSeJ8xtRMHQOyK5WadOAlZIvyjg2gXqSPomShK5gzftUv2nS3P3EtumxUDM1XVy5eizGRMwSVJQdS1sWKu8qMLytsDa046lSpB1x8obEva95/o9E/IeH3+gc+NSWxdMk= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VE1PR04MB6560.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(366004)(346002)(136003)(396003)(376002)(39860400002)(8936002)(30864003)(31686004)(41300700001)(186003)(36756003)(83380400001)(5660300002)(2906002)(31696002)(6512007)(6916009)(6486002)(8676002)(2616005)(66556008)(66476007)(86362001)(478600001)(66946007)(4326008)(26005)(6506007)(38100700002)(316002)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bVM4K0pUSzQwU0V6OHErZ0hSdDVzUndMcjZJWGlLdkJhMmxmRS9qbnNrTDlC?= =?utf-8?B?QWJheTR1eFI3MUkxTzJ1a0hiUUs4U1ZlN0E1WDBzeEZiMHVPNGplRzhkN1RJ?= =?utf-8?B?MEpCMnNuMTNTSzE0Q0tsekM2QWNoUzgrOXZMaFNTOWNlL0FMN1pJd1JvVGlO?= =?utf-8?B?RGpZVVdlOEl1RTI3U09pRm5kV0RCcUJ2WDRPWW9jN0VSSXVTR0hhb25GK2Rn?= =?utf-8?B?MnpjSWVwbG1waGdNNnEvaVlYOW9JOVUwTnMxcnpOSGtiM0VJK29ZYk5DSFVG?= =?utf-8?B?TDdaTjZKKytMbXovN2JtVTZPMTBmWlUwYUpGK0pCNFZSeTZEd25BTUw5Y2hW?= =?utf-8?B?enRTTE9xcTJZYnBVb0ZqcVlBb014ZHV1TURlaHZqWWVvbVYrZnBPUjV4QUtZ?= =?utf-8?B?b0o2WC93cFZaRkJ4MzcvdWIraFRnZk9qalJ0QjhtNlMydzRuS1ZJMGl4Ry83?= =?utf-8?B?ZGtIOCtYaFNzempoYWlXT0lvMG5DSTd6SzRCMitMejZIYW9tZWZqamdsMHNB?= =?utf-8?B?YWJxZUR6UEs3Wmh3aVAvR2tGSy90eEtXWDVDQVVjYnZWUUQrQ3QrcHR3YnZS?= =?utf-8?B?bTBYeERBeEQralRxMjEzcVdVWTJQOElrU0J6YTlzTzJVUGVMaVlwQkFpcGhP?= =?utf-8?B?cWkrTFZic1dYSWQzR3kzV3hnYWU3YmUzemRFMFJSTHJEcGVXY3ZNUjlvcm4z?= =?utf-8?B?ekV0SytOMjN5UExGOW1oc05ndkNxU29tQWRpSWRReTkrQlUyQUR4R1l3cGs4?= =?utf-8?B?Tmk3VHlBK3R1cFovQWJDSU9uZGo4R25nRkVKb3IrbFNFY0g2QTNrOW5hUXJB?= =?utf-8?B?Y3AyamUxQ3QvK3FRTENzdk10ZDE4NzN1blVoUGVtT3VZcjQyMzNVS25ybGZr?= =?utf-8?B?NmhaRG1Lc0Ftd05jc0czV0FHSFAwOFowUkhMQWtyaEJlV1ZSY3VuRG9qQitz?= =?utf-8?B?QmtiSENoZCtKaFNzamM3aVZEakxZeWNudFlxNUFmN2l6UU42N0ppWG5tNDZp?= =?utf-8?B?dm5LWEFGajkxYzY1MHFNRjVvYkRvcG5sQU5pa0c2SWFpcGpmaGN0VGl1ZHpL?= =?utf-8?B?TzVjdG80ZU4yeUJ6RHR6RW9uY1ZaWWM0KzlTdlE5UXlpYmYrVXhoRUxVNWdk?= =?utf-8?B?bUZERlNXNVQ0ZVZldnNIN1lESjFwWVRURzk2UHZoblhMWm9JbURIMUY0emhE?= =?utf-8?B?NlptSXV4cFRGWW84RWZrekhxeDYyazhuTW1yQzgzdW9vVW1kWVlDUTNwdEtI?= =?utf-8?B?NEtOSHRGMkF6WHNvSmdVSlVqK2pucXZKSWthRE9kRGMvNEsvMWhMTEM4LzFt?= =?utf-8?B?eFVjMHFNWmtFenplRzZlT2RQYi9EdjZyZStleW80clJqOFFUYXY4dS84RlBo?= =?utf-8?B?ZHRaVWhVblRqL1NMd1ZSK3ViRGFRM01OemhKZ1c1R0xieE50c002cmgvQmxK?= =?utf-8?B?NnBxZU0xc0tqZzhYRThGSzVDa1RuYnpJRS96Z2hqU0ZUZHpyNGl1NWtGR3NT?= =?utf-8?B?MFBnblp4ZzhjVlFHY3lDdXdOM0N4YVlEVi9XcVRBMlpuSGwyd2liTXJmOXd4?= =?utf-8?B?ejhEMVplb0dJMmdTdVZ0bVBYL1l6dXlRQ1gzR2FSaTN2empTZ2F1d3hxeGli?= =?utf-8?B?L1lqOE82TUVaT1lZOWx0b0tJOHJYbFhyWTNZS2lKMDFCS1BEL1ZWN2U5ZHBE?= =?utf-8?B?Y0VJbkZXeFRobGcwWlRlbCtrOGkycWc4SHlwNnQ2d0xia3AvTkhWNUxlc1M5?= =?utf-8?B?T0FOM2tIYWxmbnM3MHBVR2dyeTZ5OXk1S1UwbEpDWDFxN0hDSUZyZ1pZSmh3?= =?utf-8?B?djArNjZUT3VIOTV4aTdTdzdjbXhza2hLSzFOMjBGOENIUk9xUFRWSFo3QWp1?= =?utf-8?B?L0QyeFM0YmxhamxScXhSYXNNcjlLbXFTcHpVSjVqRXVJYmI1WmYxTHhNOG9r?= =?utf-8?B?UkNuVzN3M25rekRoMUloelJvUGhKQmNHR1FVdjJxdFhkVk9YdE9QcFVHV016?= =?utf-8?B?eitpenA3amJyZ3ZVR3BNckpxdlBqa011T0FqREttdGgwYWhUaTdHOEZXTisw?= =?utf-8?B?WEozcDRFdzdZeGVHZGxYS2pxeGpPbVVDWTNMVlZabmF4OGtVS2h2SnBlN1Ar?= =?utf-8?Q?eCazIokwPG0XRHkq/UqA+1xwE?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 29bbcca6-f63c-4251-adaa-08da5a97c902 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2022 12:55:18.6866 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: cAczwbbDUZYLoHFd85GRWDEzsOhQXiWJPg+2Je1rIoTtxK/Y5TNBO4amj44bUBxkBzr300c/qHlM6c8QRjrM9g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4629 X-Spam-Status: No, score=-3030.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham 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-List-Received-Date: Thu, 30 Jun 2022 12:55:24 -0000 I never really understood upon what basis ".arch .no*" options were made available. Let's not have any "criteria" at all, and simply allow disabling of all of them. Then we also have all data for a sub-arch in a single place, as we now only need a single table. --- For now I've re-used all CPU_ANY_*_FLAGS there were, but I think we might be better off introducing such only once dependent features appear. Until then the base CPU_*_FLAGS can very well be used, just like done here in all cases where there was no suitable CPU_ANY_*_FLAGS. --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -129,19 +129,11 @@ typedef struct unsigned int len:8; /* arch string length */ bool skip:1; /* show_arch should skip this. */ enum processor_type type; /* arch type */ - i386_cpu_flags flags; /* cpu feature flags */ + i386_cpu_flags enable; /* cpu feature enable flags */ + i386_cpu_flags disable; /* cpu feature disable flags */ } arch_entry; -/* Used to turn off indicated flags. */ -typedef struct -{ - const char *name; /* arch name */ - unsigned int len; /* arch string length */ - i386_cpu_flags flags; /* cpu feature flags */ -} -noarch_entry; - static void update_code_flag (int, int); static void set_code_flag (int); static void set_16bit_gcc_code_flag (int); @@ -932,9 +924,11 @@ const relax_typeS md_relax_table[] = }; #define ARCH(n, t, f, s) \ - { STRING_COMMA_LEN (#n), s, PROCESSOR_ ## t, CPU_ ## f ## _FLAGS } -#define SUBARCH(n, e, s) \ - { STRING_COMMA_LEN ("." #n), s, PROCESSOR_NONE, CPU_ ## e ## _FLAGS } + { STRING_COMMA_LEN (#n), s, PROCESSOR_ ## t, CPU_ ## f ## _FLAGS, \ + CPU_NONE_FLAGS } +#define SUBARCH(n, e, d, s) \ + { STRING_COMMA_LEN (#n), s, PROCESSOR_NONE, CPU_ ## e ## _FLAGS, \ + CPU_ ## d ## _FLAGS } static const arch_entry cpu_arch[] = { @@ -979,182 +973,128 @@ static const arch_entry cpu_arch[] = ARCH (btver1, BT, BTVER1, false), ARCH (btver2, BT, BTVER2, false), - SUBARCH (8087, 8087, false), - SUBARCH (287, 287, false), - SUBARCH (387, 387, false), - SUBARCH (687, 687, false), - SUBARCH (cmov, CMOV, false), - SUBARCH (fxsr, FXSR, false), - SUBARCH (mmx, MMX, false), - SUBARCH (sse, SSE, false), - SUBARCH (sse2, SSE2, false), - SUBARCH (sse3, SSE3, false), - SUBARCH (sse4a, SSE4A, false), - SUBARCH (ssse3, SSSE3, false), - SUBARCH (sse4.1, SSE4_1, false), - SUBARCH (sse4.2, SSE4_2, false), - SUBARCH (sse4, SSE4_2, false), - SUBARCH (avx, AVX, false), - SUBARCH (avx2, AVX2, false), - SUBARCH (avx512f, AVX512F, false), - SUBARCH (avx512cd, AVX512CD, false), - SUBARCH (avx512er, AVX512ER, false), - SUBARCH (avx512pf, AVX512PF, false), - SUBARCH (avx512dq, AVX512DQ, false), - SUBARCH (avx512bw, AVX512BW, false), - SUBARCH (avx512vl, AVX512VL, false), - SUBARCH (vmx, VMX, false), - SUBARCH (vmfunc, VMFUNC, false), - SUBARCH (smx, SMX, false), - SUBARCH (xsave, XSAVE, false), - SUBARCH (xsaveopt, XSAVEOPT, false), - SUBARCH (xsavec, XSAVEC, false), - SUBARCH (xsaves, XSAVES, false), - SUBARCH (aes, AES, false), - SUBARCH (pclmul, PCLMUL, false), - SUBARCH (clmul, PCLMUL, true), - SUBARCH (fsgsbase, FSGSBASE, false), - SUBARCH (rdrnd, RDRND, false), - SUBARCH (f16c, F16C, false), - SUBARCH (bmi2, BMI2, false), - SUBARCH (fma, FMA, false), - SUBARCH (fma4, FMA4, false), - SUBARCH (xop, XOP, false), - SUBARCH (lwp, LWP, false), - SUBARCH (movbe, MOVBE, false), - SUBARCH (cx16, CX16, false), - SUBARCH (ept, EPT, false), - SUBARCH (lzcnt, LZCNT, false), - SUBARCH (popcnt, POPCNT, false), - SUBARCH (hle, HLE, false), - SUBARCH (rtm, RTM, false), - SUBARCH (invpcid, INVPCID, false), - SUBARCH (clflush, CLFLUSH, false), - SUBARCH (nop, NOP, false), - SUBARCH (syscall, SYSCALL, false), - SUBARCH (rdtscp, RDTSCP, false), - SUBARCH (3dnow, 3DNOW, false), - SUBARCH (3dnowa, 3DNOWA, false), - SUBARCH (padlock, PADLOCK, false), - SUBARCH (pacifica, SVME, true), - SUBARCH (svme, SVME, false), - SUBARCH (sse4a, SSE4A, false), - SUBARCH (abm, ABM, false), - SUBARCH (bmi, BMI, false), - SUBARCH (tbm, TBM, false), - SUBARCH (adx, ADX, false), - SUBARCH (rdseed, RDSEED, false), - SUBARCH (prfchw, PRFCHW, false), - SUBARCH (smap, SMAP, false), - SUBARCH (mpx, MPX, false), - SUBARCH (sha, SHA, false), - SUBARCH (clflushopt, CLFLUSHOPT, false), - SUBARCH (prefetchwt1, PREFETCHWT1, false), - SUBARCH (se1, SE1, false), - SUBARCH (clwb, CLWB, false), - SUBARCH (avx512ifma, AVX512IFMA, false), - SUBARCH (avx512vbmi, AVX512VBMI, false), - SUBARCH (avx512_4fmaps, AVX512_4FMAPS, false), - SUBARCH (avx512_4vnniw, AVX512_4VNNIW, false), - SUBARCH (avx512_vpopcntdq, AVX512_VPOPCNTDQ, false), - SUBARCH (avx512_vbmi2, AVX512_VBMI2, false), - SUBARCH (avx512_vnni, AVX512_VNNI, false), - SUBARCH (avx512_bitalg, AVX512_BITALG, false), - SUBARCH (avx_vnni, AVX_VNNI, false), - SUBARCH (clzero, CLZERO, false), - SUBARCH (mwaitx, MWAITX, false), - SUBARCH (ospke, OSPKE, false), - SUBARCH (rdpid, RDPID, false), - SUBARCH (ptwrite, PTWRITE, false), - SUBARCH (ibt, IBT, false), - SUBARCH (shstk, SHSTK, false), - SUBARCH (gfni, GFNI, false), - SUBARCH (vaes, VAES, false), - SUBARCH (vpclmulqdq, VPCLMULQDQ, false), - SUBARCH (wbnoinvd, WBNOINVD, false), - SUBARCH (pconfig, PCONFIG, false), - SUBARCH (waitpkg, WAITPKG, false), - SUBARCH (cldemote, CLDEMOTE, false), - SUBARCH (amx_int8, AMX_INT8, false), - SUBARCH (amx_bf16, AMX_BF16, false), - SUBARCH (amx_tile, AMX_TILE, false), - SUBARCH (movdiri, MOVDIRI, false), - SUBARCH (movdir64b, MOVDIR64B, false), - SUBARCH (avx512_bf16, AVX512_BF16, false), - SUBARCH (avx512_vp2intersect, AVX512_VP2INTERSECT, false), - SUBARCH (tdx, TDX, false), - SUBARCH (enqcmd, ENQCMD, false), - SUBARCH (serialize, SERIALIZE, false), - SUBARCH (rdpru, RDPRU, false), - SUBARCH (mcommit, MCOMMIT, false), - SUBARCH (sev_es, SEV_ES, false), - SUBARCH (tsxldtrk, TSXLDTRK, false), - SUBARCH (kl, KL, false), - SUBARCH (widekl, WIDEKL, false), - SUBARCH (uintr, UINTR, false), - SUBARCH (hreset, HRESET, false), - SUBARCH (avx512_fp16, AVX512_FP16, false), + SUBARCH (8087, 8087, ANY_X87, false), + SUBARCH (87, NONE, ANY_X87, false), /* Disable only! */ + SUBARCH (287, 287, ANY_287, false), + SUBARCH (387, 387, ANY_387, false), + SUBARCH (687, 687, ANY_687, false), + SUBARCH (cmov, CMOV, ANY_CMOV, false), + SUBARCH (fxsr, FXSR, ANY_FXSR, false), + SUBARCH (mmx, MMX, ANY_MMX, false), + SUBARCH (sse, SSE, ANY_SSE, false), + SUBARCH (sse2, SSE2, ANY_SSE2, false), + SUBARCH (sse3, SSE3, ANY_SSE3, false), + SUBARCH (sse4a, SSE4A, ANY_SSE4A, false), + SUBARCH (ssse3, SSSE3, ANY_SSSE3, false), + SUBARCH (sse4.1, SSE4_1, ANY_SSE4_1, false), + SUBARCH (sse4.2, SSE4_2, ANY_SSE4_2, false), + SUBARCH (sse4, SSE4_2, ANY_SSE4_1, false), + SUBARCH (avx, AVX, ANY_AVX, false), + SUBARCH (avx2, AVX2, ANY_AVX2, false), + SUBARCH (avx512f, AVX512F, ANY_AVX512F, false), + SUBARCH (avx512cd, AVX512CD, ANY_AVX512CD, false), + SUBARCH (avx512er, AVX512ER, ANY_AVX512ER, false), + SUBARCH (avx512pf, AVX512PF, ANY_AVX512PF, false), + SUBARCH (avx512dq, AVX512DQ, ANY_AVX512DQ, false), + SUBARCH (avx512bw, AVX512BW, ANY_AVX512BW, false), + SUBARCH (avx512vl, AVX512VL, ANY_AVX512VL, false), + SUBARCH (vmx, VMX, VMX, false), + SUBARCH (vmfunc, VMFUNC, VMFUNC, false), + SUBARCH (smx, SMX, SMX, false), + SUBARCH (xsave, XSAVE, XSAVE, false), + SUBARCH (xsaveopt, XSAVEOPT, XSAVEOPT, false), + SUBARCH (xsavec, XSAVEC, XSAVEC, false), + SUBARCH (xsaves, XSAVES, XSAVES, false), + SUBARCH (aes, AES, AES, false), + SUBARCH (pclmul, PCLMUL, PCLMUL, false), + SUBARCH (clmul, PCLMUL, PCLMUL, true), + SUBARCH (fsgsbase, FSGSBASE, FSGSBASE, false), + SUBARCH (rdrnd, RDRND, RDRND, false), + SUBARCH (f16c, F16C, F16C, false), + SUBARCH (bmi2, BMI2, BMI2, false), + SUBARCH (fma, FMA, FMA, false), + SUBARCH (fma4, FMA4, FMA4, false), + SUBARCH (xop, XOP, XOP, false), + SUBARCH (lwp, LWP, LWP, false), + SUBARCH (movbe, MOVBE, MOVBE, false), + SUBARCH (cx16, CX16, CX16, false), + SUBARCH (ept, EPT, EPT, false), + SUBARCH (lzcnt, LZCNT, LZCNT, false), + SUBARCH (popcnt, POPCNT, POPCNT, false), + SUBARCH (hle, HLE, HLE, false), + SUBARCH (rtm, RTM, RTM, false), + SUBARCH (invpcid, INVPCID, INVPCID, false), + SUBARCH (clflush, CLFLUSH, CLFLUSH, false), + SUBARCH (nop, NOP, NOP, false), + SUBARCH (syscall, SYSCALL, SYSCALL, false), + SUBARCH (rdtscp, RDTSCP, RDTSCP, false), + SUBARCH (3dnow, 3DNOW, 3DNOW, false), + SUBARCH (3dnowa, 3DNOWA, 3DNOWA, false), + SUBARCH (padlock, PADLOCK, PADLOCK, false), + SUBARCH (pacifica, SVME, SVME, true), + SUBARCH (svme, SVME, SVME, false), + SUBARCH (sse4a, SSE4A, SSE4A, false), + SUBARCH (abm, ABM, ABM, false), + SUBARCH (bmi, BMI, BMI, false), + SUBARCH (tbm, TBM, TBM, false), + SUBARCH (adx, ADX, ADX, false), + SUBARCH (rdseed, RDSEED, RDSEED, false), + SUBARCH (prfchw, PRFCHW, PRFCHW, false), + SUBARCH (smap, SMAP, SMAP, false), + SUBARCH (mpx, MPX, MPX, false), + SUBARCH (sha, SHA, SHA, false), + SUBARCH (clflushopt, CLFLUSHOPT, CLFLUSHOPT, false), + SUBARCH (prefetchwt1, PREFETCHWT1, PREFETCHWT1, false), + SUBARCH (se1, SE1, SE1, false), + SUBARCH (clwb, CLWB, CLWB, false), + SUBARCH (avx512ifma, AVX512IFMA, ANY_AVX512IFMA, false), + SUBARCH (avx512vbmi, AVX512VBMI, ANY_AVX512VBMI, false), + SUBARCH (avx512_4fmaps, AVX512_4FMAPS, ANY_AVX512_4FMAPS, false), + SUBARCH (avx512_4vnniw, AVX512_4VNNIW, ANY_AVX512_4VNNIW, false), + SUBARCH (avx512_vpopcntdq, AVX512_VPOPCNTDQ, ANY_AVX512_VPOPCNTDQ, false), + SUBARCH (avx512_vbmi2, AVX512_VBMI2, ANY_AVX512_VBMI2, false), + SUBARCH (avx512_vnni, AVX512_VNNI, ANY_AVX512_VNNI, false), + SUBARCH (avx512_bitalg, AVX512_BITALG, ANY_AVX512_BITALG, false), + SUBARCH (avx_vnni, AVX_VNNI, ANY_AVX_VNNI, false), + SUBARCH (clzero, CLZERO, CLZERO, false), + SUBARCH (mwaitx, MWAITX, MWAITX, false), + SUBARCH (ospke, OSPKE, OSPKE, false), + SUBARCH (rdpid, RDPID, RDPID, false), + SUBARCH (ptwrite, PTWRITE, PTWRITE, false), + SUBARCH (ibt, IBT, ANY_IBT, false), + SUBARCH (shstk, SHSTK, ANY_SHSTK, false), + SUBARCH (gfni, GFNI, GFNI, false), + SUBARCH (vaes, VAES, VAES, false), + SUBARCH (vpclmulqdq, VPCLMULQDQ, VPCLMULQDQ, false), + SUBARCH (wbnoinvd, WBNOINVD, WBNOINVD, false), + SUBARCH (pconfig, PCONFIG, PCONFIG, false), + SUBARCH (waitpkg, WAITPKG, WAITPKG, false), + SUBARCH (cldemote, CLDEMOTE, CLDEMOTE, false), + SUBARCH (amx_int8, AMX_INT8, ANY_AMX_INT8, false), + SUBARCH (amx_bf16, AMX_BF16, ANY_AMX_BF16, false), + SUBARCH (amx_tile, AMX_TILE, ANY_AMX_TILE, false), + SUBARCH (movdiri, MOVDIRI, ANY_MOVDIRI, false), + SUBARCH (movdir64b, MOVDIR64B, ANY_MOVDIR64B, false), + SUBARCH (avx512_bf16, AVX512_BF16, ANY_AVX512_BF16, false), + SUBARCH (avx512_vp2intersect, AVX512_VP2INTERSECT, + ANY_AVX512_VP2INTERSECT, false), + SUBARCH (tdx, TDX, ANY_TDX, false), + SUBARCH (enqcmd, ENQCMD, ANY_ENQCMD, false), + SUBARCH (serialize, SERIALIZE, ANY_SERIALIZE, false), + SUBARCH (rdpru, RDPRU, RDPRU, false), + SUBARCH (mcommit, MCOMMIT, MCOMMIT, false), + SUBARCH (sev_es, SEV_ES, SEV_ES, false), + SUBARCH (tsxldtrk, TSXLDTRK, ANY_TSXLDTRK, false), + SUBARCH (kl, KL, ANY_KL, false), + SUBARCH (widekl, WIDEKL, ANY_WIDEKL, false), + SUBARCH (uintr, UINTR, ANY_UINTR, false), + SUBARCH (hreset, HRESET, ANY_HRESET, false), + SUBARCH (avx512_fp16, AVX512_FP16, ANY_AVX512_FP16, false), }; #undef SUBARCH #undef ARCH -static const noarch_entry cpu_noarch[] = -{ - { STRING_COMMA_LEN ("no87"), CPU_ANY_X87_FLAGS }, - { STRING_COMMA_LEN ("no287"), CPU_ANY_287_FLAGS }, - { STRING_COMMA_LEN ("no387"), CPU_ANY_387_FLAGS }, - { STRING_COMMA_LEN ("no687"), CPU_ANY_687_FLAGS }, - { STRING_COMMA_LEN ("nocmov"), CPU_ANY_CMOV_FLAGS }, - { STRING_COMMA_LEN ("nofxsr"), CPU_ANY_FXSR_FLAGS }, - { STRING_COMMA_LEN ("nommx"), CPU_ANY_MMX_FLAGS }, - { STRING_COMMA_LEN ("nosse"), CPU_ANY_SSE_FLAGS }, - { STRING_COMMA_LEN ("nosse2"), CPU_ANY_SSE2_FLAGS }, - { STRING_COMMA_LEN ("nosse3"), CPU_ANY_SSE3_FLAGS }, - { STRING_COMMA_LEN ("nosse4a"), CPU_ANY_SSE4A_FLAGS }, - { STRING_COMMA_LEN ("nossse3"), CPU_ANY_SSSE3_FLAGS }, - { STRING_COMMA_LEN ("nosse4.1"), CPU_ANY_SSE4_1_FLAGS }, - { STRING_COMMA_LEN ("nosse4.2"), CPU_ANY_SSE4_2_FLAGS }, - { STRING_COMMA_LEN ("nosse4"), CPU_ANY_SSE4_1_FLAGS }, - { STRING_COMMA_LEN ("noavx"), CPU_ANY_AVX_FLAGS }, - { STRING_COMMA_LEN ("noavx2"), CPU_ANY_AVX2_FLAGS }, - { STRING_COMMA_LEN ("noavx512f"), CPU_ANY_AVX512F_FLAGS }, - { STRING_COMMA_LEN ("noavx512cd"), CPU_ANY_AVX512CD_FLAGS }, - { STRING_COMMA_LEN ("noavx512er"), CPU_ANY_AVX512ER_FLAGS }, - { STRING_COMMA_LEN ("noavx512pf"), CPU_ANY_AVX512PF_FLAGS }, - { STRING_COMMA_LEN ("noavx512dq"), CPU_ANY_AVX512DQ_FLAGS }, - { STRING_COMMA_LEN ("noavx512bw"), CPU_ANY_AVX512BW_FLAGS }, - { STRING_COMMA_LEN ("noavx512vl"), CPU_ANY_AVX512VL_FLAGS }, - { STRING_COMMA_LEN ("noavx512ifma"), CPU_ANY_AVX512IFMA_FLAGS }, - { STRING_COMMA_LEN ("noavx512vbmi"), CPU_ANY_AVX512VBMI_FLAGS }, - { STRING_COMMA_LEN ("noavx512_4fmaps"), CPU_ANY_AVX512_4FMAPS_FLAGS }, - { STRING_COMMA_LEN ("noavx512_4vnniw"), CPU_ANY_AVX512_4VNNIW_FLAGS }, - { STRING_COMMA_LEN ("noavx512_vpopcntdq"), CPU_ANY_AVX512_VPOPCNTDQ_FLAGS }, - { STRING_COMMA_LEN ("noavx512_vbmi2"), CPU_ANY_AVX512_VBMI2_FLAGS }, - { STRING_COMMA_LEN ("noavx512_vnni"), CPU_ANY_AVX512_VNNI_FLAGS }, - { STRING_COMMA_LEN ("noavx512_bitalg"), CPU_ANY_AVX512_BITALG_FLAGS }, - { STRING_COMMA_LEN ("noavx_vnni"), CPU_ANY_AVX_VNNI_FLAGS }, - { STRING_COMMA_LEN ("noibt"), CPU_ANY_IBT_FLAGS }, - { STRING_COMMA_LEN ("noshstk"), CPU_ANY_SHSTK_FLAGS }, - { STRING_COMMA_LEN ("noamx_int8"), CPU_ANY_AMX_INT8_FLAGS }, - { STRING_COMMA_LEN ("noamx_bf16"), CPU_ANY_AMX_BF16_FLAGS }, - { STRING_COMMA_LEN ("noamx_tile"), CPU_ANY_AMX_TILE_FLAGS }, - { STRING_COMMA_LEN ("nomovdiri"), CPU_ANY_MOVDIRI_FLAGS }, - { STRING_COMMA_LEN ("nomovdir64b"), CPU_ANY_MOVDIR64B_FLAGS }, - { STRING_COMMA_LEN ("noavx512_bf16"), CPU_ANY_AVX512_BF16_FLAGS }, - { STRING_COMMA_LEN ("noavx512_vp2intersect"), - CPU_ANY_AVX512_VP2INTERSECT_FLAGS }, - { STRING_COMMA_LEN ("notdx"), CPU_ANY_TDX_FLAGS }, - { STRING_COMMA_LEN ("noenqcmd"), CPU_ANY_ENQCMD_FLAGS }, - { STRING_COMMA_LEN ("noserialize"), CPU_ANY_SERIALIZE_FLAGS }, - { STRING_COMMA_LEN ("notsxldtrk"), CPU_ANY_TSXLDTRK_FLAGS }, - { STRING_COMMA_LEN ("nokl"), CPU_ANY_KL_FLAGS }, - { STRING_COMMA_LEN ("nowidekl"), CPU_ANY_WIDEKL_FLAGS }, - { STRING_COMMA_LEN ("nouintr"), CPU_ANY_UINTR_FLAGS }, - { STRING_COMMA_LEN ("nohreset"), CPU_ANY_HRESET_FLAGS }, - { STRING_COMMA_LEN ("noavx512_fp16"), CPU_ANY_AVX512_FP16_FLAGS }, -}; - #ifdef I386COFF /* Like s_lcomm_internal in gas/read.c but the alignment string is allowed to be optional. */ @@ -2715,9 +2655,9 @@ extend_cpu_sub_arch_name (const char *na { if (cpu_sub_arch_name) cpu_sub_arch_name = reconcat (cpu_sub_arch_name, cpu_sub_arch_name, - name, (const char *) NULL); + ".", name, (const char *) NULL); else - cpu_sub_arch_name = xstrdup (name); + cpu_sub_arch_name = concat (".", name, (const char *) NULL); } static void @@ -2756,7 +2696,7 @@ set_cpu_arch (int dummy ATTRIBUTE_UNUSED cpu_arch_flags.bitfield.cpuno64 = 1; } cpu_arch_isa = PROCESSOR_UNKNOWN; - cpu_arch_isa_flags = cpu_arch[flag_code == CODE_64BIT].flags; + cpu_arch_isa_flags = cpu_arch[flag_code == CODE_64BIT].enable; if (!cpu_arch_tune_set) { cpu_arch_tune = cpu_arch_isa; @@ -2769,16 +2709,17 @@ set_cpu_arch (int dummy ATTRIBUTE_UNUSED for (; j < ARRAY_SIZE (cpu_arch); j++) { - if (strcmp (string, cpu_arch[j].name) == 0) + if (strcmp (string + (*string == '.'), cpu_arch[j].name) == 0 + && (*string == '.') == (cpu_arch[j].type == PROCESSOR_NONE)) { if (*string != '.') { - check_cpu_arch_compatible (string, cpu_arch[j].flags); + check_cpu_arch_compatible (string, cpu_arch[j].enable); cpu_arch_name = cpu_arch[j].name; xfree (cpu_sub_arch_name); cpu_sub_arch_name = NULL; - cpu_arch_flags = cpu_arch[j].flags; + cpu_arch_flags = cpu_arch[j].enable; if (flag_code == CODE_64BIT) { cpu_arch_flags.bitfield.cpu64 = 1; @@ -2790,7 +2731,7 @@ set_cpu_arch (int dummy ATTRIBUTE_UNUSED cpu_arch_flags.bitfield.cpuno64 = 1; } cpu_arch_isa = cpu_arch[j].type; - cpu_arch_isa_flags = cpu_arch[j].flags; + cpu_arch_isa_flags = cpu_arch[j].enable; if (!cpu_arch_tune_set) { cpu_arch_tune = cpu_arch_isa; @@ -2799,36 +2740,40 @@ set_cpu_arch (int dummy ATTRIBUTE_UNUSED break; } + if (cpu_flags_all_zero (&cpu_arch[j].enable)) + continue; + flags = cpu_flags_or (cpu_arch_flags, - cpu_arch[j].flags); + cpu_arch[j].enable); if (!cpu_flags_equal (&flags, &cpu_arch_flags)) { - extend_cpu_sub_arch_name (string); + extend_cpu_sub_arch_name (string + 1); cpu_arch_flags = flags; cpu_arch_isa_flags = flags; } else cpu_arch_isa_flags = cpu_flags_or (cpu_arch_isa_flags, - cpu_arch[j].flags); + cpu_arch[j].enable); (void) restore_line_pointer (e); demand_empty_rest_of_line (); return; } } - if (*string == '.' && j >= ARRAY_SIZE (cpu_arch)) + if (startswith (string, ".no") && j >= ARRAY_SIZE (cpu_arch)) { /* Disable an ISA extension. */ - for (j = 0; j < ARRAY_SIZE (cpu_noarch); j++) - if (strcmp (string + 1, cpu_noarch [j].name) == 0) + for (j = 0; j < ARRAY_SIZE (cpu_arch); j++) + if (cpu_arch[j].type == PROCESSOR_NONE + && strcmp (string + 3, cpu_arch[j].name) == 0) { flags = cpu_flags_and_not (cpu_arch_flags, - cpu_noarch[j].flags); + cpu_arch[j].disable); if (!cpu_flags_equal (&flags, &cpu_arch_flags)) { - extend_cpu_sub_arch_name (string); + extend_cpu_sub_arch_name (string + 1); cpu_arch_flags = flags; cpu_arch_isa_flags = flags; } @@ -2836,8 +2781,6 @@ set_cpu_arch (int dummy ATTRIBUTE_UNUSED demand_empty_rest_of_line (); return; } - - j = ARRAY_SIZE (cpu_arch); } if (j == ARRAY_SIZE (cpu_arch)) @@ -13288,18 +13231,19 @@ md_parse_option (int c, const char *arg) *next++ = '\0'; for (j = 0; j < ARRAY_SIZE (cpu_arch); j++) { - if (arch == saved && strcmp (arch, cpu_arch [j].name) == 0) + if (arch == saved && cpu_arch[j].type != PROCESSOR_NONE + && strcmp (arch, cpu_arch[j].name) == 0) { /* Processor. */ - if (! cpu_arch[j].flags.bitfield.cpui386) + if (! cpu_arch[j].enable.bitfield.cpui386) continue; cpu_arch_name = cpu_arch[j].name; xfree (cpu_sub_arch_name); cpu_sub_arch_name = NULL; - cpu_arch_flags = cpu_arch[j].flags; + cpu_arch_flags = cpu_arch[j].enable; cpu_arch_isa = cpu_arch[j].type; - cpu_arch_isa_flags = cpu_arch[j].flags; + cpu_arch_isa_flags = cpu_arch[j].enable; if (!cpu_arch_tune_set) { cpu_arch_tune = cpu_arch_isa; @@ -13307,39 +13251,41 @@ md_parse_option (int c, const char *arg) } break; } - else if (*cpu_arch [j].name == '.' - && strcmp (arch, cpu_arch [j].name + 1) == 0) + else if (cpu_arch[j].type == PROCESSOR_NONE + && strcmp (arch, cpu_arch[j].name) == 0 + && !cpu_flags_all_zero (&cpu_arch[j].enable)) { /* ISA extension. */ i386_cpu_flags flags; flags = cpu_flags_or (cpu_arch_flags, - cpu_arch[j].flags); + cpu_arch[j].enable); if (!cpu_flags_equal (&flags, &cpu_arch_flags)) { - extend_cpu_sub_arch_name (cpu_arch[j].name); + extend_cpu_sub_arch_name (arch); cpu_arch_flags = flags; cpu_arch_isa_flags = flags; } else cpu_arch_isa_flags = cpu_flags_or (cpu_arch_isa_flags, - cpu_arch[j].flags); + cpu_arch[j].enable); break; } } - if (j >= ARRAY_SIZE (cpu_arch)) + if (j >= ARRAY_SIZE (cpu_arch) && startswith (arch, "no")) { /* Disable an ISA extension. */ - for (j = 0; j < ARRAY_SIZE (cpu_noarch); j++) - if (strcmp (arch, cpu_noarch [j].name) == 0) + for (j = 0; j < ARRAY_SIZE (cpu_arch); j++) + if (cpu_arch[j].type == PROCESSOR_NONE + && strcmp (arch + 2, cpu_arch[j].name) == 0) { i386_cpu_flags flags; flags = cpu_flags_and_not (cpu_arch_flags, - cpu_noarch[j].flags); + cpu_arch[j].disable); if (!cpu_flags_equal (&flags, &cpu_arch_flags)) { extend_cpu_sub_arch_name (arch); @@ -13348,9 +13294,6 @@ md_parse_option (int c, const char *arg) } break; } - - if (j >= ARRAY_SIZE (cpu_noarch)) - j = ARRAY_SIZE (cpu_arch); } if (j >= ARRAY_SIZE (cpu_arch)) @@ -13367,11 +13310,12 @@ md_parse_option (int c, const char *arg) as_fatal (_("invalid -mtune= option: `%s'"), arg); for (j = 0; j < ARRAY_SIZE (cpu_arch); j++) { - if (strcmp (arg, cpu_arch [j].name) == 0) + if (cpu_arch[j].type != PROCESSOR_NONE + && strcmp (arg, cpu_arch[j].name) == 0) { cpu_arch_tune_set = 1; cpu_arch_tune = cpu_arch [j].type; - cpu_arch_tune_flags = cpu_arch[j].flags; + cpu_arch_tune_flags = cpu_arch[j].enable; break; } } @@ -13751,15 +13695,10 @@ show_arch (FILE *stream, int ext, int ch name = cpu_arch [j].name; len = cpu_arch [j].len; - if (*name == '.') + if (cpu_arch[j].type == PROCESSOR_NONE) { /* It is an extension. Skip if we aren't asked to show it. */ - if (ext) - { - name++; - len--; - } - else + if (!ext || cpu_flags_all_zero (&cpu_arch[j].enable)) continue; } else if (ext) @@ -13767,7 +13706,7 @@ show_arch (FILE *stream, int ext, int ch /* It is an processor. Skip if we show only extension. */ continue; } - else if (check && ! cpu_arch[j].flags.bitfield.cpui386) + else if (check && ! cpu_arch[j].enable.bitfield.cpui386) { /* It is an impossible processor - skip. */ continue; @@ -13778,12 +13717,17 @@ show_arch (FILE *stream, int ext, int ch /* Display disabled extensions. */ if (ext) - for (j = 0; j < ARRAY_SIZE (cpu_noarch); j++) + for (j = 0; j < ARRAY_SIZE (cpu_arch); j++) { - name = cpu_noarch [j].name; - len = cpu_noarch [j].len; - p = output_message (stream, p, message, start, &left, name, - len); + char *str; + + if (cpu_arch[j].type != PROCESSOR_NONE + || !cpu_flags_all_zero (&cpu_arch[j].enable)) + continue; + str = xasprintf ("no%s", cpu_arch[j].name); + p = output_message (stream, p, message, start, &left, str, + strlen (str)); + xfree (str); } *p = '\0'; @@ -13827,7 +13771,7 @@ md_show_usage (FILE *stream) generate code for CPU and EXTENSION, CPU is one of:\n")); show_arch (stream, 0, 1); fprintf (stream, _("\ - EXTENSION is combination of:\n")); + EXTENSION is combination of (possibly \"no\"-prefixed):\n")); show_arch (stream, 1, 0); fprintf (stream, _("\ -mtune=CPU optimize for CPU, CPU is one of:\n")); @@ -13985,9 +13929,9 @@ i386_target_format (void) as_fatal (_("unknown architecture")); if (cpu_flags_all_zero (&cpu_arch_isa_flags)) - cpu_arch_isa_flags = cpu_arch[flag_code == CODE_64BIT].flags; + cpu_arch_isa_flags = cpu_arch[flag_code == CODE_64BIT].enable; if (cpu_flags_all_zero (&cpu_arch_tune_flags)) - cpu_arch_tune_flags = cpu_arch[flag_code == CODE_64BIT].flags; + cpu_arch_tune_flags = cpu_arch[flag_code == CODE_64BIT].enable; switch (OUTPUT_FLAVOR) {