From patchwork Thu Jun 4 17:52:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 1303675 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=8.43.85.97; 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 [8.43.85.97]) (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 49dCzB4ngfz9sSf for ; Fri, 5 Jun 2020 03:52:21 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6B265388F061; Thu, 4 Jun 2020 17:52:19 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com [68.232.137.252]) by sourceware.org (Postfix) with ESMTPS id 35D033840C05 for ; Thu, 4 Jun 2020 17:52:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 35D033840C05 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=Thomas_Schwinge@mentor.com IronPort-SDR: 8cePF8CC8z8xfi25Hkp13OBHbmb9K2XflV64kqV2l2WazFx/mrv/90LLm4kZy8HAnad2bY3leZ WPdSuraZ0c0GzGWkpa3sXQ12viXcLFoCfZntEZj6kfFX/CH1fVO/hvr3etIStHc4WftZivfUaE 3u5UnlXz+MDSQQKN0rldF+X42ANUDoFV+WifhM9CjyCdht+XNimy0OsNBOmtPmKoprYp+tDoEi h8vdwxnBbIm/4zjn/wojv0m/LFiXOw5ieKeNxOncxn7HY5g0sE+p1denhPpERxQIrjdUa9iJ85 1WM= X-IronPort-AV: E=Sophos;i="5.73,472,1583222400"; d="scan'208,223";a="49589715" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 04 Jun 2020 09:52:15 -0800 IronPort-SDR: xHIrrqaM1uX9nfp4LOnPjI1HAg6fkzo75OzvbXTIk9U5nYMKjtoDZKzuWuJBoR1TzsSZ/co9kj h8+3nxc8fUC41CSf3AQI1+QARhae2Dgh57pGlGzllU4hyP05XY+//ZiY5k2WJ4OXrLmokzn1hL tRsyNG9rFSHG+fvK13HlyCTHBjUCPmnwtrU0MO3eZQiY+sBFWBAUXuXKyD9DImQJDH9Gwe1T4j PVk0QI9dncrQ14hH+7LkAtW0G6Ezx06jFUa0UJOW4QUzhiIEUm2u1cpdAFOjEsN0bU8f66gHDE 89E= From: Thomas Schwinge To: Subject: 'libgomp.oacc-fortran/{error_, }stop-{1, 2, 3}.f': initialize before the checkpoint In-Reply-To: <87in8nsgz9.fsf@euler.schwinge.homeip.net> References: <751060e1-67cb-d290-4fd1-46b15b77fc1a@tkoenig.net> <87in8nsgz9.fsf@euler.schwinge.homeip.net> User-Agent: Notmuch/0.29.1+93~g67ed7df (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Thu, 4 Jun 2020 19:52:04 +0200 Message-ID: <87y2p2soqj.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, KAM_LOTSOFHASH, SPF_HELO_NONE, SPF_PASS, TXREP 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" Hi! On 2018-04-19T11:06:18+0200, I wrote: > [...] I have applied the following in trunk > r259491 [...] > libgomp/ > PR libgomp/85463 > * testsuite/libgomp.oacc-fortran/error_stop-1.f: New file. > * testsuite/libgomp.oacc-fortran/error_stop-2.f: Likewise. > * testsuite/libgomp.oacc-fortran/error_stop-3.f: Likewise. > * testsuite/libgomp.oacc-fortran/stop-1.f: Likewise. > * testsuite/libgomp.oacc-fortran/stop-2.f: Likewise. > * testsuite/libgomp.oacc-fortran/stop-3.f: Likewise. To get rid of some noise in certain variants of libgomp testing that I'm running, I pushed "'libgomp.oacc-fortran/{error_,}stop-{1,2,3}.f': initialize before the checkpoint" to master branch in commit 1e378edd8f038c52914bc6cac8f6dd5a5c4f8a98, releases/gcc-10 branch in commit 96bfb6e1d2dadef180c02d0e006ae72315305e76, releases/gcc-9 branch in commit 62758cf490afdf73f0deeba39aa05583de99b3a4, and releases/gcc-8 branch in commit f4a45e0d85e51bd6550a82f31f70484c03332a4e, see attached. Grüße Thomas ----------------- Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander Walter From f4a45e0d85e51bd6550a82f31f70484c03332a4e Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 6 May 2020 10:05:49 +0200 Subject: [PATCH] 'libgomp.oacc-fortran/{error_,}stop-{1,2,3}.f': initialize before the checkpoint If, for example, GCC is configured such that 'libgomp-plugin-nvptx.so.1' dynamically links against 'libcuda.so.1', but testing is run on a system where there is no 'libcuda.so.1', this produces output such as: PASS: libgomp.oacc-fortran/error_stop-1.f -DACC_DEVICE_TYPE_host=1 -DACC_MEM_SHARED=1 -foffload=disable -O0 (test for excess errors) PASS: libgomp.oacc-fortran/error_stop-1.f -DACC_DEVICE_TYPE_host=1 -DACC_MEM_SHARED=1 -foffload=disable -O0 execution test FAIL: libgomp.oacc-fortran/error_stop-1.f -DACC_DEVICE_TYPE_host=1 -DACC_MEM_SHARED=1 -foffload=disable -O0 output pattern test, is CheCKpOInT libgomp: while loading libgomp-plugin-nvptx.so.1: libcuda.so.1: cannot open shared object file: No such file or directory ERROR STOP Error termination. Backtrace: [...] , should match CheCKpOInT( | |^M)+ERROR STOP ( | |^M)+Error termination.* ..., where after 'CheCKpOInT' we got 'libgomp: while loading [...]' injected before the expected 'ERROR STOP'. libgomp/ * testsuite/libgomp.oacc-fortran/error_stop-1.f: Initialize before the checkpoint. * testsuite/libgomp.oacc-fortran/error_stop-2.f: Likewise. * testsuite/libgomp.oacc-fortran/error_stop-3.f: Likewise. * testsuite/libgomp.oacc-fortran/stop-1.f: Likewise. * testsuite/libgomp.oacc-fortran/stop-2.f: Likewise. * testsuite/libgomp.oacc-fortran/stop-3.f: Likewise. (cherry picked from commit 1e378edd8f038c52914bc6cac8f6dd5a5c4f8a98) --- libgomp/testsuite/libgomp.oacc-fortran/error_stop-1.f | 4 ++++ libgomp/testsuite/libgomp.oacc-fortran/error_stop-2.f | 4 ++++ libgomp/testsuite/libgomp.oacc-fortran/error_stop-3.f | 4 ++++ libgomp/testsuite/libgomp.oacc-fortran/stop-1.f | 4 ++++ libgomp/testsuite/libgomp.oacc-fortran/stop-2.f | 4 ++++ libgomp/testsuite/libgomp.oacc-fortran/stop-3.f | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/libgomp/testsuite/libgomp.oacc-fortran/error_stop-1.f b/libgomp/testsuite/libgomp.oacc-fortran/error_stop-1.f index 4965e674c27b..a995d955fc23 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/error_stop-1.f +++ b/libgomp/testsuite/libgomp.oacc-fortran/error_stop-1.f @@ -3,6 +3,10 @@ PROGRAM MAIN IMPLICIT NONE +! Initialize before the checkpoint, in case this produces any output. +!$ACC PARALLEL +!$ACC END PARALLEL + PRINT *, "CheCKpOInT" !$ACC PARALLEL ERROR STOP diff --git a/libgomp/testsuite/libgomp.oacc-fortran/error_stop-2.f b/libgomp/testsuite/libgomp.oacc-fortran/error_stop-2.f index 7103fdb5d8ed..426c15abcdf2 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/error_stop-2.f +++ b/libgomp/testsuite/libgomp.oacc-fortran/error_stop-2.f @@ -3,6 +3,10 @@ PROGRAM MAIN IMPLICIT NONE +! Initialize before the checkpoint, in case this produces any output. +!$ACC PARALLEL +!$ACC END PARALLEL + PRINT *, "CheCKpOInT" !$ACC PARALLEL ERROR STOP 35 diff --git a/libgomp/testsuite/libgomp.oacc-fortran/error_stop-3.f b/libgomp/testsuite/libgomp.oacc-fortran/error_stop-3.f index 9c217f14ea1b..bef01e6d505b 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/error_stop-3.f +++ b/libgomp/testsuite/libgomp.oacc-fortran/error_stop-3.f @@ -3,6 +3,10 @@ PROGRAM MAIN IMPLICIT NONE +! Initialize before the checkpoint, in case this produces any output. +!$ACC PARALLEL +!$ACC END PARALLEL + PRINT *, "CheCKpOInT" !$ACC PARALLEL ERROR STOP "SiGN" diff --git a/libgomp/testsuite/libgomp.oacc-fortran/stop-1.f b/libgomp/testsuite/libgomp.oacc-fortran/stop-1.f index af267fc08d1d..2c00d2e5bf8c 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/stop-1.f +++ b/libgomp/testsuite/libgomp.oacc-fortran/stop-1.f @@ -3,6 +3,10 @@ PROGRAM MAIN IMPLICIT NONE +! Initialize before the checkpoint, in case this produces any output. +!$ACC PARALLEL +!$ACC END PARALLEL + PRINT *, "CheCKpOInT" !$ACC PARALLEL STOP diff --git a/libgomp/testsuite/libgomp.oacc-fortran/stop-2.f b/libgomp/testsuite/libgomp.oacc-fortran/stop-2.f index 13c06845c08f..adade54557c2 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/stop-2.f +++ b/libgomp/testsuite/libgomp.oacc-fortran/stop-2.f @@ -3,6 +3,10 @@ PROGRAM MAIN IMPLICIT NONE +! Initialize before the checkpoint, in case this produces any output. +!$ACC PARALLEL +!$ACC END PARALLEL + PRINT *, "CheCKpOInT" !$ACC PARALLEL STOP 35 diff --git a/libgomp/testsuite/libgomp.oacc-fortran/stop-3.f b/libgomp/testsuite/libgomp.oacc-fortran/stop-3.f index 3bd7446571de..157e369d4e7e 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/stop-3.f +++ b/libgomp/testsuite/libgomp.oacc-fortran/stop-3.f @@ -3,6 +3,10 @@ PROGRAM MAIN IMPLICIT NONE +! Initialize before the checkpoint, in case this produces any output. +!$ACC PARALLEL +!$ACC END PARALLEL + PRINT *, "CheCKpOInT" !$ACC PARALLEL STOP "SiGN" -- 2.26.2