From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 6CB523858D1E for ; Mon, 4 Apr 2022 11:05:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6CB523858D1E Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 2DCEA1F381; Mon, 4 Apr 2022 11:05:13 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 0F77E13216; Mon, 4 Apr 2022 11:05:13 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id czGbAunQSmLIVQAAMHmgww (envelope-from ); Mon, 04 Apr 2022 11:05:13 +0000 Content-Type: multipart/mixed; boundary="------------70G3ejk5g5EIUTGVJiPMxEkK" Message-ID: <82bd7b70-4d55-0e1e-ae1c-4977729c7f6f@suse.de> Date: Mon, 4 Apr 2022 13:05:12 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [PATCH][libgomp, testsuite, nvptx] Limit recursion in declare_target-{1,2}.f90 Content-Language: en-US From: Tom de Vries To: Jakub Jelinek Cc: Thomas Schwinge , gcc-patches@gcc.gnu.org References: <20220401112438.GA19247@delia> <8735ixm1hr.fsf@euler.schwinge.homeip.net> <37fabb8f-8273-f337-3e70-1795d957288e@suse.de> <01c9620c-ac99-2ef4-b879-2cd5c901f4f8@suse.de> In-Reply-To: <01c9620c-ac99-2ef4-b879-2cd5c901f4f8@suse.de> X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, NICE_REPLY_A, SPF_HELO_NONE, 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: 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: Mon, 04 Apr 2022 11:05:16 -0000 This is a multi-part message in MIME format. --------------70G3ejk5g5EIUTGVJiPMxEkK Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 4/1/22 17:57, Tom de Vries wrote: > On 4/1/22 17:38, Jakub Jelinek wrote: >> On Fri, Apr 01, 2022 at 05:34:50PM +0200, Tom de Vries wrote: >>> Do you perhaps have an idea why it's failing? >> >> Because you call on_device_arch_nvptx () outside of >> !$omp target region, so unless the host device is NVPTX, >> it will not be true. >> > > That bit does works because on_device_arch_nvptx calls on_device_arch > which contains the omp target bit: > ... > static int > on_device_arch (int d) > { >   int d_cur; >   #pragma omp target map(from:d_cur) >   d_cur = device_arch (); > >   return d_cur == d; > } > > int > on_device_arch_nvptx () > { >   return on_device_arch (GOMP_DEVICE_NVIDIA_PTX); > } > ... > > So I realized that I didn't do a good job of specifying the problem I > encountered, and went looking at it, at which point I realized the error > message had changed, and knew how to fix it ... So, my apologies, some > confusion on my part. > > Anyway, attached patch avoids any nvptx-related tcl directives (just for > once test-case for now).  To me, this seems the most robust solution. > > It this approach acceptable? I intend to commit this in a few days, unless there are objections. Thanks, - Tom --------------70G3ejk5g5EIUTGVJiPMxEkK Content-Type: text/x-patch; charset=UTF-8; name="0001-libgomp-testsuite-Fix-libgomp.fortran-examples-4-declare_target-1-2-.f90.patch" Content-Disposition: attachment; filename*0="0001-libgomp-testsuite-Fix-libgomp.fortran-examples-4-declar"; filename*1="e_target-1-2-.f90.patch" Content-Transfer-Encoding: base64 W2xpYmdvbXAvdGVzdHN1aXRlXSBGaXggbGliZ29tcC5mb3J0cmFuL2V4YW1wbGVzLTQvZGVj bGFyZV90YXJnZXQtezEsMn0uZjkwCgpUaGUgdGVzdC1jYXNlcyBsaWJnb21wLmZvcnRyYW4v ZXhhbXBsZXMtNC9kZWNsYXJlX3RhcmdldC17MSwyfS5mOTAgbWVhbiB0bwpzZXQgYW4gbnZw dHgtc3BlY2lmaWMgbGltaXQgdXNpbmcgb2ZmbG9hZF90YXJnZXRfbnZwdHgsIGJ1dCBhbHNv IGNoYW5nZQpiZWhhdmlvdXIgZm9yIGFtZC4KClRoYXQgaXMsIHRoZXJlIGlzIG5vdyBhIGRp ZmZlcmVuY2UgaW4gYmVoYXZpb3VyIGJldHdlZW46Ci0gYSBjb21waWxlciBjb25maWd1cmVk IGZvciBHQ04gb2ZmbG9hZGluZywgYW5kCi0gYSBjb21waWxlciBjb25maWd1cmVkIGZvciBi b3RoIEdDTiBhbmQgbnZwdHggb2ZmbG9hZGluZy4KCkZpeCB0aGlzIGJ5IHVzaW5nIGluc3Rl YWQgb25fZGV2aWNlX2FyY2hfbnZwdHguCgpUZXN0ZWQgb24geDg2XzY0IHdpdGggbnZwdHgg YWNjZWxlcmF0b3IuCgpsaWJnb21wL0NoYW5nZUxvZzoKCjIwMjItMDQtMDQgIFRvbSBkZSBW cmllcyAgPHRkZXZyaWVzQHN1c2UuZGU+CgoJKiB0ZXN0c3VpdGUvbGliZ29tcC5mb3J0cmFu L2V4YW1wbGVzLTQvb25fZGV2aWNlX2FyY2guYzogQ29weSBmcm9tCglwYXJlbnQgZGlyLgoJ KiB0ZXN0c3VpdGUvbGliZ29tcC5mb3J0cmFuL2V4YW1wbGVzLTQvZGVjbGFyZV90YXJnZXQt MS5mOTA6IFVzZQoJb25fZGV2aWNlX2FyY2hfbnZwdHggaW5zdGVhZCBvZiBvZmZsb2FkX3Rh cmdldF9udnB0eC4KCSogdGVzdHN1aXRlL2xpYmdvbXAuZm9ydHJhbi9leGFtcGxlcy00L2Rl Y2xhcmVfdGFyZ2V0LTIuZjkwOiBTYW1lLgoKLS0tCiAuLi4vZXhhbXBsZXMtNC9kZWNsYXJl X3RhcmdldC0xLmY5MCAgICAgICAgICAgICAgICB8IDMxICsrKysrKysrKysrKystLS0tLS0t LS0KIC4uLi9leGFtcGxlcy00L2RlY2xhcmVfdGFyZ2V0LTIuZjkwICAgICAgICAgICAgICAg IHwgMzEgKysrKysrKysrKysrKy0tLS0tLS0tLQogLi4uL2xpYmdvbXAuZm9ydHJhbi9leGFt cGxlcy00L29uX2RldmljZV9hcmNoLmMgICAgfCAgMyArKysKIDMgZmlsZXMgY2hhbmdlZCwg NDEgaW5zZXJ0aW9ucygrKSwgMjQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliZ29t cC90ZXN0c3VpdGUvbGliZ29tcC5mb3J0cmFuL2V4YW1wbGVzLTQvZGVjbGFyZV90YXJnZXQt MS5mOTAgYi9saWJnb21wL3Rlc3RzdWl0ZS9saWJnb21wLmZvcnRyYW4vZXhhbXBsZXMtNC9k ZWNsYXJlX3RhcmdldC0xLmY5MAppbmRleCAwM2M1YzUzZWQ2Ny4uYWNkZWQyMGY3NTYgMTAw NjQ0Ci0tLSBhL2xpYmdvbXAvdGVzdHN1aXRlL2xpYmdvbXAuZm9ydHJhbi9leGFtcGxlcy00 L2RlY2xhcmVfdGFyZ2V0LTEuZjkwCisrKyBiL2xpYmdvbXAvdGVzdHN1aXRlL2xpYmdvbXAu Zm9ydHJhbi9leGFtcGxlcy00L2RlY2xhcmVfdGFyZ2V0LTEuZjkwCkBAIC0xLDE2ICsxLDYg QEAKICEgeyBkZy1kbyBydW4gfQotISB7IGRnLWFkZGl0aW9uYWwtb3B0aW9ucyAiLWNwcCIg fQotISBSZWR1Y2VkIGZyb20gMjUgdG8gMjMsIG90aGVyd2lzZSBleGVjdXRpb24gcnVucyBv dXQgb2YgdGhyZWFkIHN0YWNrIG9uCi0hIE52aWRpYSBUaXRhbiBWLgotISBSZWR1Y2VkIGZy b20gMjMgdG8gMjIsIG90aGVyd2lzZSBleGVjdXRpb24gcnVucyBvdXQgb2YgdGhyZWFkIHN0 YWNrIG9uCi0hIE52aWRpYSBUNDAwICgyR0IgdmFyaWFudCksIHdoZW4gcnVuIHdpdGggR09N UF9OVlBUWF9KSVQ9LU8wLgotISBSZWR1Y2VkIGZyb20gMjIgdG8gMjAsIG90aGVyd2lzZSBl eGVjdXRpb24gcnVucyBvdXQgb2YgdGhyZWFkIHN0YWNrIG9uCi0hIE52aWRpYSBSVFggQTIw MDAgKDZHQiB2YXJpYW50KSwgd2hlbiBydW4gd2l0aCBHT01QX05WUFRYX0pJVD0tTzAuCi0h IHsgZGctYWRkaXRpb25hbC1vcHRpb25zICItRFJFQ19ERVBUSD0yMCIgeyB0YXJnZXQgeyBv ZmZsb2FkX3RhcmdldF9udnB0eCB9IH0gfSAqLwotCi0jaWZuZGVmIFJFQ19ERVBUSAotI2Rl ZmluZSBSRUNfREVQVEggMjUKLSNlbmRpZgorISB7IGRnLWFkZGl0aW9uYWwtc291cmNlcyBv bl9kZXZpY2VfYXJjaC5jIH0KKyEgeyBkZy1wcnVuZS1vdXRwdXQgImNvbW1hbmQtbGluZSBv cHRpb24gJy1maW50cmluc2ljLW1vZHVsZXMtcGF0aD0uKicgaXMgdmFsaWQgZm9yIEZvcnRy YW4gYnV0IG5vdCBmb3IgQyIgfQogCiBtb2R1bGUgZV81M18xX21vZAogICBpbnRlZ2VyIDo6 IFRIUkVTSE9MRCA9IDIwCkBAIC0zOCw2ICsyOCwyMyBAQCBlbmQgbW9kdWxlCiAKIHByb2dy YW0gZV81M18xCiAgIHVzZSBlXzUzXzFfbW9kLCBvbmx5IDogZmliLCBmaWJfd3JhcHBlcgor ICBpbnRlZ2VyIDo6IFJFQ19ERVBUSCA9IDI1CisKKyAgaW50ZXJmYWNlCisgICAgaW50ZWdl ciBmdW5jdGlvbiBvbl9kZXZpY2VfYXJjaF9udnB0eCgpIGJpbmQoQykKKyAgICBlbmQgZnVu Y3Rpb24gb25fZGV2aWNlX2FyY2hfbnZwdHgKKyAgZW5kIGludGVyZmFjZQorCisgIGlmIChv bl9kZXZpY2VfYXJjaF9udnB0eCAoKSAvPSAwKSB0aGVuCisgICAgICEgUmVkdWNlZCBmcm9t IDI1IHRvIDIzLCBvdGhlcndpc2UgZXhlY3V0aW9uIHJ1bnMgb3V0IG9mIHRocmVhZCBzdGFj ayBvbgorICAgICAhIE52aWRpYSBUaXRhbiBWLgorICAgICAhIFJlZHVjZWQgZnJvbSAyMyB0 byAyMiwgb3RoZXJ3aXNlIGV4ZWN1dGlvbiBydW5zIG91dCBvZiB0aHJlYWQgc3RhY2sgb24K KyAgICAgISBOdmlkaWEgVDQwMCAoMkdCIHZhcmlhbnQpLCB3aGVuIHJ1biB3aXRoIEdPTVBf TlZQVFhfSklUPS1PMC4KKyAgICAgISBSZWR1Y2VkIGZyb20gMjIgdG8gMjAsIG90aGVyd2lz ZSBleGVjdXRpb24gcnVucyBvdXQgb2YgdGhyZWFkIHN0YWNrIG9uCisgICAgICEgTnZpZGlh IFJUWCBBMjAwMCAoNkdCIHZhcmlhbnQpLCB3aGVuIHJ1biB3aXRoIEdPTVBfTlZQVFhfSklU PS1PMC4KKyAgICAgUkVDX0RFUFRIID0gMjAKKyAgZW5kIGlmCisKICAgaWYgKGZpYiAoMTUp IC89IGZpYl93cmFwcGVyICgxNSkpIHN0b3AgMQogICBpZiAoZmliIChSRUNfREVQVEgpIC89 IGZpYl93cmFwcGVyIChSRUNfREVQVEgpKSBzdG9wIDIKIGVuZCBwcm9ncmFtCmRpZmYgLS1n aXQgYS9saWJnb21wL3Rlc3RzdWl0ZS9saWJnb21wLmZvcnRyYW4vZXhhbXBsZXMtNC9kZWNs YXJlX3RhcmdldC0yLmY5MCBiL2xpYmdvbXAvdGVzdHN1aXRlL2xpYmdvbXAuZm9ydHJhbi9l eGFtcGxlcy00L2RlY2xhcmVfdGFyZ2V0LTIuZjkwCmluZGV4IDBlOGJlYTU3OGE4Li4yN2E1 Y2VjMmU5ZCAxMDA2NDQKLS0tIGEvbGliZ29tcC90ZXN0c3VpdGUvbGliZ29tcC5mb3J0cmFu L2V4YW1wbGVzLTQvZGVjbGFyZV90YXJnZXQtMi5mOTAKKysrIGIvbGliZ29tcC90ZXN0c3Vp dGUvbGliZ29tcC5mb3J0cmFuL2V4YW1wbGVzLTQvZGVjbGFyZV90YXJnZXQtMi5mOTAKQEAg LTEsMjAgKzEsMjcgQEAKICEgeyBkZy1kbyBydW4gfQotISB7IGRnLWFkZGl0aW9uYWwtb3B0 aW9ucyAiLWNwcCIgfQotISBSZWR1Y2VkIGZyb20gMjUgdG8gMjMsIG90aGVyd2lzZSBleGVj dXRpb24gcnVucyBvdXQgb2YgdGhyZWFkIHN0YWNrIG9uCi0hIE52aWRpYSBUaXRhbiBWLgot ISBSZWR1Y2VkIGZyb20gMjMgdG8gMjIsIG90aGVyd2lzZSBleGVjdXRpb24gcnVucyBvdXQg b2YgdGhyZWFkIHN0YWNrIG9uCi0hIE52aWRpYSBUNDAwICgyR0IgdmFyaWFudCksIHdoZW4g cnVuIHdpdGggR09NUF9OVlBUWF9KSVQ9LU8wLgotISBSZWR1Y2VkIGZyb20gMjIgdG8gMTgs IG90aGVyd2lzZSBleGVjdXRpb24gcnVucyBvdXQgb2YgdGhyZWFkIHN0YWNrIG9uCi0hIE52 aWRpYSBSVFggQTIwMDAgKDZHQiB2YXJpYW50KSwgd2hlbiBydW4gd2l0aCBHT01QX05WUFRY X0pJVD0tTzAuCi0hIHsgZGctYWRkaXRpb25hbC1vcHRpb25zICItRFJFQ19ERVBUSD0xOCIg eyB0YXJnZXQgeyBvZmZsb2FkX3RhcmdldF9udnB0eCB9IH0gfSAqLwotCi0jaWZuZGVmIFJF Q19ERVBUSAotI2RlZmluZSBSRUNfREVQVEggMjUKLSNlbmRpZgorISB7IGRnLWFkZGl0aW9u YWwtc291cmNlcyBvbl9kZXZpY2VfYXJjaC5jIH0KKyEgeyBkZy1wcnVuZS1vdXRwdXQgImNv bW1hbmQtbGluZSBvcHRpb24gJy1maW50cmluc2ljLW1vZHVsZXMtcGF0aD0uKicgaXMgdmFs aWQgZm9yIEZvcnRyYW4gYnV0IG5vdCBmb3IgQyIgfQogCiBwcm9ncmFtIGVfNTNfMgogICAh JG9tcCBkZWNsYXJlIHRhcmdldCAoZmliKQogICBpbnRlZ2VyIDo6IHgsIGZpYgorICBpbnRl Z2VyIDo6IFJFQ19ERVBUSCA9IDI1CisKKyAgaW50ZXJmYWNlCisgICAgaW50ZWdlciBmdW5j dGlvbiBvbl9kZXZpY2VfYXJjaF9udnB0eCgpIGJpbmQoQykKKyAgICBlbmQgZnVuY3Rpb24g b25fZGV2aWNlX2FyY2hfbnZwdHgKKyAgZW5kIGludGVyZmFjZQorCisgIGlmIChvbl9kZXZp Y2VfYXJjaF9udnB0eCAoKSAvPSAwKSB0aGVuCisgICAgICEgUmVkdWNlZCBmcm9tIDI1IHRv IDIzLCBvdGhlcndpc2UgZXhlY3V0aW9uIHJ1bnMgb3V0IG9mIHRocmVhZCBzdGFjayBvbgor ICAgICAhIE52aWRpYSBUaXRhbiBWLgorICAgICAhIFJlZHVjZWQgZnJvbSAyMyB0byAyMiwg b3RoZXJ3aXNlIGV4ZWN1dGlvbiBydW5zIG91dCBvZiB0aHJlYWQgc3RhY2sgb24KKyAgICAg ISBOdmlkaWEgVDQwMCAoMkdCIHZhcmlhbnQpLCB3aGVuIHJ1biB3aXRoIEdPTVBfTlZQVFhf SklUPS1PMC4KKyAgICAgISBSZWR1Y2VkIGZyb20gMjIgdG8gMTgsIG90aGVyd2lzZSBleGVj dXRpb24gcnVucyBvdXQgb2YgdGhyZWFkIHN0YWNrIG9uCisgICAgICEgTnZpZGlhIFJUWCBB MjAwMCAoNkdCIHZhcmlhbnQpLCB3aGVuIHJ1biB3aXRoIEdPTVBfTlZQVFhfSklUPS1PMC4K KyAgICAgUkVDX0RFUFRIID0gMTgKKyAgZW5kIGlmCisKICAgISRvbXAgdGFyZ2V0IG1hcChm cm9tOiB4KQogICAgIHggPSBmaWIgKFJFQ19ERVBUSCkKICAgISRvbXAgZW5kIHRhcmdldApk aWZmIC0tZ2l0IGEvbGliZ29tcC90ZXN0c3VpdGUvbGliZ29tcC5mb3J0cmFuL2V4YW1wbGVz LTQvb25fZGV2aWNlX2FyY2guYyBiL2xpYmdvbXAvdGVzdHN1aXRlL2xpYmdvbXAuZm9ydHJh bi9leGFtcGxlcy00L29uX2RldmljZV9hcmNoLmMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAuLmY4YmVmMTllMDIxCi0tLSAvZGV2L251bGwKKysrIGIvbGliZ29t cC90ZXN0c3VpdGUvbGliZ29tcC5mb3J0cmFuL2V4YW1wbGVzLTQvb25fZGV2aWNlX2FyY2gu YwpAQCAtMCwwICsxLDMgQEAKKy8qIEF1eGlsaWFyIGZpbGUuICAqLworLyogeyBkZy1kbyBj b21waWxlICB7IHRhcmdldCBza2lwLWFsbC10YXJnZXRzIH0gfSAqLworI2luY2x1ZGUgIi4u Ly4uL2xpYmdvbXAuYy1jKystY29tbW9uL29uX2RldmljZV9hcmNoLmgiCg== --------------70G3ejk5g5EIUTGVJiPMxEkK--