From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com [68.232.137.252]) by sourceware.org (Postfix) with ESMTPS id C778E3858421 for ; Thu, 1 Dec 2022 14:35:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C778E3858421 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="88285998" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 01 Dec 2022 06:35:39 -0800 IronPort-SDR: TicMcwOZhbC+BKLsudxEzSsKNdY2tH8Ty1ytPEabxlbd3EI0ptIwzVRqhX/o+EwTGn2iwt8has tBJKCW4zEF5cx/kheK6v7MlWpoheF90zO1pTZZBa/+nWQv5HIdksMJPrMJch8t5MfBfiXkFPDu XHAZgqI+kN/Z8SxgkgZkoAkksmlx1O9P3bMiwYY3OzzD0dYppNgrx5UABkeu/D1qrgvFLgQ4bK +WuwuYVxblJz12eupbGG2xKXr/T5deKj3tIY5zfK9XF9N4qq7xGyK0GknWj3ArD/ohQy4eQTe9 OD8= Content-Type: multipart/mixed; boundary="------------HMBxAFLYB963kA9I9DRf8K8I" Message-ID: Date: Thu, 1 Dec 2022 15:35:34 +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: [PATCH] amdgcn: Add preprocessor builtins for every processor type 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-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=-10.2 required=5.0 tests=BAYES_00,BODY_8BITS,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,KAM_DMARC_STATUS,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: --------------HMBxAFLYB963kA9I9DRf8K8I Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit Hi Andrew, all, On 01/12/2022 13:45, Andrew Stubbs wrote: > On 01/12/2022 11:10, Paul-Antoine Arras wrote: >> +      if >> (TARGET_FIJI)                                                         \ >> +    builtin_define >> ("__FIJI__");                                           \ >> +      else if >> (TARGET_VEGA10)                                                  \ >> +    builtin_define >> ("__VEGA10__");                                         \ >> +      else if >> (TARGET_VEGA20)                                                  \ >> +    builtin_define >> ("__VEGA20__");                                         \ >> +      else if >> (TARGET_GFX908)                                                  \ >> +    builtin_define >> ("__GFX908__");                                         \ >> +      else if >> (TARGET_GFX90a)                                                  \ >> +    builtin_define >> ("__GFX90a__");                                         \ >> +  } while (0) >> > > I don't think it makes sense to say __VEGA10__ when the user asked for > -march=gfx900. > > This whole naming thing is a bit of a mess already, so I think we'd do > better to either keep the same names throughout or match what LLVM does > (since it got to these first). > > Please use "__gfx900__" etc. (lower case). > > [...] > > 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. I believe this patch addresses your comments regarding the GCN bits. The new builtins are consistent with the LLVM naming convention (lower case, canonical name). For gfx803, I also kept '__fiji__' to be consistent with -march=fiji. Is it OK for mainline? Thanks, -- PA --------------HMBxAFLYB963kA9I9DRf8K8I Content-Type: text/plain; charset="UTF-8"; name="0001-amdgcn-Add-preprocessor-builtins-for-every-processor.patch" Content-Disposition: attachment; filename*0="0001-amdgcn-Add-preprocessor-builtins-for-every-processor.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAyMzhlOGUxMzE3NDFmYzk2MmZlODc0ODJkMWU5YTZlYjEyNTJjNzVjIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsLUFudG9pbmUgQXJyYXMgPHBhQGNvZGVzb3Vy Y2VyeS5jb20+CkRhdGU6IFRodSwgMSBEZWMgMjAyMiAxNTowOTo1NCArMDEwMApTdWJqZWN0 OiBbUEFUQ0hdIGFtZGdjbjogQWRkIHByZXByb2Nlc3NvciBidWlsdGlucyBmb3IgZXZlcnkg cHJvY2Vzc29yIHR5cGUKClByb3ZpZGUgYSBzcGVjaWZpYyBidWlsdGluIGZvciBlYWNoIHBv c3NpYmxlIHZhbHVlIG9mICctbWFyY2gnLgoKZ2NjL0NoYW5nZUxvZzoKCgkqIGNvbmZpZy9n Y24vZ2NuLW9wdHMuaCAoVEFSR0VUX0ZJSkkpOiAtbWFyY2g9ZmlqaS4KCShUQVJHRVRfVkVH QTEwKTogLW1hcmNoPWdmeDkwMC4KCShUQVJHRVRfVkVHQTIwKTogLW1hcmNoPWdmeDkwNi4K CShUQVJHRVRfR0ZYOTA4KTogLW1hcmNoPWdmeDkwOC4KCShUQVJHRVRfR0ZYOTBhKTogLW1h cmNoPWdmeDkwYS4KCSogY29uZmlnL2djbi9nY24uaCAoVEFSR0VUX0NQVV9DUFBfQlVJTFRJ TlMpOiBEZWZpbmUgYSBidWlsdGluIHRoYXQgdW5pcXVlbHkgbWFwcyB0byAnLW1hcmNoJy4K LS0tCiBnY2MvY29uZmlnL2djbi9nY24tb3B0cy5oIHwgIDYgKysrKysrCiBnY2MvY29uZmln L2djbi9nY24uaCAgICAgIHwgNDAgKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0t LS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKyksIDE0IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBnY2MvY29uZmlnL2djbi9nY24tb3B0cy5oIGdjYy9jb25maWcv Z2NuL2djbi1vcHRzLmgKaW5kZXggYjYyZGZiNDVmNTkuLmI1NGVhZTc5ZmFmIDEwMDY0NAot LS0gZ2NjL2NvbmZpZy9nY24vZ2NuLW9wdHMuaAorKysgZ2NjL2NvbmZpZy9nY24vZ2NuLW9w dHMuaApAQCAtMjcsNiArMjcsMTIgQEAgZW51bSBwcm9jZXNzb3JfdHlwZQogICBQUk9DRVNT T1JfR0ZYOTBhCiB9OwogCisjZGVmaW5lIFRBUkdFVF9GSUpJIChnY25fYXJjaCA9PSBQUk9D RVNTT1JfRklKSSkKKyNkZWZpbmUgVEFSR0VUX1ZFR0ExMCAoZ2NuX2FyY2ggPT0gUFJPQ0VT U09SX1ZFR0ExMCkKKyNkZWZpbmUgVEFSR0VUX1ZFR0EyMCAoZ2NuX2FyY2ggPT0gUFJPQ0VT U09SX1ZFR0EyMCkKKyNkZWZpbmUgVEFSR0VUX0dGWDkwOCAoZ2NuX2FyY2ggPT0gUFJPQ0VT U09SX0dGWDkwOCkKKyNkZWZpbmUgVEFSR0VUX0dGWDkwYSAoZ2NuX2FyY2ggPT0gUFJPQ0VT U09SX0dGWDkwYSkKKwogLyogU2V0IGluIGdjbl9vcHRpb25fb3ZlcnJpZGUuICAqLwogZXh0 ZXJuIGVudW0gZ2NuX2lzYSB7CiAgIElTQV9VTktOT1dOLApkaWZmIC0tZ2l0IGdjYy9jb25m aWcvZ2NuL2djbi5oIGdjYy9jb25maWcvZ2NuL2djbi5oCmluZGV4IDM4ZjcyMTJkYjU5Li4x Y2M1OTgxZDkwNCAxMDA2NDQKLS0tIGdjYy9jb25maWcvZ2NuL2djbi5oCisrKyBnY2MvY29u ZmlnL2djbi9nY24uaApAQCAtMTYsMjAgKzE2LDMyIEBACiAKICNpbmNsdWRlICJjb25maWcv Z2NuL2djbi1vcHRzLmgiCiAKLSNkZWZpbmUgVEFSR0VUX0NQVV9DUFBfQlVJTFRJTlMoKQlc Ci0gIGRvCQkJCQlcCi0gICAgewkJCQkJXAotICAgICAgYnVpbHRpbl9kZWZpbmUgKCJfX0FN REdDTl9fIik7CVwKLSAgICAgIGlmIChUQVJHRVRfR0NOMykJCQlcCi0JYnVpbHRpbl9kZWZp bmUgKCJfX0dDTjNfXyIpOwlcCi0gICAgICBlbHNlIGlmIChUQVJHRVRfR0NONSkJCVwKLQli dWlsdGluX2RlZmluZSAoIl9fR0NONV9fIik7CVwKLSAgICAgIGVsc2UgaWYgKFRBUkdFVF9D RE5BMSkJCVwKLQlidWlsdGluX2RlZmluZSAoIl9fQ0ROQTFfXyIpOwlcCi0gICAgICBlbHNl IGlmIChUQVJHRVRfQ0ROQTIpCQlcCi0JYnVpbHRpbl9kZWZpbmUgKCJfX0NETkEyX18iKTsJ XAotICAgIH0JCQkJCVwKLSAgd2hpbGUoMCkKKyNkZWZpbmUgVEFSR0VUX0NQVV9DUFBfQlVJ TFRJTlMoKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBc CisgIGRvICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgIHsgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFwKKyAgICAgIGJ1aWx0aW5fZGVmaW5lICgiX19BTURHQ05fXyIpOyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICBpZiAoVEFSR0VUX0dDTjMp ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgXAorCWJ1aWx0aW5fZGVmaW5lICgiX19HQ04zX18iKTsgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgZWxzZSBpZiAoVEFSR0VUX0dDTjUp ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwK KwlidWlsdGluX2RlZmluZSAoIl9fR0NONV9fIik7ICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIFwKKyAgICAgIGVsc2UgaWYgKFRBUkdFVF9DRE5BMSkgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisJYnVp bHRpbl9kZWZpbmUgKCJfX0NETkExX18iKTsgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBcCisgICAgICBlbHNlIGlmIChUQVJHRVRfQ0ROQTIpICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorCWJ1aWx0aW5f ZGVmaW5lICgiX19DRE5BMl9fIik7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgXAorICAgICAgaWYgKFRBUkdFVF9GSUpJKSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKwl7ICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFwKKwkgIGJ1aWx0aW5fZGVmaW5lICgiX19maWppX18iKTsgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFwKKwkgIGJ1aWx0aW5fZGVmaW5lICgiX19nZng4 MDNfXyIpOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKwl9ICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIFwKKyAgICAgIGVsc2UgaWYgKFRBUkdFVF9WRUdBMTApICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisJYnVpbHRpbl9k ZWZpbmUgKCJfX2dmeDkwMF9fIik7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBcCisgICAgICBlbHNlIGlmIChUQVJHRVRfVkVHQTIwKSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorCWJ1aWx0aW5fZGVmaW5l ICgiX19nZng5MDZfXyIpOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgXAorICAgICAgZWxzZSBpZiAoVEFSR0VUX0dGWDkwOCkgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKwlidWlsdGluX2RlZmluZSAoIl9f Z2Z4OTA4X18iKTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwK KyAgICAgIGVsc2UgaWYgKFRBUkdFVF9HRlg5MGEpICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBcCisJYnVpbHRpbl9kZWZpbmUgKCJfX2dmeDkw YV9fIik7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgIH0g d2hpbGUgKDApCiAKIC8qIFN1cHBvcnQgZm9yIGEgY29tcGlsZS10aW1lIGRlZmF1bHQgYXJj aGl0ZWN0dXJlIGFuZCB0dW5pbmcuCiAgICBUaGUgcnVsZXMgYXJlOgotLSAKMi4zMS4xCgo= --------------HMBxAFLYB963kA9I9DRf8K8I--