From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com [68.232.129.153]) by sourceware.org (Postfix) with ESMTPS id C71BC3858C50 for ; Thu, 1 Dec 2022 15:48:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C71BC3858C50 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,209,1665475200"; d="scan'208,223";a="91395963" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 01 Dec 2022 07:48:40 -0800 IronPort-SDR: LtdTrPJt2i1j+C1bC5Qlw/sJtcV+G5e3ymT0C5HLlbC3tkIyIjrQ5/AZeMTbpebpvP1zgrOS2H YvQ+0Co1usO8HqjSniw34lNzVENeOh5NiFqTyoexZbnpmHJBWOPhNYPgB/Q7JWy9x/s5cKDXv1 ITXUeTjvhu0AlwxYRJ9FL2DS+ZZQvYkJD6r2aK2h1RFZbJJvVIOmlHWDl/vtRslYmNdcn5d4tG l8oOKCl0i5gx44PbmZJBIO0OrnauVh/rTcZzJzTTgnNz6w+YdU+QEQrACsk50N04HCeFhioLLO cvY= Content-Type: multipart/mixed; boundary="------------vabMappqVzVTNUjE0GmRhC01" Message-ID: <70e3252c-d1e3-822c-2bdb-67c482555d1e@codesourcery.com> Date: Thu, 1 Dec 2022 16:48:35 +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 Subject: Re: [PATCH][OG12] amdgcn: Support AMD-specific 'isa' and 'arch' traits in OpenMP context selectors Content-Language: en-GB To: Andrew Stubbs , Kwok Cheung Yeung CC: gcc-patches References: <202ee18b-90c8-830b-82a5-b705a9ec5c73@gmail.com> <82a884ed-ea1d-5116-fedf-42de6e22e730@codesourcery.com> <0600a1e2-d877-6522-15a9-0e5d0219a76b@codesourcery.com> From: Paul-Antoine Arras In-Reply-To: <0600a1e2-d877-6522-15a9-0e5d0219a76b@codesourcery.com> X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-12.mgc.mentorg.com (139.181.222.12) To svr-ies-mbx-13.mgc.mentorg.com (139.181.222.13) X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,KAM_DMARC_STATUS,KAM_SHORT,NICE_REPLY_A,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: --------------vabMappqVzVTNUjE0GmRhC01 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit On 01/12/2022 13:45, Andrew Stubbs wrote: > P.S. If you want to split the patch into the GCN bits and the bits that > depend on metadirectives then we can apply the first part to mainline > right away. So this is the OG12-specific part (including metadirective and dynamic context selectors) of the previous patch. Once https://gcc.gnu.org/r13-4446-ge41b243302e996 is backported, is it OK for OG12? Thanks, -- PA --------------vabMappqVzVTNUjE0GmRhC01 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 RnJvbSA0OTRhODE1YWY0NTliMTNkYTZmZTliZjVhODRiOTRkNGIxZjk0OTE1IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsLUFudG9pbmUgQXJyYXMgPHBhQGNvZGVzb3Vy Y2VyeS5jb20+CkRhdGU6IFdlZCwgMzAgTm92IDIwMjIgMTQ6NTI6NTUgKzAxMDAKU3ViamVj dDogW1BBVENIXSBhbWRnY246IFN1cHBvcnQgQU1ELXNwZWNpZmljICdpc2EnIGFuZCAnYXJj aCcgdHJhaXRzIGluCiBPcGVuTVAgY29udGV4dCBzZWxlY3RvcnMKCkFkZCBsaWJnb21wIHN1 cHBvcnQgZm9yICdhbWRnY24nIGFzIGFyY2gsIGFuZCBmb3IgZWFjaCBwcm9jZXNzb3IgdHlw ZSAoYXMgcGFzc2VkCnRvICctbWFyY2gnKSBhcyBpc2EgdHJhaXRzLgpBZGQgdGVzdCBjYXNl IGZvciBhbGwgc3VwcG9ydGVkICdpc2EnIHZhbHVlcyB1c2VkIGFzIGNvbnRleHQgc2VsZWN0 b3JzIGluIGEKbWV0YWRpcmVjdGl2ZSBjb25zdHJ1Y3QuCgpsaWJnb21wL0NoYW5nZUxvZzoK CgkqIGNvbmZpZy9nY24vc2VsZWN0b3IuYyAoR09NUF9ldmFsdWF0ZV9jdXJyZW50X2Rldmlj ZSk6IFJlY29nbmlzZSAnYW1kZ2NuJwoJYXMgYXJjaCwgYW5kICctbWFyY2gnIHZhbHVlcyAo YXMgd2VsbCBhcyAnZ2Z4ODAzJykgYXMgaXNhIHRyYWl0cy4KCSogdGVzdHN1aXRlL2xpYmdv bXAuYy1jKystY29tbW9uL21ldGFkaXJlY3RpdmUtNi5jOiBOZXcgdGVzdC4KLS0tCiBsaWJn b21wL0NoYW5nZUxvZy5vbXAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgNiArKysKIGxp YmdvbXAvY29uZmlnL2djbi9zZWxlY3Rvci5jICAgICAgICAgICAgICAgICB8IDI0ICsrKysr KysrLS0KIC4uLi9saWJnb21wLmMtYysrLWNvbW1vbi9tZXRhZGlyZWN0aXZlLTYuYyAgICB8 IDQ4ICsrKysrKysrKysrKysrKysrKysKIDMgZmlsZXMgY2hhbmdlZCwgNzMgaW5zZXJ0aW9u cygrKSwgNSBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBsaWJnb21wL3Rlc3Rz dWl0ZS9saWJnb21wLmMtYysrLWNvbW1vbi9tZXRhZGlyZWN0aXZlLTYuYwoKZGlmZiAtLWdp dCBsaWJnb21wL0NoYW5nZUxvZy5vbXAgbGliZ29tcC9DaGFuZ2VMb2cub21wCmluZGV4IDc0 MDUzYTZlZWEwLi5hMmYwMzkxNDcyNSAxMDA2NDQKLS0tIGxpYmdvbXAvQ2hhbmdlTG9nLm9t cAorKysgbGliZ29tcC9DaGFuZ2VMb2cub21wCkBAIC0xLDMgKzEsOSBAQAorMjAyMi0xMi0w MSAgUGF1bC1BbnRvaW5lIEFycmFzIDxwYUBjb2Rlc291cmNlcnkuY29tPgorCisJKiBjb25m aWcvZ2NuL3NlbGVjdG9yLmMgKEdPTVBfZXZhbHVhdGVfY3VycmVudF9kZXZpY2UpOiBSZWNv Z25pc2UgJ2FtZGdjbicKKwlhcyBhcmNoLCBhbmQgJy1tYXJjaCcgdmFsdWVzIChhcyB3ZWxs IGFzICdnZng4MDMnKSBhcyBpc2EgdHJhaXRzLgorCSogdGVzdHN1aXRlL2xpYmdvbXAuYy1j KystY29tbW9uL21ldGFkaXJlY3RpdmUtNi5jOiBOZXcgdGVzdC4KKwogMjAyMi0xMS0zMCAg VG9iaWFzIEJ1cm51cyAgPHRvYmlhc0Bjb2Rlc291cmNlcnkuY29tPgogCiAJQmFja3BvcnRl ZCBmcm9tIG1hc3RlcjoKZGlmZiAtLWdpdCBsaWJnb21wL2NvbmZpZy9nY24vc2VsZWN0b3Iu YyBsaWJnb21wL2NvbmZpZy9nY24vc2VsZWN0b3IuYwppbmRleCA2MDc5M2ZjMDVkMy4uNTcw YmMxZThhZTYgMTAwNjQ0Ci0tLSBsaWJnb21wL2NvbmZpZy9nY24vc2VsZWN0b3IuYworKysg bGliZ29tcC9jb25maWcvZ2NuL3NlbGVjdG9yLmMKQEAgLTM2LDIwICszNiwzNCBAQCBHT01Q X2V2YWx1YXRlX2N1cnJlbnRfZGV2aWNlIChjb25zdCBjaGFyICpraW5kLCBjb25zdCBjaGFy ICphcmNoLAogICBpZiAoa2luZCAmJiBzdHJjbXAgKGtpbmQsICJncHUiKSAhPSAwKQogICAg IHJldHVybiBmYWxzZTsKIAotICBpZiAoYXJjaCAmJiBzdHJjbXAgKGFyY2gsICJnY24iKSAh PSAwKQorICBpZiAoYXJjaCAmJiAoc3RyY21wIChhcmNoLCAiZ2NuIikgIT0gMCAmJiBzdHJj bXAgKGFyY2gsICJhbWRnY24iKSAhPSAwKSkKICAgICByZXR1cm4gZmFsc2U7CiAKICAgaWYg KCFpc2EpCiAgICAgcmV0dXJuIHRydWU7CiAKLSNpZmRlZiBfX0dDTjNfXworI2lmZGVmIF9f Z2Z4ODAzX18KICAgaWYgKHN0cmNtcCAoaXNhLCAiZmlqaSIpID09IDAgfHwgc3RyY21wIChp c2EsICJnZng4MDMiKSA9PSAwKQogICAgIHJldHVybiB0cnVlOwogI2VuZGlmCiAKLSNpZmRl ZiBfX0dDTjVfXwotICBpZiAoc3RyY21wIChpc2EsICJnZng5MDAiKSA9PSAwIHx8IHN0cmNt cCAoaXNhLCAiZ2Z4OTA2IikgIT0gMAotICAgICAgfHwgc3RyY21wIChpc2EsICJnZng5MDgi KSA9PSAwKQorI2lmZGVmIF9fZ2Z4OTAwX18KKyAgaWYgKHN0cmNtcCAoaXNhLCAiZ2Z4OTAw IikgPT0gMCkKKyAgICByZXR1cm4gdHJ1ZTsKKyNlbmRpZgorCisjaWZkZWYgX19nZng5MDZf XworICBpZiAoc3RyY21wIChpc2EsICJnZng5MDYiKSA9PSAwKQorICAgIHJldHVybiB0cnVl OworI2VuZGlmCisKKyNpZmRlZiBfX2dmeDkwOF9fCisgIGlmIChzdHJjbXAgKGlzYSwgImdm eDkwOCIpID09IDApCisgICAgcmV0dXJuIHRydWU7CisjZW5kaWYKKworI2lmZGVmIF9fZ2Z4 OTBhX18KKyAgaWYgKHN0cmNtcCAoaXNhLCAiZ2Z4OTBhIikgPT0gMCkKICAgICByZXR1cm4g dHJ1ZTsKICNlbmRpZgogCmRpZmYgLS1naXQgbGliZ29tcC90ZXN0c3VpdGUvbGliZ29tcC5j LWMrKy1jb21tb24vbWV0YWRpcmVjdGl2ZS02LmMgbGliZ29tcC90ZXN0c3VpdGUvbGliZ29t cC5jLWMrKy1jb21tb24vbWV0YWRpcmVjdGl2ZS02LmMKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAuLjZkMTY5MDAxZGIxCi0tLSAvZGV2L251bGwKKysrIGxpYmdv bXAvdGVzdHN1aXRlL2xpYmdvbXAuYy1jKystY29tbW9uL21ldGFkaXJlY3RpdmUtNi5jCkBA IC0wLDAgKzEsNDggQEAKKy8qIHsgZGctZG8gbGluayB7IHRhcmdldCB7IG9mZmxvYWRfdGFy Z2V0X2FtZGdjbiB9IH0gfSAqLworLyogeyBkZy1hZGRpdGlvbmFsLW9wdGlvbnMgIi1mb2Zm bG9hZD0tZmR1bXAtdHJlZS1vbXBfZXhwYW5kX21ldGFkaXJlY3RpdmUiIH0gKi8KKworI2Rl ZmluZSBOIDEwMAorCit2b2lkIGYgKGludCB4W10sIGludCB5W10sIGludCB6W10pCit7Cisg IGludCBpOworCisgICNwcmFnbWEgb21wIHRhcmdldCBtYXAodG86IHgsIHkpIG1hcChmcm9t OiB6KQorICAgICNwcmFnbWEgb21wIG1ldGFkaXJlY3RpdmUgXAorICAgICAgd2hlbiAoZGV2 aWNlPXtpc2EoImdmeDgwMyIpfTogdGVhbXMgbnVtX3RlYW1zKDUxMikpIFwKKyAgICAgIHdo ZW4gKGRldmljZT17aXNhKCJnZng5MDAiKX06IHRlYW1zIG51bV90ZWFtcygyNTYpKSBcCisg ICAgICB3aGVuIChkZXZpY2U9e2lzYSgiZ2Z4OTA2Iil9OiB0ZWFtcyBudW1fdGVhbXMoMTI4 KSkgXAorICAgICAgd2hlbiAoZGV2aWNlPXtpc2EoImdmeDkwOCIpfTogdGVhbXMgbnVtX3Rl YW1zKDY0KSkgXAorICAgICAgd2hlbiAoZGV2aWNlPXtpc2EoImdmeDkwYSIpfTogdGVhbXMg bnVtX3RlYW1zKDMyKSkgXAorICAgICAgZGVmYXVsdCAodGVhbXMgbnVtX3RlYW1zKDQpKQor CWZvciAoaSA9IDA7IGkgPCBOOyBpKyspCisJICB6W2ldID0geFtpXSAqIHlbaV07Cit9CisK K2ludCBtYWluICh2b2lkKQoreworICBpbnQgeFtOXSwgeVtOXSwgeltOXTsKKyAgaW50IGk7 CisKKyAgZm9yIChpID0gMDsgaSA8IE47IGkrKykKKyAgICB7CisgICAgICB4W2ldID0gaTsK KyAgICAgIHlbaV0gPSAtaTsKKyAgICB9CisKKyAgZiAoeCwgeSwgeik7CisKKyAgZm9yIChp ID0gMDsgaSA8IE47IGkrKykKKyAgICBpZiAoeltpXSAhPSB4W2ldICogeVtpXSkKKyAgICAg IHJldHVybiAxOworCisgIHJldHVybiAwOworfQorCisvKiBUaGUgbWV0YWRpcmVjdGl2ZSBz aG91bGQgYmUgcmVzb2x2ZWQgYWZ0ZXIgR2ltcGxpZmljYXRpb24uICAqLworCisvKiB7IGRn LWZpbmFsIHsgc2Nhbi1vZmZsb2FkLXRyZWUtZHVtcCAiX19idWlsdGluX0dPTVBfdGVhbXM0 IFxcKDUxMiwgNTEyIiAib21wX2V4cGFuZF9tZXRhZGlyZWN0aXZlIiB7IHRhcmdldCB7IGFu eS1vcHRzICItZm9mZmxvYWQ9LW1hcmNoPWZpamkiIH0gfSB9IH0gKi8KKy8qIHsgZGctZmlu YWwgeyBzY2FuLW9mZmxvYWQtdHJlZS1kdW1wICJfX2J1aWx0aW5fR09NUF90ZWFtczQgXFwo MjU2LCAyNTYiICJvbXBfZXhwYW5kX21ldGFkaXJlY3RpdmUiIHsgdGFyZ2V0IHsgYW55LW9w dHMgIi1mb2ZmbG9hZD0tbWFyY2g9Z2Z4OTAwIiB9IH0gfSB9ICovCisvKiB7IGRnLWZpbmFs IHsgc2Nhbi1vZmZsb2FkLXRyZWUtZHVtcCAiX19idWlsdGluX0dPTVBfdGVhbXM0IFxcKDEy OCwgMTI4IiAib21wX2V4cGFuZF9tZXRhZGlyZWN0aXZlIiB7IHRhcmdldCB7IGFueS1vcHRz ICItZm9mZmxvYWQ9LW1hcmNoPWdmeDkwNiIgfSB9IH0gfSAqLworLyogeyBkZy1maW5hbCB7 IHNjYW4tb2ZmbG9hZC10cmVlLWR1bXAgIl9fYnVpbHRpbl9HT01QX3RlYW1zNCBcXCg2NCwg NjQiICJvbXBfZXhwYW5kX21ldGFkaXJlY3RpdmUiIHsgdGFyZ2V0IHsgYW55LW9wdHMgIi1m b2ZmbG9hZD0tbWFyY2g9Z2Z4OTA4IiB9IH0gfSB9ICovCisvKiB7IGRnLWZpbmFsIHsgc2Nh bi1vZmZsb2FkLXRyZWUtZHVtcCAiX19idWlsdGluX0dPTVBfdGVhbXM0IFxcKDMyLCAzMiIg Im9tcF9leHBhbmRfbWV0YWRpcmVjdGl2ZSIgeyB0YXJnZXQgeyBhbnktb3B0cyAiLWZvZmZs b2FkPS1tYXJjaD1nZng5MGEiIH0gfSB9IH0gKi8KLS0gCjIuMzEuMQoK --------------vabMappqVzVTNUjE0GmRhC01--