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 B445438582BC for ; Wed, 12 Oct 2022 14:06:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B445438582BC 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.95,179,1661846400"; d="diff'?scan'208";a="84660686" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa2.mentor.iphmx.com with ESMTP; 12 Oct 2022 06:05:40 -0800 IronPort-SDR: +L0WrLzx01grppXstU9v2MPacXr3UO9UTTipOu+vvoBcg6iulrs6NRii7WfEfnr42poN7dlASt PVfc7DHV9eeLxIGlY5KKIoXf8+10JuS8cczk3oPG85letv9qZel0GYj2fvetN5KLsXw+31P1pb Blhb55GlWIJDG+c3vKnFHnAGagI//cF3KTOrNOM3GqXKxtCVbtPi7tIo8IwR5/e6KTYO9V9REw T1TJalGFYMnrsOl5ht0lGZLEmmh/+QNm6fruA8ye0g2ZpBGoom35GFoNd63yaT1S0dH0HkZFP+ PNE= Content-Type: multipart/mixed; boundary="------------v8riXhLMhnEDSgPsYPHVbxEi" Message-ID: Date: Wed, 12 Oct 2022 16:05:32 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.2 Content-Language: en-US To: gcc-patches , Jakub Jelinek , Andrew Stubbs From: Tobias Burnus Subject: [Patch] libgomp: Add offload_device_gcn check, add requires-4a.c test CC: "Vollweiler, Marcel" X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-08.mgc.mentorg.com (139.181.222.8) To svr-ies-mbx-12.mgc.mentorg.com (139.181.222.12) X-Spam-Status: No, score=-11.4 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: --------------v8riXhLMhnEDSgPsYPHVbxEi Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: quoted-printable This came up because the USM implementation with -foffload-memory=3D{unifie= d,pinned} as posted at https://gcc.gnu.org/pipermail/gcc-patches/2022-July/597976.htm= l does not handle USM with static variables. This shows up for the OG12 alias devel/omp/gcc-12 branch as FAIL for requir= es-4.c. The attached patch prepares for skipping requires-4.c for the gcn/nvptx dev= ice and adds an adjacent requires-4a.c testcase, using heap memory, that can st= ill run on gcn/nvptx. Additionally, I commented on no longer used #defined, following the precedence GOMP_DEVICE_HOST_NONSHM. Thus, this tests adds another testcase and one effective-target check, out-comments a unused #define - and that's it. (Otherwise, it is just a prep patch.) OK for mainline? Tobias PS: Currently, neither the preexisting offload_device_nvptx nor the new offload_device_gcn target selector is used, neither in old code nor by this= patch. ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstra=C3=9Fe 201= , 80634 M=C3=BCnchen; Gesellschaft mit beschr=C3=A4nkter Haftung; Gesch=C3= =A4ftsf=C3=BChrer: Thomas Heurung, Frank Th=C3=BCrauf; Sitz der Gesellschaf= t: M=C3=BCnchen; Registergericht M=C3=BCnchen, HRB 106955 --------------v8riXhLMhnEDSgPsYPHVbxEi Content-Type: text/x-patch; charset="UTF-8"; name="libgomp-target-require.diff" Content-Disposition: attachment; filename="libgomp-target-require.diff" Content-Transfer-Encoding: base64 bGliZ29tcDogQWRkIG9mZmxvYWRfZGV2aWNlX2djbiBjaGVjaywgYWRkIHJlcXVpcmVzLTRh LmMgdGVzdAoKRHVwbGljYXRlIGxpYmdvbXAuYy1jKystY29tbW9uL3JlcXVpcmVzLTQuYyAo YXMgLi4uLTRhLmMpIGJ1dAp3aXRoIHVzaW5nIGEgaGVhcC1hbGxvY2F0ZWQgaW5zdGVhZCBv ZiBzdGF0aWMgbWVtb3J5IGZvciBhIHZhcmlhYmxlLgoKVGhpcyBjaGFuZ2UgYW5kIHRoZSBh ZGRlZCBvZmZsb2FkX2RldmljZV9nY24gY2hlY2sgcHJlcGFyZSBmb3IKcHNldWRvLVVTTSwg d2hlcmUgdGhlIGRldmljZSBoYXJkd2FyZSBjYW5ub3QgYWNjZXNzIGFsbCBob3N0Cm1lbW9y eSBidXQgb25seSBtYW5hZ2VkIGFuZCBwaW5uZWQgbWVtb3J5OyBmb3IgdGhvc2UsIHJlcXVp cmVzLTQuYwp3aWxsIGZhaWwgYW5kIHRoZSBuZXcgY2hlY2sgcGVybWl0cyB0byBhZGQKICB0 YXJnZXQgeyAhIHsgb2ZmbG9hZF9kZXZpY2VfbnZwdHggfHwgb2ZmbG9hZF9kZXZpY2VfZ2Nu IH0gfQp0byByZXF1aXJlcy00LmM7IGhvd2V2ZXIsIGl0IGhhcyBub3QgYmVlbiBhZGRlZCB5 ZXQgYXMgcHNldW8tVVNNCnN1cHBvcnQgaXMgbm90IHlldCBvbiBtYWlubGluZS4gKFJldmll dyBpcyBwZW5kaW5nIGZvciB0aGUgVVNNCnBhdGNoZXMuKQoKaW5jbHVkZS9DaGFuZ2VMb2c6 CgoJKiBnb21wLWNvbnN0YW50cy5oIChHT01QX0RFVklDRV9IU0EpOiBDb21tZW50ICh1bnVz ZWQpLgoKbGliZ29tcC9DaGFuZ2VMb2c6CgoJKiB0ZXN0c3VpdGUvbGliL2xpYmdvbXAuZXhw IChjaGVja19lZmZlY3RpdmVfdGFyZ2V0X29mZmxvYWRfZGV2aWNlX2djbik6CglOZXcuCgkq IHRlc3RzdWl0ZS9saWJnb21wLmMtYysrLWNvbW1vbi9vbl9kZXZpY2VfYXJjaC5oIChkZXZp Y2VfYXJjaF9nY24sCglvbl9kZXZpY2VfYXJjaF9nY24pOiBOZXcuCgkqIHRlc3RzdWl0ZS9s aWJnb21wLmMtYysrLWNvbW1vbi9yZXF1aXJlcy00YS5jOiBOZXcgdGVzdDsgY29waWVkIGZy b20KCXJlcXVpcmVzLTQuYyBidXQgdXNpbmcgaGVhcC1hbGxvY2F0ZWQgbWVtb3J5LgoKIGlu Y2x1ZGUvZ29tcC1jb25zdGFudHMuaCAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgIDIg Ky0KIGxpYmdvbXAvdGVzdHN1aXRlL2xpYi9saWJnb21wLmV4cCAgICAgICAgICAgICAgICAg IHwgMTIgKysrKysrKwogLi4uL2xpYmdvbXAuYy1jKystY29tbW9uL29uX2RldmljZV9hcmNo LmggICAgICAgICAgfCAxMyArKysrKysrKwogLi4uL3Rlc3RzdWl0ZS9saWJnb21wLmMtYysr LWNvbW1vbi9yZXF1aXJlcy00YS5jICAgfCAzOSArKysrKysrKysrKysrKysrKysrKysrCiA0 IGZpbGVzIGNoYW5nZWQsIDY1IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYg LS1naXQgYS9pbmNsdWRlL2dvbXAtY29uc3RhbnRzLmggYi9pbmNsdWRlL2dvbXAtY29uc3Rh bnRzLmgKaW5kZXggODQzMTZmOTUzZDAuLmZhYzczMTZiODU4IDEwMDY0NAotLS0gYS9pbmNs dWRlL2dvbXAtY29uc3RhbnRzLmgKKysrIGIvaW5jbHVkZS9nb21wLWNvbnN0YW50cy5oCkBA IC0yMjksOSArMjI5LDkgQEAgZW51bSBnb21wX21hcF9raW5kCiAvKiAjZGVmaW5lIEdPTVBf REVWSUNFX0hPU1RfTk9OU0hNCTMgcmVtb3ZlZC4gICovCiAjZGVmaW5lIEdPTVBfREVWSUNF X05PVF9IT1NUCQk0CiAjZGVmaW5lIEdPTVBfREVWSUNFX05WSURJQV9QVFgJCTUKICNkZWZp bmUgR09NUF9ERVZJQ0VfSU5URUxfTUlDCQk2Ci0jZGVmaW5lIEdPTVBfREVWSUNFX0hTQQkJ CTcKKy8qICNkZWZpbmUgR09NUF9ERVZJQ0VfSFNBCQk3IHJlbW92ZWQuICAqLwogI2RlZmlu ZSBHT01QX0RFVklDRV9HQ04JCQk4CiAKIC8qIFdlIGhhdmUgYSBjb21wYXRpYmlsaXR5IGlz c3VlLiAgT3Blbk1QIDUuMiBpbnRyb2R1Y2VkCiAgICBvbXBfaW5pdGlhbF9kZXZpY2Ugd2l0 aCB2YWx1ZSBvZiAtMSB3aGljaCBjbGFzaGVzIHdpdGggb3VyCmRpZmYgLS1naXQgYS9saWJn b21wL3Rlc3RzdWl0ZS9saWIvbGliZ29tcC5leHAgYi9saWJnb21wL3Rlc3RzdWl0ZS9saWIv bGliZ29tcC5leHAKaW5kZXggMTA3YTNjMmFjOWQuLjRiOGM2NGRlOGE1IDEwMDY0NAotLS0g YS9saWJnb21wL3Rlc3RzdWl0ZS9saWIvbGliZ29tcC5leHAKKysrIGIvbGliZ29tcC90ZXN0 c3VpdGUvbGliL2xpYmdvbXAuZXhwCkBAIC00MTQsOCArNDE0LDIwIEBAIHByb2MgY2hlY2tf ZWZmZWN0aXZlX3RhcmdldF9vZmZsb2FkX2RldmljZV9udnB0eCB7IH0gewogCX0KICAgICB9 IF0KIH0KIAorIyBSZXR1cm4gMSBpZiB1c2luZyBhIEdDTiBvZmZsb2FkIGRldmljZS4KK3By b2MgY2hlY2tfZWZmZWN0aXZlX3RhcmdldF9vZmZsb2FkX2RldmljZV9nY24geyB9IHsKKyAg ICByZXR1cm4gW2NoZWNrX3J1bnRpbWVfbm9jYWNoZSBvZmZsb2FkX2RldmljZV9nY24gewor ICAgICAgI2luY2x1ZGUgPG9tcC5oPgorICAgICAgI2luY2x1ZGUgInRlc3RzdWl0ZS9saWJn b21wLmMtYysrLWNvbW1vbi9vbl9kZXZpY2VfYXJjaC5oIgorICAgICAgaW50IG1haW4gKCkK Kwl7CisJICByZXR1cm4gIW9uX2RldmljZV9hcmNoX2djbiAoKTsKKwl9CisgICAgfSBdCit9 CisKICMgUmV0dXJuIDEgaWYgYXQgbGVhc3Qgb25lIE52aWRpYSBHUFUgaXMgYWNjZXNzaWJs ZS4KIAogcHJvYyBjaGVja19lZmZlY3RpdmVfdGFyZ2V0X29wZW5hY2NfbnZpZGlhX2FjY2Vs X3ByZXNlbnQgeyB9IHsKICAgICByZXR1cm4gW2NoZWNrX3J1bnRpbWUgb3BlbmFjY19udmlk aWFfYWNjZWxfcHJlc2VudCB7CmRpZmYgLS1naXQgYS9saWJnb21wL3Rlc3RzdWl0ZS9saWJn b21wLmMtYysrLWNvbW1vbi9vbl9kZXZpY2VfYXJjaC5oIGIvbGliZ29tcC90ZXN0c3VpdGUv bGliZ29tcC5jLWMrKy1jb21tb24vb25fZGV2aWNlX2FyY2guaAppbmRleCBmOTI3NDNiMDRk Ny4uNmY2NmRiZDc4NGMgMTAwNjQ0Ci0tLSBhL2xpYmdvbXAvdGVzdHN1aXRlL2xpYmdvbXAu Yy1jKystY29tbW9uL29uX2RldmljZV9hcmNoLmgKKysrIGIvbGliZ29tcC90ZXN0c3VpdGUv bGliZ29tcC5jLWMrKy1jb21tb24vb25fZGV2aWNlX2FyY2guaApAQCAtNiwxNSArNiwyMiBA QCBkZXZpY2VfYXJjaF9udnB0eCAodm9pZCkKIHsKICAgcmV0dXJuIEdPTVBfREVWSUNFX05W SURJQV9QVFg7CiB9CiAKKy8qIHN0YXRpYyAqLyBpbnQKK2RldmljZV9hcmNoX2djbiAodm9p ZCkKK3sKKyAgcmV0dXJuIEdPTVBfREVWSUNFX0dDTjsKK30KKwogLyogc3RhdGljICovIGlu dAogZGV2aWNlX2FyY2hfaW50ZWxfbWljICh2b2lkKQogewogICByZXR1cm4gR09NUF9ERVZJ Q0VfSU5URUxfTUlDOwogfQogCiAjcHJhZ21hIG9tcCBkZWNsYXJlIHZhcmlhbnQgKGRldmlj ZV9hcmNoX252cHR4KSBtYXRjaChjb25zdHJ1Y3Q9e3RhcmdldH0sZGV2aWNlPXthcmNoKG52 cHR4KX0pCisjcHJhZ21hIG9tcCBkZWNsYXJlIHZhcmlhbnQgKGRldmljZV9hcmNoX2djbikg bWF0Y2goY29uc3RydWN0PXt0YXJnZXR9LGRldmljZT17YXJjaChnY24pfSkKICNwcmFnbWEg b21wIGRlY2xhcmUgdmFyaWFudCAoZGV2aWNlX2FyY2hfaW50ZWxfbWljKSBtYXRjaChjb25z dHJ1Y3Q9e3RhcmdldH0sZGV2aWNlPXthcmNoKGludGVsX21pYyl9KQogLyogc3RhdGljICov IGludAogZGV2aWNlX2FyY2ggKHZvaWQpCiB7CkBAIC0zNiw4ICs0MywxNCBAQCBvbl9kZXZp Y2VfYXJjaF9udnB0eCAoKQogewogICByZXR1cm4gb25fZGV2aWNlX2FyY2ggKEdPTVBfREVW SUNFX05WSURJQV9QVFgpOwogfQogCitpbnQKK29uX2RldmljZV9hcmNoX2djbiAoKQorewor ICByZXR1cm4gb25fZGV2aWNlX2FyY2ggKEdPTVBfREVWSUNFX0dDTik7Cit9CisKIGludAog b25fZGV2aWNlX2FyY2hfaW50ZWxfbWljICgpCiB7CiAgIHJldHVybiBvbl9kZXZpY2VfYXJj aCAoR09NUF9ERVZJQ0VfSU5URUxfTUlDKTsKZGlmZiAtLWdpdCBhL2xpYmdvbXAvdGVzdHN1 aXRlL2xpYmdvbXAuYy1jKystY29tbW9uL3JlcXVpcmVzLTRhLmMgYi9saWJnb21wL3Rlc3Rz dWl0ZS9saWJnb21wLmMtYysrLWNvbW1vbi9yZXF1aXJlcy00YS5jCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwLi40ZmI5NzgzYTk3YQotLS0gL2Rldi9udWxsCisr KyBiL2xpYmdvbXAvdGVzdHN1aXRlL2xpYmdvbXAuYy1jKystY29tbW9uL3JlcXVpcmVzLTRh LmMKQEAgLTAsMCArMSwzOSBAQAorLyogeyBkZy1hZGRpdGlvbmFsLW9wdGlvbnMgIi1mbHRv IiB9ICovCisvKiB7IGRnLWFkZGl0aW9uYWwtb3B0aW9ucyAiLWZvZmZsb2FkLW9wdGlvbnM9 bnZwdHgtbm9uZT0tbWlzYT1zbV8zNSIgeyB0YXJnZXQgeyBvZmZsb2FkX3RhcmdldF9udnB0 eCB9IH0gfSAqLworLyogeyBkZy1hZGRpdGlvbmFsLXNvdXJjZXMgcmVxdWlyZXMtNC1hdXgu YyB9ICovCisKKy8qIFNhbWUgYXMgcmVxdWlyZXMtNC5jLCBidXQgdXNlcyBoZWFwIG1lbW9y eSBmb3IgJ2EnLiAgKi8KKworLyogQ2hlY2sgbm8gZGlhZ25vc3RpYyBieSBkZXZpY2UtY29t cGlsZXIncyBvciBob3N0IGNvbXBpbGVyJ3MgbHRvMS4KKyAgIE90aGVyIGZpbGUgdXNlczog J3JlcXVpcmVzIHJldmVyc2Vfb2ZmbG9hZCcsIGJ1dCB0aGF0J3MgaW5hY3RpdmUgYXMKKyAg IHRoZXJlIGFyZSBubyBkZWNsYXJlIHRhcmdldCBkaXJlY3RpdmVzLCBkZXZpY2UgY29uc3Ry dWN0cyBub3IgZGV2aWNlIHJvdXRpbmVzICAqLworCisvKiBEZXBlbmRpbmcgb24gb2ZmbG9h ZCBkZXZpY2UgY2FwYWJpbGl0aWVzLCBpdCBtYXkgcHJpbnQgc29tZXRoaW5nIGxpa2UgdGhl CisgICBmb2xsb3dpbmcgKG9ubHkpIGlmIEdPTVBfREVCVUc9MToKKyAgICJkZXZpY2VzIHBy ZXNlbnQgYnV0ICdvbXAgcmVxdWlyZXMgdW5pZmllZF9hZGRyZXNzLCB1bmlmaWVkX3NoYXJl ZF9tZW1vcnksIHJldmVyc2Vfb2ZmbG9hZCcgY2Fubm90IGJlIGZ1bGZpbGxlZCIKKyAgIGFu ZCBpbiB0aGF0IGNhc2UgZG9lcyBob3N0LWZhbGxiYWNrIGV4ZWN1dGlvbi4KKworICAgTm8g b2ZmbG9hZCBkZXZpY2VzIHN1cHBvcnQgVVNNIGF0IHByZXNlbnQsIHNvIHdlIG1heSB2ZXJp ZnkgaG9zdC1mYWxsYmFjaworICAgZXhlY3V0aW9uIGJ5IHByZXNlbmNlIG9mIHNlcGFyYXRl IG1lbW9yeSBzcGFjZXMuICAqLworCisjcHJhZ21hIG9tcCByZXF1aXJlcyB1bmlmaWVkX2Fk ZHJlc3MsdW5pZmllZF9zaGFyZWRfbWVtb3J5CisKK2ludCAqYTsKK2V4dGVybiB2b2lkIGZv byAodm9pZCk7CisKK2ludAorbWFpbiAodm9pZCkKK3sKKyAgYSA9IChpbnQgKikgX19idWls dGluX2NhbGxvYyAoc2l6ZW9mIChpbnQpLCAxMCk7CisgICNwcmFnbWEgb21wIHRhcmdldCBt YXAodG86IGEpCisgIGZvciAoaW50IGkgPSAwOyBpIDwgMTA7IGkrKykKKyAgICBhW2ldID0g aTsKKworICBmb3IgKGludCBpID0gMDsgaSA8IDEwOyBpKyspCisgICAgaWYgKGFbaV0gIT0g aSkKKyAgICAgIF9fYnVpbHRpbl9hYm9ydCAoKTsKKworICBmb28gKCk7CisgIF9fYnVpbHRp bl9mcmVlIChhKTsKKyAgcmV0dXJuIDA7Cit9Cg== --------------v8riXhLMhnEDSgPsYPHVbxEi--