From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id C8D103839430 for ; Fri, 1 Apr 2022 15:58:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C8D103839430 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-out1.suse.de (Postfix) with ESMTPS id 86CBE21607; Fri, 1 Apr 2022 15:57:59 +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 6380B132C1; Fri, 1 Apr 2022 15:57:59 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id S+iEFgchR2J5KAAAMHmgww (envelope-from ); Fri, 01 Apr 2022 15:57:59 +0000 Content-Type: multipart/mixed; boundary="------------8emzZ4KVByyELFfj0fHyevVy" Message-ID: <01c9620c-ac99-2ef4-b879-2cd5c901f4f8@suse.de> Date: Fri, 1 Apr 2022 17:57:59 +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 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> From: Tom de Vries In-Reply-To: X-Spam-Status: No, score=-12.3 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: Fri, 01 Apr 2022 15:58:03 -0000 This is a multi-part message in MIME format. --------------8emzZ4KVByyELFfj0fHyevVy Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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? Thanks, - Tom --------------8emzZ4KVByyELFfj0fHyevVy Content-Type: text/x-patch; charset=UTF-8; name="0001-libgomp-testsuite-Fix-libgomp.fortran-examples-4-declare_target-1.f90.patch" Content-Disposition: attachment; filename*0="0001-libgomp-testsuite-Fix-libgomp.fortran-examples-4-declar"; filename*1="e_target-1.f90.patch" Content-Transfer-Encoding: base64 W2xpYmdvbXAvdGVzdHN1aXRlXSBGaXggbGliZ29tcC5mb3J0cmFuL2V4YW1wbGVzLTQvZGVj bGFyZV90YXJnZXQtMS5mOTAKCi0tLQogLi4uL2V4YW1wbGVzLTQvZGVjbGFyZV90YXJnZXQt MS5mOTAgICAgICAgICAgICAgICAgfCAzMSArKysrKysrKysrKysrLS0tLS0tLS0tCiAuLi4v bGliZ29tcC5mb3J0cmFuL2V4YW1wbGVzLTQvb25fZGV2aWNlX2FyY2guYyAgICB8ICAzICsr KwogMiBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9saWJnb21wL3Rlc3RzdWl0ZS9saWJnb21wLmZvcnRyYW4vZXhhbXBs ZXMtNC9kZWNsYXJlX3RhcmdldC0xLmY5MCBiL2xpYmdvbXAvdGVzdHN1aXRlL2xpYmdvbXAu Zm9ydHJhbi9leGFtcGxlcy00L2RlY2xhcmVfdGFyZ2V0LTEuZjkwCmluZGV4IDAzYzVjNTNl ZDY3Li5hY2RlZDIwZjc1NiAxMDA2NDQKLS0tIGEvbGliZ29tcC90ZXN0c3VpdGUvbGliZ29t cC5mb3J0cmFuL2V4YW1wbGVzLTQvZGVjbGFyZV90YXJnZXQtMS5mOTAKKysrIGIvbGliZ29t cC90ZXN0c3VpdGUvbGliZ29tcC5mb3J0cmFuL2V4YW1wbGVzLTQvZGVjbGFyZV90YXJnZXQt MS5mOTAKQEAgLTEsMTYgKzEsNiBAQAogISB7IGRnLWRvIHJ1biB9Ci0hIHsgZGctYWRkaXRp b25hbC1vcHRpb25zICItY3BwIiB9Ci0hIFJlZHVjZWQgZnJvbSAyNSB0byAyMywgb3RoZXJ3 aXNlIGV4ZWN1dGlvbiBydW5zIG91dCBvZiB0aHJlYWQgc3RhY2sgb24KLSEgTnZpZGlhIFRp dGFuIFYuCi0hIFJlZHVjZWQgZnJvbSAyMyB0byAyMiwgb3RoZXJ3aXNlIGV4ZWN1dGlvbiBy dW5zIG91dCBvZiB0aHJlYWQgc3RhY2sgb24KLSEgTnZpZGlhIFQ0MDAgKDJHQiB2YXJpYW50 KSwgd2hlbiBydW4gd2l0aCBHT01QX05WUFRYX0pJVD0tTzAuCi0hIFJlZHVjZWQgZnJvbSAy MiB0byAyMCwgb3RoZXJ3aXNlIGV4ZWN1dGlvbiBydW5zIG91dCBvZiB0aHJlYWQgc3RhY2sg b24KLSEgTnZpZGlhIFJUWCBBMjAwMCAoNkdCIHZhcmlhbnQpLCB3aGVuIHJ1biB3aXRoIEdP TVBfTlZQVFhfSklUPS1PMC4KLSEgeyBkZy1hZGRpdGlvbmFsLW9wdGlvbnMgIi1EUkVDX0RF UFRIPTIwIiB7IHRhcmdldCB7IG9mZmxvYWRfdGFyZ2V0X252cHR4IH0gfSB9ICovCi0KLSNp Zm5kZWYgUkVDX0RFUFRICi0jZGVmaW5lIFJFQ19ERVBUSCAyNQotI2VuZGlmCishIHsgZGct YWRkaXRpb25hbC1zb3VyY2VzIG9uX2RldmljZV9hcmNoLmMgfQorISB7IGRnLXBydW5lLW91 dHB1dCAiY29tbWFuZC1saW5lIG9wdGlvbiAnLWZpbnRyaW5zaWMtbW9kdWxlcy1wYXRoPS4q JyBpcyB2YWxpZCBmb3IgRm9ydHJhbiBidXQgbm90IGZvciBDIiB9CiAKIG1vZHVsZSBlXzUz XzFfbW9kCiAgIGludGVnZXIgOjogVEhSRVNIT0xEID0gMjAKQEAgLTM4LDYgKzI4LDIzIEBA IGVuZCBtb2R1bGUKIAogcHJvZ3JhbSBlXzUzXzEKICAgdXNlIGVfNTNfMV9tb2QsIG9ubHkg OiBmaWIsIGZpYl93cmFwcGVyCisgIGludGVnZXIgOjogUkVDX0RFUFRIID0gMjUKKworICBp bnRlcmZhY2UKKyAgICBpbnRlZ2VyIGZ1bmN0aW9uIG9uX2RldmljZV9hcmNoX252cHR4KCkg YmluZChDKQorICAgIGVuZCBmdW5jdGlvbiBvbl9kZXZpY2VfYXJjaF9udnB0eAorICBlbmQg aW50ZXJmYWNlCisKKyAgaWYgKG9uX2RldmljZV9hcmNoX252cHR4ICgpIC89IDApIHRoZW4K KyAgICAgISBSZWR1Y2VkIGZyb20gMjUgdG8gMjMsIG90aGVyd2lzZSBleGVjdXRpb24gcnVu cyBvdXQgb2YgdGhyZWFkIHN0YWNrIG9uCisgICAgICEgTnZpZGlhIFRpdGFuIFYuCisgICAg ICEgUmVkdWNlZCBmcm9tIDIzIHRvIDIyLCBvdGhlcndpc2UgZXhlY3V0aW9uIHJ1bnMgb3V0 IG9mIHRocmVhZCBzdGFjayBvbgorICAgICAhIE52aWRpYSBUNDAwICgyR0IgdmFyaWFudCks IHdoZW4gcnVuIHdpdGggR09NUF9OVlBUWF9KSVQ9LU8wLgorICAgICAhIFJlZHVjZWQgZnJv bSAyMiB0byAyMCwgb3RoZXJ3aXNlIGV4ZWN1dGlvbiBydW5zIG91dCBvZiB0aHJlYWQgc3Rh Y2sgb24KKyAgICAgISBOdmlkaWEgUlRYIEEyMDAwICg2R0IgdmFyaWFudCksIHdoZW4gcnVu IHdpdGggR09NUF9OVlBUWF9KSVQ9LU8wLgorICAgICBSRUNfREVQVEggPSAyMAorICBlbmQg aWYKKwogICBpZiAoZmliICgxNSkgLz0gZmliX3dyYXBwZXIgKDE1KSkgc3RvcCAxCiAgIGlm IChmaWIgKFJFQ19ERVBUSCkgLz0gZmliX3dyYXBwZXIgKFJFQ19ERVBUSCkpIHN0b3AgMgog ZW5kIHByb2dyYW0KZGlmZiAtLWdpdCBhL2xpYmdvbXAvdGVzdHN1aXRlL2xpYmdvbXAuZm9y dHJhbi9leGFtcGxlcy00L29uX2RldmljZV9hcmNoLmMgYi9saWJnb21wL3Rlc3RzdWl0ZS9s aWJnb21wLmZvcnRyYW4vZXhhbXBsZXMtNC9vbl9kZXZpY2VfYXJjaC5jCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwLi5mOGJlZjE5ZTAyMQotLS0gL2Rldi9udWxs CisrKyBiL2xpYmdvbXAvdGVzdHN1aXRlL2xpYmdvbXAuZm9ydHJhbi9leGFtcGxlcy00L29u X2RldmljZV9hcmNoLmMKQEAgLTAsMCArMSwzIEBACisvKiBBdXhpbGlhciBmaWxlLiAgKi8K Ky8qIHsgZGctZG8gY29tcGlsZSAgeyB0YXJnZXQgc2tpcC1hbGwtdGFyZ2V0cyB9IH0gKi8K KyNpbmNsdWRlICIuLi8uLi9saWJnb21wLmMtYysrLWNvbW1vbi9vbl9kZXZpY2VfYXJjaC5o Igo= --------------8emzZ4KVByyELFfj0fHyevVy--