From patchwork Thu Mar 19 11:47:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 1258122 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: 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@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codesourcery.com 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48jlXj0y27z9sQt for ; Thu, 19 Mar 2020 22:48:19 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B13DB387700B; Thu, 19 Mar 2020 11:48:15 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com [68.232.137.180]) by sourceware.org (Postfix) with ESMTPS id 90A38385E824 for ; Thu, 19 Mar 2020 11:48:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 90A38385E824 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=Tobias_Burnus@mentor.com IronPort-SDR: eJ0tLPhKbbS6CHctbA3LoBd/MNMc8sgi/sr8651nWxgBUQDaf2rQOi1z0LR2+gGHUPat3wZHR8 xsF2q0cUy1N97s6b5+7ibhpf8i6A7NW5DrsSV5lWepbbVDADsT8zU683j77DxxZ3jezugch9uV gwgfQkp5fy+POF2JgVJGjPvONl+/KzupDYKmzn13H5IyA+TSLrpgKdMXB64qHarcXu9AC2ESHV gcCwRPqhUBu3YtD0Ac/l/hPCuQdaxhq2wDrw1k7ytGN6m3YtHendUB3L59ZPaoxk2PG532Ak3k FsQ= X-IronPort-AV: E=Sophos;i="5.70,571,1574150400"; d="diff'?scan'208";a="46882485" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa3.mentor.iphmx.com with ESMTP; 19 Mar 2020 03:48:11 -0800 IronPort-SDR: blzqEmziq/VcJvDEpfctjhHHG1+b7hVqbwkYeqSXIRbA1h0EHm0qswMpGJ2+YgGQM57cfQ6sIw fD8arYQESkZMfHgjE3lgTG6NVSYL+ViUbQhvuQ7l2yWpyw+5IAaU43CX4qo0zUWHyLQscTTKFP WM3Z9sFvCMX5NJJ68JO/3ubllJ6X+CjqXsg9zEj2NhFJ+BLcuPFItS5m2DEyGy/6JvoD4xEAjz zWuEjO3qaLD/9NDZWH8cos90d1CFTxy4vqZ0iCQqWGn51ofZDEgu9bA7pSKdNu/nUfJDrDn6VA PAE= To: gcc-patches , Andrew Stubbs From: Tobias Burnus Subject: [Patch,comitted] libgomp/testsuite: ignore blank-line output for function-not-offloaded.c Message-ID: <906d7437-154f-1db7-a59a-11916154b9a5@codesourcery.com> Date: Thu, 19 Mar 2020 12:47:54 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 Content-Language: en-US X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) To SVR-IES-MBX-03.mgc.mentorg.com (139.181.222.3) X-Spam-Status: No, score=-24.7 required=5.0 tests=GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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@gcc.gnu.org Sender: "Gcc-patches" The libgomp.c-c++-common/function-not-offloaded.c is supposed to fail on "target offload_device_nonshared_as"; producing "unresolved symbol foo" and tons of additional (fatal) errors by collect, ld, lto1, mkoffload, lto-wrapper etc. On NVidia, the existing "dg-excess-errors" works, but with AMDGCN this is insufficient as one still gets a FAIL "1 blank line(s) in output" That's solved by adding "dg-allow-blank-lines-in-output 1". (I think the argument – or at least its value – is ignored but "1" is used everywhere.) This error only appears for C++ as the reason seems to be that there are two unresolved symbols: "foo" and "__gxx_personality_v0". Those error messages are separated by an empty line. Hence, this change could be undone as soon as cc1plus and a minimal libstdc++ (libsupc++) is available for AMDGCN; however, for the purpose of the test, the "dg-allow-blank-lines-in-output" can remain even after __gxx_personality_v0 is available.(*) Committed as r10-7275-gbb83e069ebadf0a724298f80a65b1775eff9cfab Cheers, Tobias (*) The lack of __gxx_personality_v0 shows also up in the following tests, i.e. that issue is already covered: libgomp.c++/for-15.C libgomp.c++/for-24.C libgomp.oacc-c++/../libgomp.oacc-c-c++-common/routine-1.c libgomp.oacc-c++/pr71959.C libgomp.oacc-c++/routine-1-auto.C libgomp.oacc-c++/routine-1-template-auto.C libgomp.oacc-c++/routine-1-template-trailing-return-type.C libgomp.oacc-c++/routine-1-template.C libgomp.oacc-c++/routine-1-trailing-return-type.C ----------------- Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander Walter commit bb83e069ebadf0a724298f80a65b1775eff9cfab Author: Tobias Burnus Date: Thu Mar 19 11:42:49 2020 +0100 libgomp/testsuite: ignore blank-line output for function-not-offloaded.c * testsuite/libgomp.c-c++-common/function-not-offloaded.c: Add dg-allow-blank-lines-in-output. diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 9a1065fef4e..4d3a4f32ece 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,8 @@ +2020-03-19 Tobias Burnus + + * testsuite/libgomp.c-c++-common/function-not-offloaded.c: Add + dg-allow-blank-lines-in-output. + 2020-03-18 Julian Brown Tobias Burnus diff --git a/libgomp/testsuite/libgomp.c-c++-common/function-not-offloaded.c b/libgomp/testsuite/libgomp.c-c++-common/function-not-offloaded.c index 9e59ef8864e..f01a64e72c0 100644 --- a/libgomp/testsuite/libgomp.c-c++-common/function-not-offloaded.c +++ b/libgomp/testsuite/libgomp.c-c++-common/function-not-offloaded.c @@ -1,5 +1,6 @@ /* { dg-do link } */ /* { dg-excess-errors "unresolved symbol foo, lto1, mkoffload and lto-wrapper fatal errors" { target offload_device_nonshared_as } } */ +/* { dg-allow-blank-lines-in-output 1 } */ /* { dg-additional-sources "function-not-offloaded-aux.c" } */ #pragma omp declare target