From patchwork Mon Jun 19 10:24:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 1796489 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Ql5VN5P4Kz20XZ for ; Mon, 19 Jun 2023 20:24:44 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 647A53857806 for ; Mon, 19 Jun 2023 10:24:42 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com [68.232.141.98]) by sourceware.org (Postfix) with ESMTPS id 4A9023858D3C for ; Mon, 19 Jun 2023 10:24:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4A9023858D3C 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="6.00,254,1681200000"; d="scan'208,223";a="10279510" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 19 Jun 2023 02:24:29 -0800 IronPort-SDR: 17gzWpVju+Y3LBmEEnLQWkgcX0hr3u/eBKg9V3zaZB9IV/LqjmdW72kB4N2QQSqeGkk7VfiKRM IaLrPOdH98vCSiWBJRbnJ+h3/bHZ/rDuFaDMd5im+F1eSbW/5GtcrSXw73sl6jZidxcOS4hj8V 0AYt9vWmcO5R5dMJHGryOGMjCJ5ED2TehLfwxEyl/vi6awfQq3/Ygtj4KwVDV5sIeqIkPWSF/Q rN0NEXdzwgJSXivHjJmGfMtUW3tKSQUHc7REmUSW0QwfXy1CKOuJygXpaaUimZYPXnEI/L4TYM CGY= From: Thomas Schwinge To: Tobias Burnus , Subject: Fix DejaGnu directive syntax error in 'libgomp.c/target-51.c' (was: [committed] libgomp.c/target-51.c: Accept more error-msg variants in dg-output (was: Re: [committed] libgomp: Fix OMP_TARGET_OFFLOAD=mandatory)) In-Reply-To: References: <1487d7d4-8611-0d78-6bf2-9bffdd4daa64@codesourcery.com> <91bb9136-f8a4-e516-3f42-ed6d66dc8ce0@codesourcery.com> <87cz1vf8as.fsf@euler.schwinge.homeip.net> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/28.2 (x86_64-pc-linux-gnu) Date: Mon, 19 Jun 2023 12:24:23 +0200 Message-ID: <87a5wveomg.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, 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: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Hi! On 2023-06-19T10:02:58+0200, Tobias Burnus wrote: > On 16.06.23 22:42, Thomas Schwinge wrote: >> I see the new tests PASS, but with offloading enabled (nvptx) also see: >> >> PASS: libgomp.c/target-51.c (test for excess errors) >> PASS: libgomp.c/target-51.c execution test >> [-PASS:-]{+FAIL:+} libgomp.c/target-51.c output pattern test >> >> ... due to: >> >> Output was: >> >> libgomp: OMP_TARGET_OFFLOAD is set to MANDATORY, but device cannot be used for offloading >> >> Should match: >> .*libgomp: OMP_TARGET_OFFLOAD is set to MANDATORY, but device not found.* > > Thanks for the report. I can offer yet another wording for the same program – and also > with nvptx enabled: > > libgomp: OMP_TARGET_OFFLOAD is set to MANDATORY, but device cannot be used for offloading > > And I can also offer (which is already in the testcase with "! offload_device"): > > libgomp: OMP_TARGET_OFFLOAD is set to MANDATORY, but only the host device is available > > I think I will just match "..., but .*" without distinguishing check_effective_target_* ... > > ... which I now did in commit r14-1926-g01fe115ba7eafe (see also attached patch). Pushed commit de2d3b69eefde005759279d6739d9a0dbd2a05cc "Fix DejaGnu directive syntax error in 'libgomp.c/target-51.c'", see attached. Grüße Thomas > * * * > > With offloading, there are simply too many possibilities: > > * Not compiled with offloading support - vs. with (ENABLE_OFFLOADING) > * Support compiled in but either compiler or library support not installed > (requires configuring with --enable-offload-defaulted) > * Offloading libgomp plugins there but no CUDA or hsa runtime libraries > * The latter being installed but no device available > > Plus -foffload=disable or only enabling an (at runtime) unavailable or > unsupported device type or other issues like CUDA and device present but > an issue with the kernel driver (or similar half-broken states) or ... > > [And with remote testing issues related to dg-set-target-env-var and only > few systems supporting offloading, a full test coverage is even harder.] > > Tobias ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955 From de2d3b69eefde005759279d6739d9a0dbd2a05cc Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Mon, 19 Jun 2023 12:20:15 +0200 Subject: [PATCH] Fix DejaGnu directive syntax error in 'libgomp.c/target-51.c' ERROR: libgomp.c/target-51.c: unknown dg option: \} for "}" Fix-up for recent commit 01fe115ba7eafebcf97bbac9e157038a003d0c85 "libgomp.c/target-51.c: Accept more error-msg variants in dg-output". libgomp/ * testsuite/libgomp.c/target-51.c: Fix DejaGnu directive syntax error. --- libgomp/testsuite/libgomp.c/target-51.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libgomp/testsuite/libgomp.c/target-51.c b/libgomp/testsuite/libgomp.c/target-51.c index db0363bfc14..7ff8122861f 100644 --- a/libgomp/testsuite/libgomp.c/target-51.c +++ b/libgomp/testsuite/libgomp.c/target-51.c @@ -9,7 +9,7 @@ /* See comment in target-50.c/target-50.c for why the output differs. */ -/* { dg-output ".*libgomp: OMP_TARGET_OFFLOAD is set to MANDATORY, but .*" } } */ +/* { dg-output ".*libgomp: OMP_TARGET_OFFLOAD is set to MANDATORY, but .*" } */ int main () -- 2.34.1