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 758863858CDA for ; Tue, 16 Aug 2022 15:28:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 758863858CDA 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.93,241,1654588800"; d="diff'?scan'208";a="81392390" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 16 Aug 2022 07:28:46 -0800 IronPort-SDR: ihTbJSgl6u3noXpJL1jNKPziOe8S309xlgRX/sofJeRLl35YaqkHmna/i27+xUOSf/CdUQ09r0 cce0+qlB3JgnGtwdT60BguGLGOuqoVCCu766J6EQqC/7kqLYAcxIppE58wVBW0iW8bT7WJRj9i qwVhb618AG+K0rNmO+V6zHnN55B2JHaQAb/FAxaNICZUB7cO3IBckVIw2ZVYkmaYGgMgFUOLpE ot+5aYltRhbMTzSzQKf0/a/CA7NFAA8l4W5icdIsDA9hcfnYQr1xSZH5iotI45L1KPLIqa/x4s USM= Content-Type: multipart/mixed; boundary="------------kdFV6uiwFmZKZ6KJ4Yt4Posk" Message-ID: <52902f75-33c1-49c3-8e21-e6c6d1808a15@codesourcery.com> Date: Tue, 16 Aug 2022 17:28:40 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 Content-Language: en-US To: gcc-patches , Jakub Jelinek From: Tobias Burnus Subject: [Patch] OpenMP: Fix var replacement with 'simd' and linear-step vars [PR106548] X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-13.mgc.mentorg.com (139.181.222.13) 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_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Aug 2022 15:28:51 -0000 --------------kdFV6uiwFmZKZ6KJ4Yt4Posk Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: quoted-printable The testcase is just a copy of linear-1 with 'omp ... for' replaced by 'omp= ... for simd', matching what the PR report referred to. The problem occurs for 'omp ... for simd linear( i : step)' when 'step' is = a variable when a omp_fn... is generated - as in this case, the original variable is u= sed (in the reduced example of the PR, the PARM_DECL of 'f') instead of the replacement= . OK for mainline? Thoughts on backporting (and for which versions)? 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 --------------kdFV6uiwFmZKZ6KJ4Yt4Posk Content-Type: text/x-patch; charset="UTF-8"; name="omp-simd-parm.diff" Content-Disposition: attachment; filename="omp-simd-parm.diff" Content-Transfer-Encoding: base64 T3Blbk1QOiBGaXggdmFyIHJlcGxhY2VtZW50IHdpdGggJ3NpbWQnIGFuZCBsaW5lYXItc3Rl cCB2YXJzIFtQUjEwNjU0OF0KCmdjYy9DaGFuZ2VMb2c6CgoJUFIgbWlkZGxlLWVuZC8xMDY1 NDgKCSogb21wLWxvdy5jYyAobG93ZXJfcmVjX2lucHV0X2NsYXVzZXMpOiBVc2UgYnVpbGRf b3V0ZXJfdmFyX3JlZgoJZm9yICdzaW1kJyBsaW5lYXItc3RlcCB2YWx1ZXMgdGhhdCBhcmUg dmFyaWFibGUuCgpsaWJnb21wL0NoYW5nZUxvZzoKCglQUiBtaWRkbGUtZW5kLzEwNjU0OAoJ KiB0ZXN0c3VpdGUvbGliZ29tcC5jL2xpbmVhci0yLmM6IE5ldyB0ZXN0LgoKZGlmZiAtLWdp dCBhL2djYy9vbXAtbG93LmNjIGIvZ2NjL29tcC1sb3cuY2MKaW5kZXggM2M0Yjg1OTNjOGIu LmQ2ZDZmZjM3MmExIDEwMDY0NAotLS0gYS9nY2Mvb21wLWxvdy5jYworKysgYi9nY2Mvb21w LWxvdy5jYwpAQCAtNjE4OCw2ICs2MTg4LDEwIEBAIGxvd2VyX3JlY19pbnB1dF9jbGF1c2Vz ICh0cmVlIGNsYXVzZXMsIGdpbXBsZV9zZXEgKmlsaXN0LCBnaW1wbGVfc2VxICpkbGlzdCwK IAkJICAgICAgJiYgZ2ltcGxlX29tcF9mb3JfY29tYmluZWRfaW50b19wIChjdHgtPnN0bXQp KQogCQkgICAgewogCQkgICAgICB0cmVlIHQgPSBPTVBfQ0xBVVNFX0xJTkVBUl9TVEVQIChj KTsKKwkJICAgICAgaWYgKFZBUl9QICh0KQorCQkJICB8fCBUUkVFX0NPREUgKHQpID09IFBB Uk1fREVDTAorCQkJICB8fCBUUkVFX0NPREUgKHQpID09IFJFU1VMVF9ERUNMKQorCQkJdCA9 IGJ1aWxkX291dGVyX3Zhcl9yZWYgKHQsIGN0eCk7CiAJCSAgICAgIHRyZWUgc3RlcHQgPSBU UkVFX1RZUEUgKHQpOwogCQkgICAgICB0cmVlIGN0ID0gb21wX2ZpbmRfY2xhdXNlIChjbGF1 c2VzLAogCQkJCQkJIE9NUF9DTEFVU0VfX0xPT1BURU1QXyk7CmRpZmYgLS1naXQgYS9saWJn b21wL3Rlc3RzdWl0ZS9saWJnb21wLmMvbGluZWFyLTIuYyBiL2xpYmdvbXAvdGVzdHN1aXRl L2xpYmdvbXAuYy9saW5lYXItMi5jCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwLi5mZWU2ZmJjMjc2ZAotLS0gL2Rldi9udWxsCisrKyBiL2xpYmdvbXAvdGVzdHN1 aXRlL2xpYmdvbXAuYy9saW5lYXItMi5jCkBAIC0wLDAgKzEsMjUxIEBACisvKiBQUiBtaWRk bGUtZW5kLzEwNjU0OC4gICovCitpbnQgYVsyNTZdOworCitfX2F0dHJpYnV0ZV9fKChub2lu bGluZSwgbm9jbG9uZSkpIGludAorZjEgKGludCBpKQoreworICAjcHJhZ21hIG9tcCBwYXJh bGxlbCBmb3Igc2ltZCBsaW5lYXIgKGk6IDQpCisgIGZvciAoaW50IGogPSAxNjsgaiA8IDY0 OyBqKyspCisgICAgeworICAgICAgYVtpXSA9IGo7CisgICAgICBpICs9IDQ7CisgICAgfQor ICByZXR1cm4gaTsKK30KKworX19hdHRyaWJ1dGVfXygobm9pbmxpbmUsIG5vY2xvbmUpKSBz aG9ydCBpbnQKK2YyIChzaG9ydCBpbnQgaSwgY2hhciBrKQoreworICAjcHJhZ21hIG9tcCBw YXJhbGxlbCBmb3Igc2ltZCBsaW5lYXIgKGk6IGsgKyAxKQorICBmb3IgKGxvbmcgaiA9IDE2 OyBqIDwgNjQ7IGorKykKKyAgICB7CisgICAgICBhW2ldID0gajsKKyAgICAgIGkgKz0gNDsK KyAgICB9CisgIHJldHVybiBpOworfQorCitfX2F0dHJpYnV0ZV9fKChub2lubGluZSwgbm9j bG9uZSkpIGxvbmcgbG9uZyBpbnQKK2YzIChsb25nIGxvbmcgaW50IGksIGxvbmcgbG9uZyBp bnQgaykKK3sKKyAgI3ByYWdtYSBvbXAgcGFyYWxsZWwgZm9yIHNpbWQgbGluZWFyIChpOiBr KQorICBmb3IgKHNob3J0IGogPSAxNjsgaiA8IDY0OyBqKyspCisgICAgeworICAgICAgYVtp XSA9IGo7CisgICAgICBpICs9IDQ7CisgICAgfQorICByZXR1cm4gaTsKK30KKworX19hdHRy aWJ1dGVfXygobm9pbmxpbmUsIG5vY2xvbmUpKSBpbnQKK2Y0IChpbnQgaSkKK3sKKyAgI3By YWdtYSBvbXAgcGFyYWxsZWwgZm9yIHNpbWQgbGluZWFyIChpOiA0KSBzY2hlZHVsZShzdGF0 aWMsIDMpCisgIGZvciAoaW50IGogPSAxNjsgaiA8IDY0OyBqKyspCisgICAgeworICAgICAg YVtpXSA9IGo7CisgICAgICBpICs9IDQ7CisgICAgfQorICByZXR1cm4gaTsKK30KKworX19h dHRyaWJ1dGVfXygobm9pbmxpbmUsIG5vY2xvbmUpKSBzaG9ydCBpbnQKK2Y1IChzaG9ydCBp bnQgaSwgY2hhciBrKQoreworICAjcHJhZ21hIG9tcCBwYXJhbGxlbCBmb3Igc2ltZCBsaW5l YXIgKGk6IGsgKyAxKSBzY2hlZHVsZShzdGF0aWMsIDUpCisgIGZvciAobG9uZyBqID0gMTY7 IGogPCA2NDsgaisrKQorICAgIHsKKyAgICAgIGFbaV0gPSBqOworICAgICAgaSArPSA0Owor ICAgIH0KKyAgcmV0dXJuIGk7Cit9CisKK19fYXR0cmlidXRlX18oKG5vaW5saW5lLCBub2Ns b25lKSkgbG9uZyBsb25nIGludAorZjYgKGxvbmcgbG9uZyBpbnQgaSwgbG9uZyBsb25nIGlu dCBrKQoreworICAjcHJhZ21hIG9tcCBwYXJhbGxlbCBmb3Igc2ltZCBsaW5lYXIgKGk6IGsp IHNjaGVkdWxlKHN0YXRpYywgNykKKyAgZm9yIChzaG9ydCBqID0gMTY7IGogPCA2NDsgaisr KQorICAgIHsKKyAgICAgIGFbaV0gPSBqOworICAgICAgaSArPSA0OworICAgIH0KKyAgcmV0 dXJuIGk7Cit9CisKK19fYXR0cmlidXRlX18oKG5vaW5saW5lLCBub2Nsb25lKSkgaW50Citm NyAoaW50IGkpCit7CisgICNwcmFnbWEgb21wIHBhcmFsbGVsIGZvciBzaW1kIGxpbmVhciAo aTogNCkgc2NoZWR1bGUoZHluYW1pYywgMykKKyAgZm9yIChpbnQgaiA9IDE2OyBqIDwgNjQ7 IGorKykKKyAgICB7CisgICAgICBhW2ldID0gajsKKyAgICAgIGkgKz0gNDsKKyAgICB9Cisg IHJldHVybiBpOworfQorCitfX2F0dHJpYnV0ZV9fKChub2lubGluZSwgbm9jbG9uZSkpIHNo b3J0IGludAorZjggKHNob3J0IGludCBpLCBjaGFyIGspCit7CisgICNwcmFnbWEgb21wIHBh cmFsbGVsIGZvciBzaW1kIGxpbmVhciAoaTogayArIDEpIHNjaGVkdWxlKGR5bmFtaWMsIDUp CisgIGZvciAobG9uZyBqID0gMTY7IGogPCA2NDsgaisrKQorICAgIHsKKyAgICAgIGFbaV0g PSBqOworICAgICAgaSArPSA0OworICAgIH0KKyAgcmV0dXJuIGk7Cit9CisKK19fYXR0cmli dXRlX18oKG5vaW5saW5lLCBub2Nsb25lKSkgbG9uZyBsb25nIGludAorZjkgKGxvbmcgbG9u ZyBpbnQgaSwgbG9uZyBsb25nIGludCBrKQoreworICAjcHJhZ21hIG9tcCBwYXJhbGxlbCBm b3Igc2ltZCBsaW5lYXIgKGk6IGspIHNjaGVkdWxlKGR5bmFtaWMsIDcpCisgIGZvciAoc2hv cnQgaiA9IDE2OyBqIDwgNjQ7IGorKykKKyAgICB7CisgICAgICBhW2ldID0gajsKKyAgICAg IGkgKz0gNDsKKyAgICB9CisgIHJldHVybiBpOworfQorCitfX2F0dHJpYnV0ZV9fKChub2lu bGluZSwgbm9jbG9uZSkpIGludAorZjEwIChpbnQgaSwgbG9uZyBzdGVwKQoreworICAjcHJh Z21hIG9tcCBwYXJhbGxlbCBmb3Igc2ltZCBsaW5lYXIgKGk6IDQpCisgIGZvciAoaW50IGog PSAxNjsgaiA8IDExMjsgaiArPSBzdGVwKQorICAgIHsKKyAgICAgIGFbaV0gPSBqIC8gMiAr IDg7CisgICAgICBpICs9IDQ7CisgICAgfQorICByZXR1cm4gaTsKK30KKworX19hdHRyaWJ1 dGVfXygobm9pbmxpbmUsIG5vY2xvbmUpKSBzaG9ydCBpbnQKK2YxMSAoc2hvcnQgaW50IGks IGNoYXIgaywgY2hhciBzdGVwKQoreworICAjcHJhZ21hIG9tcCBwYXJhbGxlbCBmb3Igc2lt ZCBsaW5lYXIgKGk6IGsgKyAxKQorICBmb3IgKGxvbmcgaiA9IDE2OyBqIDwgMTEyOyBqICs9 IHN0ZXApCisgICAgeworICAgICAgYVtpXSA9IGogLyAyICsgODsKKyAgICAgIGkgKz0gNDsK KyAgICB9CisgIHJldHVybiBpOworfQorCitfX2F0dHJpYnV0ZV9fKChub2lubGluZSwgbm9j bG9uZSkpIGxvbmcgbG9uZyBpbnQKK2YxMiAobG9uZyBsb25nIGludCBpLCBsb25nIGxvbmcg aW50IGssIGludCBzdGVwKQoreworICAjcHJhZ21hIG9tcCBwYXJhbGxlbCBmb3Igc2ltZCBs aW5lYXIgKGk6IGspCisgIGZvciAoc2hvcnQgaiA9IDE2OyBqIDwgMTEyOyBqICs9IHN0ZXAp CisgICAgeworICAgICAgYVtpXSA9IGogLyAyICsgODsKKyAgICAgIGkgKz0gNDsKKyAgICB9 CisgIHJldHVybiBpOworfQorCitfX2F0dHJpYnV0ZV9fKChub2lubGluZSwgbm9jbG9uZSkp IGludAorZjEzIChpbnQgaSwgbG9uZyBsb25nIGludCBzdGVwKQoreworICAjcHJhZ21hIG9t cCBwYXJhbGxlbCBmb3Igc2ltZCBsaW5lYXIgKGk6IDQpIHNjaGVkdWxlKHN0YXRpYywgMykK KyAgZm9yIChpbnQgaiA9IDE2OyBqIDwgMTEyOyBqICs9IHN0ZXApCisgICAgeworICAgICAg YVtpXSA9IGogLyAyICsgODsKKyAgICAgIGkgKz0gNDsKKyAgICB9CisgIHJldHVybiBpOwor fQorCitfX2F0dHJpYnV0ZV9fKChub2lubGluZSwgbm9jbG9uZSkpIHNob3J0IGludAorZjE0 IChzaG9ydCBpbnQgaSwgY2hhciBrLCBpbnQgc3RlcCkKK3sKKyAgI3ByYWdtYSBvbXAgcGFy YWxsZWwgZm9yIHNpbWQgbGluZWFyIChpOiBrICsgMSkgc2NoZWR1bGUoc3RhdGljLCA1KQor ICBmb3IgKGxvbmcgaiA9IDE2OyBqIDwgMTEyOyBqICs9IHN0ZXApCisgICAgeworICAgICAg YVtpXSA9IGogLyAyICsgODsKKyAgICAgIGkgKz0gNDsKKyAgICB9CisgIHJldHVybiBpOwor fQorCitfX2F0dHJpYnV0ZV9fKChub2lubGluZSwgbm9jbG9uZSkpIGxvbmcgbG9uZyBpbnQK K2YxNSAobG9uZyBsb25nIGludCBpLCBsb25nIGxvbmcgaW50IGssIGxvbmcgaW50IHN0ZXAp Cit7CisgICNwcmFnbWEgb21wIHBhcmFsbGVsIGZvciBzaW1kIGxpbmVhciAoaTogaykgc2No ZWR1bGUoc3RhdGljLCA3KQorICBmb3IgKHNob3J0IGogPSAxNjsgaiA8IDExMjsgaiArPSBz dGVwKQorICAgIHsKKyAgICAgIGFbaV0gPSBqIC8gMiArIDg7CisgICAgICBpICs9IDQ7Cisg ICAgfQorICByZXR1cm4gaTsKK30KKworX19hdHRyaWJ1dGVfXygobm9pbmxpbmUsIG5vY2xv bmUpKSBpbnQKK2YxNiAoaW50IGksIGxvbmcgbG9uZyBpbnQgc3RlcCkKK3sKKyAgI3ByYWdt YSBvbXAgcGFyYWxsZWwgZm9yIHNpbWQgbGluZWFyIChpOiA0KSBzY2hlZHVsZShkeW5hbWlj LCAzKQorICBmb3IgKGludCBqID0gMTY7IGogPCAxMTI7IGogKz0gc3RlcCkKKyAgICB7Cisg ICAgICBhW2ldID0gaiAvIDIgKyA4OworICAgICAgaSArPSA0OworICAgIH0KKyAgcmV0dXJu IGk7Cit9CisKK19fYXR0cmlidXRlX18oKG5vaW5saW5lLCBub2Nsb25lKSkgc2hvcnQgaW50 CitmMTcgKHNob3J0IGludCBpLCBjaGFyIGssIGludCBzdGVwKQoreworICAjcHJhZ21hIG9t cCBwYXJhbGxlbCBmb3Igc2ltZCBsaW5lYXIgKGk6IGsgKyAxKSBzY2hlZHVsZShkeW5hbWlj LCA1KQorICBmb3IgKGxvbmcgaiA9IDE2OyBqIDwgMTEyOyBqICs9IHN0ZXApCisgICAgewor ICAgICAgYVtpXSA9IGogLyAyICsgODsKKyAgICAgIGkgKz0gNDsKKyAgICB9CisgIHJldHVy biBpOworfQorCitfX2F0dHJpYnV0ZV9fKChub2lubGluZSwgbm9jbG9uZSkpIGxvbmcgbG9u ZyBpbnQKK2YxOCAobG9uZyBsb25nIGludCBpLCBsb25nIGxvbmcgaW50IGssIGxvbmcgaW50 IHN0ZXApCit7CisgICNwcmFnbWEgb21wIHBhcmFsbGVsIGZvciBzaW1kIGxpbmVhciAoaTog aykgc2NoZWR1bGUoZHluYW1pYywgNykKKyAgZm9yIChzaG9ydCBqID0gMTY7IGogPCAxMTI7 IGogKz0gc3RlcCkKKyAgICB7CisgICAgICBhW2ldID0gaiAvIDIgKyA4OworICAgICAgaSAr PSA0OworICAgIH0KKyAgcmV0dXJuIGk7Cit9CisKK2ludAorbWFpbiAoKQoreworI2RlZmlu ZSBURVNUKHgpIFwKKyAgaWYgKHggIT0gOCArIDQ4ICogNCkJCQkJXAorICAgIF9fYnVpbHRp bl9hYm9ydCAoKTsJCQkJXAorICBmb3IgKGludCBpID0gMDsgaSA8IDI1NjsgaSsrKQkJCVwK KyAgICBpZiAoYVtpXSAhPSAoKChpICYgMykgPT0gMCAmJiBpID49IDgJXAorCQkgICYmIGkg PCA4ICsgNDggKiA0KQkJXAorCQkgPyAoKGkgLSA4KSAvIDQpICsgMTYgOiAwKSkJXAorICAg ICAgX19idWlsdGluX2Fib3J0ICgpOwkJCVwKKyAgX19idWlsdGluX21lbXNldCAoYSwgMCwg c2l6ZW9mIChhKSkKKyAgVEVTVCAoZjEgKDgpKTsKKyAgVEVTVCAoZjIgKDgsIDMpKTsKKyAg VEVTVCAoZjMgKDhMTCwgNExMKSk7CisgIFRFU1QgKGY0ICg4KSk7CisgIFRFU1QgKGY1ICg4 LCAzKSk7CisgIFRFU1QgKGY2ICg4TEwsIDRMTCkpOworICBURVNUIChmNyAoOCkpOworICBU RVNUIChmOCAoOCwgMykpOworICBURVNUIChmOSAoOExMLCA0TEwpKTsKKyAgVEVTVCAoZjEw ICg4LCAyKSk7CisgIFRFU1QgKGYxMSAoOCwgMywgMikpOworICBURVNUIChmMTIgKDhMTCwg NExMLCAyKSk7CisgIFRFU1QgKGYxMyAoOCwgMikpOworICBURVNUIChmMTQgKDgsIDMsIDIp KTsKKyAgVEVTVCAoZjE1ICg4TEwsIDRMTCwgMikpOworICBURVNUIChmMTYgKDgsIDIpKTsK KyAgVEVTVCAoZjE3ICg4LCAzLCAyKSk7CisgIFRFU1QgKGYxOCAoOExMLCA0TEwsIDIpKTsK KyAgcmV0dXJuIDA7Cit9Cg== --------------kdFV6uiwFmZKZ6KJ4Yt4Posk--