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 1C45D3858421; Tue, 24 Jan 2023 15:24:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1C45D3858421 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.97,242,1669104000"; d="diff'?scan'208";a="95573479" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa2.mentor.iphmx.com with ESMTP; 24 Jan 2023 07:24:13 -0800 IronPort-SDR: qlo0yt3ZLuwy1gtwu4yh7SqrYcTmbS/UrpAJrl1nPmRIX4R2HptY40aGKj+BsTv4tERsmOPq6v iEmIxYkWMNscCpop0XbS4bS9A7C/kxQIfrc82UME/Zs/iRllNPhR+zwVt/LBDtrfgjbaa4T4nm vxXw6zj76xjMIDO/FAUvvGPjWBS7ojUjLHBRjBGfe0ARdFZvoYXmD/tCb3YlYkxUm1XVwV/EDa lqsutIIsnYrujlk7qzM6lt1aFk8EHxRLpMYH9CqoEIB6MzOg3ntb0fKRd+5IdUJn0FBWVqDyo4 OQM= Content-Type: multipart/mixed; boundary="------------yql3Vm8zF0Oi0J9jl5oKNTh2" Message-ID: Date: Tue, 24 Jan 2023 16:24:07 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Content-Language: en-US To: Jakub Jelinek , gcc-patches CC: fortran From: Tobias Burnus Subject: [Patch] OpenMP/Fortran: Fix loop-iter var privatization with !$OMP LOOP [PR108512] X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-11.mgc.mentorg.com (139.181.222.11) 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,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,TXREP,URIBL_BLOCKED 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: --------------yql3Vm8zF0Oi0J9jl5oKNTh2 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: quoted-printable I stumbled over a new FAIL (regression) in sollve_vv today, which was due t= o an odd corner case (see commit log for a description). The mentioned in-scan error is tested for in gomp/loop-2.f90 ("'inscan' RED= UCTION clause on construct other than DO, SIMD, DO SIMD, PARALLEL DO, PARALLEL DO = SIMD"). I hope that this patch covers all cases and no other surprises exist... OK for mainline? * * * The ICE is new in GCC 13 due to the duplicate diagnostic (cf. PR); the orig= inal issue existed before but seemingly did not affect the code, at least the sollve_v= v testcase passed before. Still, it could be backported to GCC 12. (Fortran '!$omp loop' support was = added with r12-1206.) Thoughts? Tobias ----------------- 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 --------------yql3Vm8zF0Oi0J9jl5oKNTh2 Content-Type: text/x-patch; charset="UTF-8"; name="fix-omp-parallel-loop.diff" Content-Disposition: attachment; filename="fix-omp-parallel-loop.diff" Content-Transfer-Encoding: base64 T3Blbk1QL0ZvcnRyYW46IEZpeCBsb29wLWl0ZXIgdmFyIHByaXZhdGl6YXRpb24gd2l0aCAh JE9NUCBMT09QIFtQUjEwODUxMl0KCkZvciAncGFyYWxsZWwnLCBsb29wLWl0ZXJhdGlvbiB2 YXJpYWJsZXMgYXJlIG1hcmtlZCBhcmUgbWFya2VkIGFzICdwcml2YXRlJywKdW5sZXNzIHRo ZXkgZWl0aGVyIGFwcGVhciBpbiBhbiBvbXAgZG8vc2ltZCBsb29wIG9yIGFuIGRhdGEtc2hh cmluZyBjbGF1c2UKYWxyZWFkeSBleGlzdHMgZm9yIHRob3NlIG9uICdwYXJhbGxlbCcuICdv bXAgbG9vcCcgd2Fzbid0IGhhbmRsZWQsIGxlYWRpbmcKdG8gKHBvdGVudGlhbGx5KSBtdWx0 aXBsZSBkYXRhLXNoYXJpbmcgY2xhdXNlcyBpbiBnZmNfcmVzb2x2ZV9kb19pdGVyYXRvcgph cyBvbXBfY3VycmVudF9jdHggcG9pbnRlZCB0byB0aGUgJ3BhcmFsbGVsJyBkaXJlY3RpdmUs IGlnbm9yaW5nIHRoZQppbi1iZXR3ZW4gJ2xvb3AnIGRpcmVjdGl2ZS4KClRoZSBsYXR0ZXIg bGVhZCB0byBhIGJvZ3VzIGRpYWdub3N0aWMgLSBvciByYXRoZXIgYW4gSUNFIGFzIHRoZSBz b3VyY2UKbG9jYXRpb24gdmFyIGNvbnRhaW5lZCBvbmx5ICdcMCcuCgpnY2MvZm9ydHJhbi9D aGFuZ2VMb2c6CgoJUFIgZm9ydHJhbi8xMDg1MTIKCSogb3Blbm1wLmNjIChnZmNfcmVzb2x2 ZV9vbXBfZG9fYmxvY2tzKTogRG9uJ3QgY2hlY2sgJ2luc2NhbicKCXJlc3RyaWN0aW9ucyBm b3IgbG9vcCBhcyByZWplY3RlZCBlbHNld2hlcmUuCgkoZ2ZjX3Jlc29sdmVfZG9faXRlcmF0 b3IpOiBTZXQgYSBzb3VyY2UgbG9jYXRpb24gZm9yIGFkZGVkCgkncHJpdmF0ZSctY2xhdXNl IGFyZ3VtZW50cy4KCSogcmVzb2x2ZS5jYyAoZ2ZjX3Jlc29sdmVfY29kZSk6IENhbGwgZ2Zj X3Jlc29sdmVfb21wX2RvX2Jsb2NrcwoJYWxzbyBmb3IgRVhFQ19PTVBfTE9PUC4KCmdjYy90 ZXN0c3VpdGUvQ2hhbmdlTG9nOgoKCVBSIGZvcnRyYW4vMTA4NTEyCgkqIGdmb3J0cmFuLmRn L2dvbXAvbG9vcC01LmY5MDogTmV3IHRlc3QuCgogZ2NjL2ZvcnRyYW4vb3Blbm1wLmNjICAg ICAgICAgICAgICAgICAgICAgfCAgNSArLQogZ2NjL2ZvcnRyYW4vcmVzb2x2ZS5jYyAgICAg ICAgICAgICAgICAgICAgfCAgMSArCiBnY2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRnL2dvbXAv bG9vcC01LmY5MCB8IDg0ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDMgZmls ZXMgY2hhbmdlZCwgODkgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdp dCBhL2djYy9mb3J0cmFuL29wZW5tcC5jYyBiL2djYy9mb3J0cmFuL29wZW5tcC5jYwppbmRl eCBjYzFlYWI5MGI4Yy4uNzY3M2E1MjI0OWYgMTAwNjQ0Ci0tLSBhL2djYy9mb3J0cmFuL29w ZW5tcC5jYworKysgYi9nY2MvZm9ydHJhbi9vcGVubXAuY2MKQEAgLTkwNTYsNyArOTA1Niw5 IEBAIGdmY19yZXNvbHZlX29tcF9kb19ibG9ja3MgKGdmY19jb2RlICpjb2RlLCBnZmNfbmFt ZXNwYWNlICpucykKIAl9CiAgICAgICBpZiAoaSA8IG9tcF9jdXJyZW50X2RvX2NvbGxhcHNl IHx8IG9tcF9jdXJyZW50X2RvX2NvbGxhcHNlIDw9IDApCiAJb21wX2N1cnJlbnRfZG9fY29s bGFwc2UgPSAxOwotICAgICAgaWYgKGNvZGUtPmV4dC5vbXBfY2xhdXNlcy0+bGlzdHNbT01Q X0xJU1RfUkVEVUNUSU9OX0lOU0NBTl0pCisgICAgICBpZiAoY29kZS0+b3AgPT0gRVhFQ19P TVBfTE9PUCkKKwk7ICAvKiBBbHJlYWR5IHJlamVjdGVkIGluIHJlc29sdmVfb21wX2NsYXVz ZXMuICAqLworICAgICAgZWxzZSBpZiAoY29kZS0+ZXh0Lm9tcF9jbGF1c2VzLT5saXN0c1tP TVBfTElTVF9SRURVQ1RJT05fSU5TQ0FOXSkKIAl7CiAJICBsb2N1cyAqbG9jCiAJICAgID0g JmNvZGUtPmV4dC5vbXBfY2xhdXNlcy0+bGlzdHNbT01QX0xJU1RfUkVEVUNUSU9OX0lOU0NB Tl0tPndoZXJlOwpAQCAtOTIyNCw2ICs5MjI2LDcgQEAgZ2ZjX3Jlc29sdmVfZG9faXRlcmF0 b3IgKGdmY19jb2RlICpjb2RlLCBnZmNfc3ltYm9sICpzeW0sIGJvb2wgYWRkX2NsYXVzZSkK IAogICAgICAgcCA9IGdmY19nZXRfb21wX25hbWVsaXN0ICgpOwogICAgICAgcC0+c3ltID0g c3ltOworICAgICAgcC0+d2hlcmUgPSBvbXBfY3VycmVudF9jdHgtPmNvZGUtPmxvYzsKICAg ICAgIHAtPm5leHQgPSBvbXBfY2xhdXNlcy0+bGlzdHNbT01QX0xJU1RfUFJJVkFURV07CiAg ICAgICBvbXBfY2xhdXNlcy0+bGlzdHNbT01QX0xJU1RfUFJJVkFURV0gPSBwOwogICAgIH0K ZGlmZiAtLWdpdCBhL2djYy9mb3J0cmFuL3Jlc29sdmUuY2MgYi9nY2MvZm9ydHJhbi9yZXNv bHZlLmNjCmluZGV4IDk0MjEzY2QzY2Q0Li5iZDJhNzQ5Nzc2ZCAxMDA2NDQKLS0tIGEvZ2Nj L2ZvcnRyYW4vcmVzb2x2ZS5jYworKysgYi9nY2MvZm9ydHJhbi9yZXNvbHZlLmNjCkBAIC0x MTk1MCw2ICsxMTk1MCw3IEBAIGdmY19yZXNvbHZlX2NvZGUgKGdmY19jb2RlICpjb2RlLCBn ZmNfbmFtZXNwYWNlICpucykKIAkgICAgY2FzZSBFWEVDX09NUF9ESVNUUklCVVRFX1NJTUQ6 CiAJICAgIGNhc2UgRVhFQ19PTVBfRE86CiAJICAgIGNhc2UgRVhFQ19PTVBfRE9fU0lNRDoK KwkgICAgY2FzZSBFWEVDX09NUF9MT09QOgogCSAgICBjYXNlIEVYRUNfT01QX1NJTUQ6CiAJ ICAgIGNhc2UgRVhFQ19PTVBfVEFSR0VUX1NJTUQ6CiAJICAgICAgZ2ZjX3Jlc29sdmVfb21w X2RvX2Jsb2NrcyAoY29kZSwgbnMpOwpkaWZmIC0tZ2l0IGEvZ2NjL3Rlc3RzdWl0ZS9nZm9y dHJhbi5kZy9nb21wL2xvb3AtNS5mOTAgYi9nY2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRnL2dv bXAvbG9vcC01LmY5MApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4u MTk0OGU3ODI2NTMKLS0tIC9kZXYvbnVsbAorKysgYi9nY2MvdGVzdHN1aXRlL2dmb3J0cmFu LmRnL2dvbXAvbG9vcC01LmY5MApAQCAtMCwwICsxLDg0IEBACishIHsgZGctYWRkaXRpb25h bC1vcHRpb25zICItZmR1bXAtdHJlZS1vcmlnaW5hbCIgfQorIQorISBQUiBmb3J0cmFuLzEw ODUxMgorCishIFRoZSBwcm9ibGVtIHdhcyB0aGF0IHRoZSBjb250ZXh0IHdhc24ndCByZXNl dCBmb3IgdGhlICdMT09QJworISBzdWNoIHRoYXQgdGhlIGNsYXVzZXMgb2YgdGhlIGxvb3Bz IHdlcmVuJ3Qgc2VlbiB3aGVuIGFkZGluZworISBQUklWQVRFIGNsYXVzZXMuCishCishIElu IHRoZSBmb2xsb3dpbmcsIG9ubHkgdGhlIGxvb3AgdmFyaWFibGUgb2YgdGhlIG5vbi1PcGVu TVAgbG9vcAorISBpbiAnc3Vicm91dGluZSBmb3VyJyBzaG91bGQgZ2V0IGEgZnJvbnQtZW5k IGFkZGRlZCBQUklWQVRFIGNsYXVzZQorCitpbXBsaWNpdCBub25lCitpbnRlZ2VyIDo6IHgs IGEoMTApLCBiKDEwKSwgbgorICAgIG4gPSAxMAorICAgIGEgPSAtNDIKKyAgICBiID0gWygy KngsIHg9MSwxMCldCisKKyEgeyBkZy1maW5hbCB7IHNjYW4tdHJlZS1kdW1wLXRpbWVzICIj cHJhZ21hIG9tcCB0YXJnZXQgbWFwXFwodG9mcm9tOmFcXCkgbWFwXFwodG9mcm9tOmJcXCkg bWFwXFwodG9mcm9tOnhcXClcW1xyXG5cXSIgMSAib3JpZ2luYWwiIH0gfQorISB7IGRnLWZp bmFsIHsgc2Nhbi10cmVlLWR1bXAtdGltZXMgIiNwcmFnbWEgb21wIHBhcmFsbGVsXFtcclxu XF0iIDIgIm9yaWdpbmFsIiB9IH0KKyEgIF4tIHNob3dzIHVwIHR3aWNlOyBjaGVja2VkIG9u bHkgaGVyZS4KKyEgeyBkZy1maW5hbCB7IHNjYW4tdHJlZS1kdW1wLXRpbWVzICIjcHJhZ21h IG9tcCBsb29wIGxhc3Rwcml2YXRlXFwoeFxcKVxbXHJcblxdIiAxICJvcmlnaW5hbCIgfSB9 CisKKyAgICAhJG9tcCB0YXJnZXQgcGFyYWxsZWwgbWFwKHRvZnJvbTogYSwgYiwgeCkKKyAg ICAhJG9tcCBsb29wIGxhc3Rwcml2YXRlKHgpCisgICAgRE8geCA9IDEsIG4KKyAgICAgIGEo eCkgPSBhKHgpICsgYih4KQorICAgIEVORCBETworICAgICEkb21wIGVuZCBsb29wCisgICAg ISRvbXAgZW5kIHRhcmdldCBwYXJhbGxlbAorICAgIGlmICh4IC89IDExKSBlcnJvciBzdG9w CisgICAgaWYgKGFueSAoYSAvPSBbKDIqeCAtIDQyLCB4PTEsMTApXSkpIGVycm9yIHN0b3AK KyAgICBjYWxsIHR3bygpCisgICAgY2FsbCB0aHJlZSgpCisgICAgY2FsbCBmb3VyKCkKK2Vu ZAorCitzdWJyb3V0aW5lIHR3bworICBpbXBsaWNpdCBub25lCisgIGludGVnZXIgOjogaWks IG1tLCBhcnIoMTApCisgIG1tID0gMTAKKyAgYXJyID0gMAorCishIHsgZGctZmluYWwgeyBz Y2FuLXRyZWUtZHVtcC10aW1lcyAiI3ByYWdtYSBvbXAgdGFyZ2V0IG1hcFxcKHRvZnJvbTph cnJcXCkgbWFwXFwodG9mcm9tOmlpXFwpXFtcclxuXF0iIDEgIm9yaWdpbmFsIiB9IH0KKyEg eyBkZy1maW5hbCB7IHNjYW4tdHJlZS1kdW1wLXRpbWVzICIjcHJhZ21hIG9tcCBwYXJhbGxl bCBzaGFyZWRcXChpaVxcKVxbXHJcblxdIiAxICJvcmlnaW5hbCIgfSB9CishIHsgZGctZmlu YWwgeyBzY2FuLXRyZWUtZHVtcC10aW1lcyAiI3ByYWdtYSBvbXAgbG9vcCBsYXN0cHJpdmF0 ZVxcKGlpXFwpXFtcclxuXF0iIDEgIm9yaWdpbmFsIiB9IH0KKworICAhJG9tcCB0YXJnZXQg cGFyYWxsZWwgbG9vcCBtYXAodG9mcm9tOiBhcnIpIGxhc3Rwcml2YXRlKGlpKQorICAgIERP IGlpID0gMSwgbW0KKyAgICAgIGFycihpaSkgPSBhcnIoaWkpICsgaWkKKyAgICBFTkQgRE8K K2VuZAorCitzdWJyb3V0aW5lIHRocmVlCisgIGltcGxpY2l0IG5vbmUKKyAgaW50ZWdlciA6 OiBraywgenosIHZhcigxMCkKKyAgenogPSAxMAorICB2YXIgPSAwCisKKyEgeyBkZy1maW5h bCB7IHNjYW4tdHJlZS1kdW1wLXRpbWVzICIjcHJhZ21hIG9tcCB0YXJnZXQgbWFwXFwodG9m cm9tOnZhclxcKVxbXHJcblxdIiAxICJvcmlnaW5hbCIgfSB9CishICIjcHJhZ21hIG9tcCBw YXJhbGxlbFxbXHJcblxdIiAtIHNob3dzIHVwIHR3aWNlLCBkdW1wIGNoZWNrZWQgYWJvdmUK KyEgeyBkZy1maW5hbCB7IHNjYW4tdHJlZS1kdW1wLXRpbWVzICIjcHJhZ21hIG9tcCBsb29w XFtcclxuXF0iIDEgIm9yaWdpbmFsIiB9IH0KKworICAhJG9tcCB0YXJnZXQgcGFyYWxsZWwg bG9vcCBtYXAodG9mcm9tOiB2YXIpCisgICAgRE8ga2sgPSAxLCB6egorICAgICAgdmFyKGtr KSA9IHZhcihraykgKyBraworICAgIEVORCBETworZW5kCisKK3N1YnJvdXRpbmUgZm91cgor ICBpbXBsaWNpdCBub25lCisgIGludGVnZXIgOjogamosIHFxLCBkaXN0KDEwKQorICBxcSA9 IDEwCisgIGRpc3QgPSAwCisKKyEgeyBkZy1maW5hbCB7IHNjYW4tdHJlZS1kdW1wLXRpbWVz ICIjcHJhZ21hIG9tcCB0YXJnZXQgbWFwXFwodG9mcm9tOmRpc3RcXClcW1xyXG5cXSIgMSAi b3JpZ2luYWwiIH0gfQorISB7IGRnLWZpbmFsIHsgc2Nhbi10cmVlLWR1bXAtdGltZXMgIiNw cmFnbWEgb21wIHBhcmFsbGVsIHByaXZhdGVcXChqalxcKVxbXHJcblxdIiAxICJvcmlnaW5h bCIgfSB9CisKKyAgISRvbXAgdGFyZ2V0IHBhcmFsbGVsIG1hcCh0b2Zyb206IGRpc3QpCisg ICAgISAqbm8qICchJG9tcCBkby9sb29wL3NpbWQnCisgICAgRE8gamogPSAxLCBxcQorICAg ICAgZGlzdChxcSkgPSBkaXN0KHFxKSArIHFxCisgICAgRU5EIERPCisgICEkb21wIGVuZCB0 YXJnZXQgcGFyYWxsZWwKK2VuZAo= --------------yql3Vm8zF0Oi0J9jl5oKNTh2--