From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com [68.232.141.98]) by sourceware.org (Postfix) with ESMTPS id 1B61E385B193 for ; Wed, 30 Nov 2022 15:32:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1B61E385B193 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.96,206,1665475200"; d="scan'208,223";a="88589969" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 30 Nov 2022 07:32:11 -0800 IronPort-SDR: OFJ2Oww9meHrHtb3Sx+/zvw0CRO5CWoZhGGxy8FDlc5dhQ+cMaeGV4eShCh9P1+e8FV0wKY0Tv qI8SpEFLGRyP/6BfUdvuqZBjLp9Qs3Cy/EyLsGTojwmg5c1jk/APgZM7usNiZU36nIR3pFQ0Le FayfqLT7fPWPXJBYzJgcg3zMwvDKxnzLoF0RJ8sCEfaYplf5IFBrcgCrwEJZ4JAIi03GbSMs/V JtSGBNW05SFt9Hy/kqL7VgAh5kYYwlYV+zGXuzS1Romqw4mJcZKmkaxkxmTp76Ylg9zXWMrWck 2PQ= Content-Type: multipart/mixed; boundary="------------DRQTTgN2jAZiYLTD2ghHylMM" Message-ID: Date: Wed, 30 Nov 2022 16:32:06 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Content-Language: en-GB To: From: Paul-Antoine Arras Subject: [PATCH][OG12] amdgcn: Support AMD-specific 'isa' and 'arch' traits in OpenMP context selectors X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-07.mgc.mentorg.com (139.181.222.7) To svr-ies-mbx-13.mgc.mentorg.com (139.181.222.13) X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,KAM_DMARC_STATUS,KAM_SHORT,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,TXREP 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: --------------DRQTTgN2jAZiYLTD2ghHylMM Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit Hi all, This patch adds or fixes support for various AMD 'isa' and 'arch' trait selectors, so as to be consistent with LLVM. It also adds test cases checking all supported AMD ISAs are properly recognised when used in a 'metadirective' construct. This patch is closely related to https://gcc.gnu.org/r13-4403-g1fd508744eccda but cannot be committed to mainline because metadirectives and dynamic context selectors have not landed there yet. Can this be committed to OG12? Thanks, --------------DRQTTgN2jAZiYLTD2ghHylMM Content-Type: text/plain; charset="UTF-8"; name="0001-amdgcn-Support-AMD-specific-isa-and-arch-traits-in-O.patch" Content-Disposition: attachment; filename*0="0001-amdgcn-Support-AMD-specific-isa-and-arch-traits-in-O.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSA4ODUyMjEwN2RkMzliYTNmZjg0NjVjZjY4OGZlNDQzOGZhM2I3N2I0IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsLUFudG9pbmUgQXJyYXMgPHBhQGNvZGVzb3Vy Y2VyeS5jb20+CkRhdGU6IFdlZCwgMzAgTm92IDIwMjIgMTQ6NTI6NTUgKzAxMDAKU3ViamVj dDogW1BBVENIXSBhbWRnY246IFN1cHBvcnQgQU1ELXNwZWNpZmljICdpc2EnIGFuZCAnYXJj aCcgdHJhaXRzIGluCiBPcGVuTVAgY29udGV4dCBzZWxlY3RvcnMKCkFkZCBvciBmaXggbGli Z29tcCBzdXBwb3J0IGZvciAnYW1kZ2NuJyBhcyBhcmNoLCBhbmQgJ2dmeDkwOCcgYW5kICdn Zng5MGEnIGFzIGlzYSB0cmFpdHMuCkFkZCB0ZXN0IGNhc2UgZm9yIGFsbCBzdXBwb3J0ZWQg J2lzYScgdmFsdWVzIHVzZWQgYXMgY29udGV4dCBzZWxlY3RvcnMgaW4gYSBtZXRhZGlyZWN0 aXZlIGNvbnN0cnVjdC4uCgpsaWJnb21wL0NoYW5nZUxvZzoKCgkqIGNvbmZpZy9nY24vc2Vs ZWN0b3IuYyAoR09NUF9ldmFsdWF0ZV9jdXJyZW50X2RldmljZSk6IFJlY29nbmlzZSAnYW1k Z2NuJyBhcyBhcmNoLCBhbmQgJ2dmeDkwOCcgYW5kCgknZ2Z4OTBhJyBhcyBpc2EgdHJhaXRz LgoJKiB0ZXN0c3VpdGUvbGliZ29tcC5jLWMrKy1jb21tb24vbWV0YWRpcmVjdGl2ZS02LmM6 IE5ldyB0ZXN0LgotLS0KIGxpYmdvbXAvY29uZmlnL2djbi9zZWxlY3Rvci5jICAgICAgICAg ICAgICAgICB8IDE1ICsrKystLQogLi4uL2xpYmdvbXAuYy1jKystY29tbW9uL21ldGFkaXJl Y3RpdmUtNi5jICAgIHwgNDggKysrKysrKysrKysrKysrKysrKwogMiBmaWxlcyBjaGFuZ2Vk LCA2MCBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0 IGxpYmdvbXAvdGVzdHN1aXRlL2xpYmdvbXAuYy1jKystY29tbW9uL21ldGFkaXJlY3RpdmUt Ni5jCgpkaWZmIC0tZ2l0IGxpYmdvbXAvY29uZmlnL2djbi9zZWxlY3Rvci5jIGxpYmdvbXAv Y29uZmlnL2djbi9zZWxlY3Rvci5jCmluZGV4IDYwNzkzZmMwNWQzLi5jOTQ4NDk3YzUzOCAx MDA2NDQKLS0tIGxpYmdvbXAvY29uZmlnL2djbi9zZWxlY3Rvci5jCisrKyBsaWJnb21wL2Nv bmZpZy9nY24vc2VsZWN0b3IuYwpAQCAtMzYsNyArMzYsNyBAQCBHT01QX2V2YWx1YXRlX2N1 cnJlbnRfZGV2aWNlIChjb25zdCBjaGFyICpraW5kLCBjb25zdCBjaGFyICphcmNoLAogICBp ZiAoa2luZCAmJiBzdHJjbXAgKGtpbmQsICJncHUiKSAhPSAwKQogICAgIHJldHVybiBmYWxz ZTsKIAotICBpZiAoYXJjaCAmJiBzdHJjbXAgKGFyY2gsICJnY24iKSAhPSAwKQorICBpZiAo YXJjaCAmJiAoc3RyY21wIChhcmNoLCAiZ2NuIikgIT0gMCB8fCBzdHJjbXAgKGFyY2gsICJh bWRnY24iKSAhPSAwKSkKICAgICByZXR1cm4gZmFsc2U7CiAKICAgaWYgKCFpc2EpCkBAIC00 OCw4ICs0OCwxNyBAQCBHT01QX2V2YWx1YXRlX2N1cnJlbnRfZGV2aWNlIChjb25zdCBjaGFy ICpraW5kLCBjb25zdCBjaGFyICphcmNoLAogI2VuZGlmCiAKICNpZmRlZiBfX0dDTjVfXwot ICBpZiAoc3RyY21wIChpc2EsICJnZng5MDAiKSA9PSAwIHx8IHN0cmNtcCAoaXNhLCAiZ2Z4 OTA2IikgIT0gMAotICAgICAgfHwgc3RyY21wIChpc2EsICJnZng5MDgiKSA9PSAwKQorICBp ZiAoc3RyY21wIChpc2EsICJnZng5MDAiKSA9PSAwIHx8IHN0cmNtcCAoaXNhLCAiZ2Z4OTA2 IikgIT0gMCkKKyAgICByZXR1cm4gdHJ1ZTsKKyNlbmRpZgorCisjaWZkZWYgX19DRE5BMV9f CisgIGlmIChzdHJjbXAgKGlzYSwgImdmeDkwOCIpID09IDApCisgICAgcmV0dXJuIHRydWU7 CisjZW5kaWYKKworI2lmZGVmIF9fQ0ROQTJfXworICBpZiAoc3RyY21wIChpc2EsICJnZng5 MGEiKSA9PSAwKQogICAgIHJldHVybiB0cnVlOwogI2VuZGlmCiAKZGlmZiAtLWdpdCBsaWJn b21wL3Rlc3RzdWl0ZS9saWJnb21wLmMtYysrLWNvbW1vbi9tZXRhZGlyZWN0aXZlLTYuYyBs aWJnb21wL3Rlc3RzdWl0ZS9saWJnb21wLmMtYysrLWNvbW1vbi9tZXRhZGlyZWN0aXZlLTYu YwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4uNmQxNjkwMDFkYjEK LS0tIC9kZXYvbnVsbAorKysgbGliZ29tcC90ZXN0c3VpdGUvbGliZ29tcC5jLWMrKy1jb21t b24vbWV0YWRpcmVjdGl2ZS02LmMKQEAgLTAsMCArMSw0OCBAQAorLyogeyBkZy1kbyBsaW5r IHsgdGFyZ2V0IHsgb2ZmbG9hZF90YXJnZXRfYW1kZ2NuIH0gfSB9ICovCisvKiB7IGRnLWFk ZGl0aW9uYWwtb3B0aW9ucyAiLWZvZmZsb2FkPS1mZHVtcC10cmVlLW9tcF9leHBhbmRfbWV0 YWRpcmVjdGl2ZSIgfSAqLworCisjZGVmaW5lIE4gMTAwCisKK3ZvaWQgZiAoaW50IHhbXSwg aW50IHlbXSwgaW50IHpbXSkKK3sKKyAgaW50IGk7CisKKyAgI3ByYWdtYSBvbXAgdGFyZ2V0 IG1hcCh0bzogeCwgeSkgbWFwKGZyb206IHopCisgICAgI3ByYWdtYSBvbXAgbWV0YWRpcmVj dGl2ZSBcCisgICAgICB3aGVuIChkZXZpY2U9e2lzYSgiZ2Z4ODAzIil9OiB0ZWFtcyBudW1f dGVhbXMoNTEyKSkgXAorICAgICAgd2hlbiAoZGV2aWNlPXtpc2EoImdmeDkwMCIpfTogdGVh bXMgbnVtX3RlYW1zKDI1NikpIFwKKyAgICAgIHdoZW4gKGRldmljZT17aXNhKCJnZng5MDYi KX06IHRlYW1zIG51bV90ZWFtcygxMjgpKSBcCisgICAgICB3aGVuIChkZXZpY2U9e2lzYSgi Z2Z4OTA4Iil9OiB0ZWFtcyBudW1fdGVhbXMoNjQpKSBcCisgICAgICB3aGVuIChkZXZpY2U9 e2lzYSgiZ2Z4OTBhIil9OiB0ZWFtcyBudW1fdGVhbXMoMzIpKSBcCisgICAgICBkZWZhdWx0 ICh0ZWFtcyBudW1fdGVhbXMoNCkpCisJZm9yIChpID0gMDsgaSA8IE47IGkrKykKKwkgIHpb aV0gPSB4W2ldICogeVtpXTsKK30KKworaW50IG1haW4gKHZvaWQpCit7CisgIGludCB4W05d LCB5W05dLCB6W05dOworICBpbnQgaTsKKworICBmb3IgKGkgPSAwOyBpIDwgTjsgaSsrKQor ICAgIHsKKyAgICAgIHhbaV0gPSBpOworICAgICAgeVtpXSA9IC1pOworICAgIH0KKworICBm ICh4LCB5LCB6KTsKKworICBmb3IgKGkgPSAwOyBpIDwgTjsgaSsrKQorICAgIGlmICh6W2ld ICE9IHhbaV0gKiB5W2ldKQorICAgICAgcmV0dXJuIDE7CisKKyAgcmV0dXJuIDA7Cit9CisK Ky8qIFRoZSBtZXRhZGlyZWN0aXZlIHNob3VsZCBiZSByZXNvbHZlZCBhZnRlciBHaW1wbGlm aWNhdGlvbi4gICovCisKKy8qIHsgZGctZmluYWwgeyBzY2FuLW9mZmxvYWQtdHJlZS1kdW1w ICJfX2J1aWx0aW5fR09NUF90ZWFtczQgXFwoNTEyLCA1MTIiICJvbXBfZXhwYW5kX21ldGFk aXJlY3RpdmUiIHsgdGFyZ2V0IHsgYW55LW9wdHMgIi1mb2ZmbG9hZD0tbWFyY2g9ZmlqaSIg fSB9IH0gfSAqLworLyogeyBkZy1maW5hbCB7IHNjYW4tb2ZmbG9hZC10cmVlLWR1bXAgIl9f YnVpbHRpbl9HT01QX3RlYW1zNCBcXCgyNTYsIDI1NiIgIm9tcF9leHBhbmRfbWV0YWRpcmVj dGl2ZSIgeyB0YXJnZXQgeyBhbnktb3B0cyAiLWZvZmZsb2FkPS1tYXJjaD1nZng5MDAiIH0g fSB9IH0gKi8KKy8qIHsgZGctZmluYWwgeyBzY2FuLW9mZmxvYWQtdHJlZS1kdW1wICJfX2J1 aWx0aW5fR09NUF90ZWFtczQgXFwoMTI4LCAxMjgiICJvbXBfZXhwYW5kX21ldGFkaXJlY3Rp dmUiIHsgdGFyZ2V0IHsgYW55LW9wdHMgIi1mb2ZmbG9hZD0tbWFyY2g9Z2Z4OTA2IiB9IH0g fSB9ICovCisvKiB7IGRnLWZpbmFsIHsgc2Nhbi1vZmZsb2FkLXRyZWUtZHVtcCAiX19idWls dGluX0dPTVBfdGVhbXM0IFxcKDY0LCA2NCIgIm9tcF9leHBhbmRfbWV0YWRpcmVjdGl2ZSIg eyB0YXJnZXQgeyBhbnktb3B0cyAiLWZvZmZsb2FkPS1tYXJjaD1nZng5MDgiIH0gfSB9IH0g Ki8KKy8qIHsgZGctZmluYWwgeyBzY2FuLW9mZmxvYWQtdHJlZS1kdW1wICJfX2J1aWx0aW5f R09NUF90ZWFtczQgXFwoMzIsIDMyIiAib21wX2V4cGFuZF9tZXRhZGlyZWN0aXZlIiB7IHRh cmdldCB7IGFueS1vcHRzICItZm9mZmxvYWQ9LW1hcmNoPWdmeDkwYSIgfSB9IH0gfSAqLwot LSAKMi4zMS4xCgo= --------------DRQTTgN2jAZiYLTD2ghHylMM--