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 B6078394D8A1; Fri, 6 May 2022 11:20:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B6078394D8A1 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.91,203,1647331200"; d="diff'?scan'208";a="78040220" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 06 May 2022 03:20:00 -0800 IronPort-SDR: TgIWORaF4CxKjb9/I+mDl7fVhDopkGlBYpP/t13lMnNGNAZcQPM5zi6Qa7DOlkqShln0JIkTMD tDTcC42++QHRUq2VSqJvMh4zuaanh+v2pIjnhIpkC1p+celam5WmIsF9jzjCIFBQFvL/xw+ngK SWJEK4AC2hThgVJQsKuSSFB1ueSGBPTM+C8rhOajdA/+u+UUOodOFTNkBPsh0cWWDtUC04C19m 5IsxDI7qRcL/Lk5Cg/iFLynVB7+Lrdj7BWO6WIel47DayiFc/tk17n1Hs1hF5/8lAmzssnpWBv 8Ow= Content-Type: multipart/mixed; boundary="------------ALAdQk0diwU0GMDjtIWc7HjU" Message-ID: <8306cf91-a7c7-aea9-4c5e-412315e38237@codesourcery.com> Date: Fri, 6 May 2022 13:19:55 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 From: Marcel Vollweiler Subject: [PATCH] OpenMP, libgomp: Handle unified shared memory in omp_target_is_accessible. To: CC: Jakub Jelinek , X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-05.mgc.mentorg.com (139.181.222.5) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: fortran@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Fortran mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 May 2022 11:20:03 -0000 --------------ALAdQk0diwU0GMDjtIWc7HjU Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: quoted-printable Hi, This is a follow up patch of the patch that adds the OpenMP runtime routine omp_target_is_accessible: https://gcc.gnu.org/pipermail/gcc-patches/2022-March/591601.html It considers now also unified shared memory (usm) that was submitted recent= ly (but not yet approved/committed): https://gcc.gnu.org/pipermail/gcc-patches/2022-March/591349.html Marcel ----------------- 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 --------------ALAdQk0diwU0GMDjtIWc7HjU Content-Type: text/plain; charset="UTF-8"; name="target-is-accessible-with-usm-patch.diff" Content-Disposition: attachment; filename="target-is-accessible-with-usm-patch.diff" Content-Transfer-Encoding: base64 T3Blbk1QLCBsaWJnb21wOiBIYW5kbGUgdW5pZmllZCBzaGFyZWQgbWVtb3J5IGluIG9tcF90 YXJnZXRfaXNfYWNjZXNzaWJsZS4KCmxpYmdvbXAvQ2hhbmdlTG9nOgoKCSogdGFyZ2V0LmMg KG9tcF90YXJnZXRfaXNfYWNjZXNzaWJsZSk6IEhhbmRsZSB1bmlmaWVkIHNoYXJlZCBtZW1v cnkuCgkqIHRlc3RzdWl0ZS9saWJnb21wLmMtYysrLWNvbW1vbi90YXJnZXQtaXMtYWNjZXNz aWJsZS0xLmM6IFVwZGF0ZWQuCgkqIHRlc3RzdWl0ZS9saWJnb21wLmZvcnRyYW4vdGFyZ2V0 LWlzLWFjY2Vzc2libGUtMS5mOTA6IFVwZGF0ZWQuCgkqIHRlc3RzdWl0ZS9saWJnb21wLmMt YysrLWNvbW1vbi90YXJnZXQtaXMtYWNjZXNzaWJsZS0yLmM6IE5ldyB0ZXN0LgoJKiB0ZXN0 c3VpdGUvbGliZ29tcC5mb3J0cmFuL3RhcmdldC1pcy1hY2Nlc3NpYmxlLTIuZjkwOiBOZXcg dGVzdC4KCmRpZmYgLS1naXQgYS9saWJnb21wL3RhcmdldC5jIGIvbGliZ29tcC90YXJnZXQu YwppbmRleCA3NGEwMzFmLi5lNmQwMGM1IDEwMDY0NAotLS0gYS9saWJnb21wL3RhcmdldC5j CisrKyBiL2xpYmdvbXAvdGFyZ2V0LmMKQEAgLTM5MDksOSArMzkwOSwxMyBAQCBvbXBfdGFy Z2V0X2lzX2FjY2Vzc2libGUgKGNvbnN0IHZvaWQgKnB0ciwgc2l6ZV90IHNpemUsIGludCBk ZXZpY2VfbnVtKQogICBpZiAoZGV2aWNlcCA9PSBOVUxMKQogICAgIHJldHVybiBmYWxzZTsK IAotICAvKiBUT0RPOiBVbmlmaWVkIHNoYXJlZCBtZW1vcnkgbXVzdCBiZSBoYW5kbGVkIHdo ZW4gYXZhaWxhYmxlLiAgKi8KKyAgaWYgKGRldmljZXAtPmNhcGFiaWxpdGllcyAmIEdPTVBf T0ZGTE9BRF9DQVBfU0hBUkVEX01FTSkKKyAgICByZXR1cm4gdHJ1ZTsKIAotICByZXR1cm4g ZGV2aWNlcC0+Y2FwYWJpbGl0aWVzICYgR09NUF9PRkZMT0FEX0NBUF9TSEFSRURfTUVNOwor ICBpZiAoZGV2aWNlcC0+aXNfdXNtX3B0cl9mdW5jICYmIGRldmljZXAtPmlzX3VzbV9wdHJf ZnVuYyAoKHZvaWQgKikgcHRyKSkKKyAgICByZXR1cm4gdHJ1ZTsKKworICByZXR1cm4gZmFs c2U7CiB9CiAKIGludApkaWZmIC0tZ2l0IGEvbGliZ29tcC90ZXN0c3VpdGUvbGliZ29tcC5j LWMrKy1jb21tb24vdGFyZ2V0LWlzLWFjY2Vzc2libGUtMS5jIGIvbGliZ29tcC90ZXN0c3Vp dGUvbGliZ29tcC5jLWMrKy1jb21tb24vdGFyZ2V0LWlzLWFjY2Vzc2libGUtMS5jCmluZGV4 IDdjMmNmNjIuLmUzZjQ5NGIgMTAwNjQ0Ci0tLSBhL2xpYmdvbXAvdGVzdHN1aXRlL2xpYmdv bXAuYy1jKystY29tbW9uL3RhcmdldC1pcy1hY2Nlc3NpYmxlLTEuYworKysgYi9saWJnb21w L3Rlc3RzdWl0ZS9saWJnb21wLmMtYysrLWNvbW1vbi90YXJnZXQtaXMtYWNjZXNzaWJsZS0x LmMKQEAgLTIzLDIzICsyMywyOCBAQCBtYWluICgpCiAgIGlmIChvbXBfdGFyZ2V0X2lzX2Fj Y2Vzc2libGUgKHAsIHNpemVvZiAoaW50KSwgbiArIDEpKQogICAgIF9fYnVpbHRpbl9hYm9y dCAoKTsKIAotICAvKiBDdXJyZW50bHksIGEgaG9zdCBwb2ludGVyIGlzIGFjY2Vzc2libGUg aWYgdGhlIGRldmljZSBzdXBwb3J0cyBzaGFyZWQKLSAgICAgbWVtb3J5IG9yIG9tcF90YXJn ZXRfaXNfYWNjZXNzaWJsZSBpcyBleGVjdXRlZCBvbiB0aGUgaG9zdC4gVGhpcwotICAgICB0 ZXN0IGNhc2UgbXVzdCBiZSBhZGFwdGVkIHdoZW4gdW5pZmllZCBzaGFyZWQgbWVtb3J5IGlz IGF2aWFsYWJsZS4gICovCiAgIGludCBhWzEyOF07CiAgIGZvciAoaW50IGQgPSAwOyBkIDw9 IG9tcF9nZXRfbnVtX2RldmljZXMgKCk7IGQrKykKICAgICB7CisgICAgICAvKiBTSEFSRURf TUVNIGlzIDEgaWYgYW5kIG9ubHkgaWYgaG9zdCBhbmQgZGV2aWNlIHNoYXJlIHRoZSBzYW1l IG1lbW9yeS4KKwkgT01QX1RBUkdFVF9JU19BQ0NFU1NJQkxFIHNob3VsZCBub3QgcmV0dXJu IDAgZm9yIHNoYXJlZCBtZW1vcnkuICAqLwogICAgICAgaW50IHNoYXJlZF9tZW0gPSAwOwog ICAgICAgI3ByYWdtYSBvbXAgdGFyZ2V0IG1hcCAoYWxsb2M6IHNoYXJlZF9tZW0pIGRldmlj ZSAoZCkKIAlzaGFyZWRfbWVtID0gMTsKLSAgICAgIGlmIChvbXBfdGFyZ2V0X2lzX2FjY2Vz c2libGUgKHAsIHNpemVvZiAoaW50KSwgZCkgIT0gc2hhcmVkX21lbSkKKworICAgICAgaWYg KHNoYXJlZF9tZW0gJiYgIW9tcF90YXJnZXRfaXNfYWNjZXNzaWJsZSAocCwgc2l6ZW9mIChp bnQpLCBkKSkKKwlfX2J1aWx0aW5fYWJvcnQgKCk7CisKKyAgICAgIC8qIFVTTSBpcyBkaXNh YmxlZCBieSBkZWZhdWx0LiAgSGVuY2UgT01QX1RBUkdFVF9JU19BQ0NFU1NJQkxFIHNob3Vs ZAorCSByZXR1cm4gMCBpZiBzaGFyZWRfbWVtIGlzIGZhbHNlLiAgKi8KKyAgICAgIGlmICgh c2hhcmVkX21lbSAmJiBvbXBfdGFyZ2V0X2lzX2FjY2Vzc2libGUgKHAsIHNpemVvZiAoaW50 KSwgZCkpCiAJX19idWlsdGluX2Fib3J0ICgpOwogCi0gICAgICBpZiAob21wX3RhcmdldF9p c19hY2Nlc3NpYmxlIChhLCAxMjggKiBzaXplb2YgKGludCksIGQpICE9IHNoYXJlZF9tZW0p CisgICAgICBpZiAoc2hhcmVkX21lbSAmJiAhb21wX3RhcmdldF9pc19hY2Nlc3NpYmxlIChh LCAxMjggKiBzaXplb2YgKGludCksIGQpKQogCV9fYnVpbHRpbl9hYm9ydCAoKTsKIAogICAg ICAgZm9yIChpbnQgaSA9IDA7IGkgPCAxMjg7IGkrKykKLQlpZiAob21wX3RhcmdldF9pc19h Y2Nlc3NpYmxlICgmYVtpXSwgc2l6ZW9mIChpbnQpLCBkKSAhPSBzaGFyZWRfbWVtKQorCWlm IChzaGFyZWRfbWVtICYmICFvbXBfdGFyZ2V0X2lzX2FjY2Vzc2libGUgKCZhW2ldLCBzaXpl b2YgKGludCksIGQpKQogCSAgX19idWlsdGluX2Fib3J0ICgpOwogICAgIH0KIApkaWZmIC0t Z2l0IGEvbGliZ29tcC90ZXN0c3VpdGUvbGliZ29tcC5jLWMrKy1jb21tb24vdGFyZ2V0LWlz LWFjY2Vzc2libGUtMi5jIGIvbGliZ29tcC90ZXN0c3VpdGUvbGliZ29tcC5jLWMrKy1jb21t b24vdGFyZ2V0LWlzLWFjY2Vzc2libGUtMi5jCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAuLjI0YWY1MWYKLS0tIC9kZXYvbnVsbAorKysgYi9saWJnb21wL3Rlc3RzdWl0 ZS9saWJnb21wLmMtYysrLWNvbW1vbi90YXJnZXQtaXMtYWNjZXNzaWJsZS0yLmMKQEAgLTAs MCArMSwyMiBAQAorLyogeyBkZy1kbyBydW4gfSAqLworLyogeyBkZy1za2lwLWlmICJVU00g aXMgb25seSBpbXBsZW1lbnRlZCBmb3IgbnZwdHguIiB7ICEgb2ZmbG9hZF90YXJnZXRfbnZw dHggfSB9ICovCisKKyNpbmNsdWRlIDxvbXAuaD4KKyNpbmNsdWRlIDxzdGRpbnQuaD4KKwor I3ByYWdtYSBvbXAgcmVxdWlyZXMgdW5pZmllZF9zaGFyZWRfbWVtb3J5CisKK2ludAorbWFp biAoKQoreworICBpbnQgKmEgPSAoaW50ICopIG9tcF9hbGxvYyAoc2l6ZW9mKGludCksIG9t cHhfdW5pZmllZF9zaGFyZWRfbWVtX2FsbG9jKTsKKyAgaWYgKCFhKQorICAgIF9fYnVpbHRp bl9hYm9ydCAoKTsKKworICBmb3IgKGludCBkID0gMDsgZCA8PSBvbXBfZ2V0X251bV9kZXZp Y2VzICgpOyBkKyspCisgICAgaWYgKCFvbXBfdGFyZ2V0X2lzX2FjY2Vzc2libGUgKGEsIHNp emVvZiAoaW50KSwgZCkpCisgICAgICBfX2J1aWx0aW5fYWJvcnQgKCk7CisKKyAgb21wX2Zy ZWUoYSwgb21weF91bmlmaWVkX3NoYXJlZF9tZW1fYWxsb2MpOworICByZXR1cm4gMDsKK30K ZGlmZiAtLWdpdCBhL2xpYmdvbXAvdGVzdHN1aXRlL2xpYmdvbXAuZm9ydHJhbi90YXJnZXQt aXMtYWNjZXNzaWJsZS0xLmY5MCBiL2xpYmdvbXAvdGVzdHN1aXRlL2xpYmdvbXAuZm9ydHJh bi90YXJnZXQtaXMtYWNjZXNzaWJsZS0xLmY5MAppbmRleCAyNjExODU1Li4wMTVmNzRhIDEw MDY0NAotLS0gYS9saWJnb21wL3Rlc3RzdWl0ZS9saWJnb21wLmZvcnRyYW4vdGFyZ2V0LWlz LWFjY2Vzc2libGUtMS5mOTAKKysrIGIvbGliZ29tcC90ZXN0c3VpdGUvbGliZ29tcC5mb3J0 cmFuL3RhcmdldC1pcy1hY2Nlc3NpYmxlLTEuZjkwCkBAIC0xLDMgKzEsNSBAQAorISB7IGRn LWRvIHJ1biB9CisKIHByb2dyYW0gbWFpbgogICB1c2Ugb21wX2xpYgogICB1c2UgaXNvX2Nf YmluZGluZwpAQCAtMjUsMjQgKzI3LDI4IEBAIHByb2dyYW0gbWFpbgogICBpZiAob21wX3Rh cmdldF9pc19hY2Nlc3NpYmxlIChwLCBjX3NpemVvZiAoZCksIG4gKyAxKSAvPSAwKSAmCiAg ICAgc3RvcCA0CiAKLSAgISBDdXJyZW50bHksIGEgaG9zdCBwb2ludGVyIGlzIGFjY2Vzc2li bGUgaWYgdGhlIGRldmljZSBzdXBwb3J0cyBzaGFyZWQKLSAgISBtZW1vcnkgb3Igb21wX3Rh cmdldF9pc19hY2Nlc3NpYmxlIGlzIGV4ZWN1dGVkIG9uIHRoZSBob3N0LiBUaGlzCi0gICEg dGVzdCBjYXNlIG11c3QgYmUgYWRhcHRlZCB3aGVuIHVuaWZpZWQgc2hhcmVkIG1lbW9yeSBp cyBhdmlhbGFibGUuCiAgIGRvIGQgPSAwLCBvbXBfZ2V0X251bV9kZXZpY2VzICgpCisgICAg ISBTSEFSRURfTUVNIGlzIDEgaWYgYW5kIG9ubHkgaWYgaG9zdCBhbmQgZGV2aWNlIHNoYXJl IHRoZSBzYW1lIG1lbW9yeS4KKyAgICAhIE9NUF9UQVJHRVRfSVNfQUNDRVNTSUJMRSBzaG91 bGQgbm90IHJldHVybiAwIGZvciBzaGFyZWQgbWVtb3J5LgogICAgIHNoYXJlZF9tZW0gPSAw OwogICAgICEkb21wIHRhcmdldCBtYXAgKGFsbG9jOiBzaGFyZWRfbWVtKSBkZXZpY2UgKGQp CiAgICAgICBzaGFyZWRfbWVtID0gMTsKICAgICAhJG9tcCBlbmQgdGFyZ2V0CiAKLSAgICBp ZiAob21wX3RhcmdldF9pc19hY2Nlc3NpYmxlIChwLCBjX3NpemVvZiAoZCksIGQpIC89IHNo YXJlZF9tZW0pICYKKyAgICBpZiAoc2hhcmVkX21lbSA9PSAxIC5hbmQuIG9tcF90YXJnZXRf aXNfYWNjZXNzaWJsZSAocCwgY19zaXplb2YgKGQpLCBkKSA9PSAwKSAmCiAgICAgICBzdG9w IDU7CiAKLSAgICBpZiAob21wX3RhcmdldF9pc19hY2Nlc3NpYmxlIChjX2xvYyAoYSksIDEy OCAqIHNpemVvZiAoYSgxKSksIGQpIC89IHNoYXJlZF9tZW0pICYKKyAgICAhIFVTTSBpcyBk aXNhYmxlZCBieSBkZWZhdWx0LiAgSGVuY2UgT01QX1RBUkdFVF9JU19BQ0NFU1NJQkxFIHNo b3VsZAorICAgICEgcmV0dXJuIDAgaWYgc2hhcmVkX21lbSBpcyBmYWxzZS4KKyAgICBpZiAo c2hhcmVkX21lbSA9PSAwIC5hbmQuIG9tcF90YXJnZXRfaXNfYWNjZXNzaWJsZSAocCwgY19z aXplb2YgKGQpLCBkKSAvPSAwKSAmCiAgICAgICBzdG9wIDY7CiAKKyAgICBpZiAoc2hhcmVk X21lbSA9PSAxIC5hbmQuIG9tcF90YXJnZXRfaXNfYWNjZXNzaWJsZSAoY19sb2MgKGEpLCAx MjggKiBzaXplb2YgKGEoMSkpLCBkKSA9PSAwKSAmCisgICAgICBzdG9wIDc7CisKICAgICBk byBpID0gMSwgMTI4Ci0gICAgICBpZiAob21wX3RhcmdldF9pc19hY2Nlc3NpYmxlIChjX2xv YyAoYShpKSksIHNpemVvZiAoYShpKSksIGQpIC89IHNoYXJlZF9tZW0pICYKLSAgICAgICAg c3RvcCA3OworICAgICAgaWYgKHNoYXJlZF9tZW0gPT0gMSAuYW5kLiBvbXBfdGFyZ2V0X2lz X2FjY2Vzc2libGUgKGNfbG9jIChhKGkpKSwgc2l6ZW9mIChhKGkpKSwgZCkgPT0gMCkgJgor ICAgICAgICBzdG9wIDg7CiAgICAgZW5kIGRvCiAKICAgZW5kIGRvCmRpZmYgLS1naXQgYS9s aWJnb21wL3Rlc3RzdWl0ZS9saWJnb21wLmZvcnRyYW4vdGFyZ2V0LWlzLWFjY2Vzc2libGUt Mi5mOTAgYi9saWJnb21wL3Rlc3RzdWl0ZS9saWJnb21wLmZvcnRyYW4vdGFyZ2V0LWlzLWFj Y2Vzc2libGUtMi5mOTAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNWMw ODU2NAotLS0gL2Rldi9udWxsCisrKyBiL2xpYmdvbXAvdGVzdHN1aXRlL2xpYmdvbXAuZm9y dHJhbi90YXJnZXQtaXMtYWNjZXNzaWJsZS0yLmY5MApAQCAtMCwwICsxLDIwIEBACishIHsg ZGctZG8gcnVuIH0KKyEgeyBkZy1za2lwLWlmICJVU00gaXMgb25seSBpbXBsZW1lbnRlZCBm b3IgbnZwdHguIiB7ICEgb2ZmbG9hZF90YXJnZXRfbnZwdHggfSB9CisKK3Byb2dyYW0gbWFp bgorICB1c2Ugb21wX2xpYgorICB1c2UgaXNvX2NfYmluZGluZworICBpbXBsaWNpdCBub25l IChleHRlcm5hbCwgdHlwZSkKKyAgaW50ZWdlciA6OiBkCisgIHR5cGUoY19wdHIpIDo6IHAK KworICBwID0gb21wX2FsbG9jIChzaXplb2YoZCksIG9tcHhfdW5pZmllZF9zaGFyZWRfbWVt X2FsbG9jKQorICBpZiAoLm5vdC4gY19hc3NvY2lhdGVkIChwKSkgc3RvcCAxCisKKyAgZG8g ZCA9IDAsIG9tcF9nZXRfbnVtX2RldmljZXMgKCkKKyAgICBpZiAob21wX3RhcmdldF9pc19h Y2Nlc3NpYmxlIChwLCBjX3NpemVvZiAoZCksIGQpID09IDApICYKKyAgICAgIHN0b3AgMjsK KyAgZW5kIGRvCisKKyAgY2FsbCBvbXBfZnJlZSAocCwgb21weF91bmlmaWVkX3NoYXJlZF9t ZW1fYWxsb2MpOworZW5kIHByb2dyYW0gbWFpbgoK --------------ALAdQk0diwU0GMDjtIWc7HjU--