From patchwork Mon May 7 11:36:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 909709 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-477301-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mentor.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="ontwfdgA"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40fgcP5Xnlz9s27 for ; Mon, 7 May 2018 21:38:41 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :subject:from:to:cc:references:message-id:date:mime-version :in-reply-to:content-type; q=dns; s=default; b=DaW/Rnv0YzQAnWs8s FWPSKc5t1qiVcgGxMCUzhcdTH06H4Cn/9N12wOljsl1UasfGGTloxymWtAU44M2c V0X3NEDQ4gF3EBFXL67iPjGuslbdQnOTGw20ln1eq1MYjEskRI6dLnDa+BdhUVab Y1jjIN8ZhVIpuFvSSJU29YVzsI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :subject:from:to:cc:references:message-id:date:mime-version :in-reply-to:content-type; s=default; bh=3lb7fEUExnYpP2+/3w+zlfQ ez+0=; b=ontwfdgAaIV2AyrGcV3WWgk6Nl/Dz1KdV63wpqWSOmhwxPmIw/SszvW 1KSzsVyify57CptAUJZryrkUgKBD/fWSajlEHk8nfGjh1eWLmT4WU8Y7JTNSmVU+ hoCT0CGn6Z+wB86LJ76Gu7+KAskpjOi+bYr35T4wKF3KHSujy7U8= Received: (qmail 121792 invoked by alias); 7 May 2018 11:38:30 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 121765 invoked by uid 89); 7 May 2018 11:38:29 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy=1879 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 07 May 2018 11:38:28 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-MBX-04.mgc.mentorg.com) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1fFeTJ-00019E-TQ from Tom_deVries@mentor.com ; Mon, 07 May 2018 04:38:25 -0700 Received: from [172.30.73.137] (137.202.0.87) by SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Mon, 7 May 2018 12:36:40 +0100 Subject: [openacc, testsuite] Allow installed testing of libgomp to find gomp-constants.h From: Tom de Vries To: Jakub Jelinek CC: Thomas Schwinge , GCC Patches References: <7241cb5e-dc7d-8feb-91e0-d11d7ac0882e@mentor.com> <20180106113607.GL1833@tucnak> <7eb1631a-b4db-e966-218b-762ec8ce738e@mentor.com> <20180115100547.GV2063@tucnak> <6d5f2bbf-8555-99b8-065c-666640f6a03a@mentor.com> <20180115104423.GW2063@tucnak> <20180115112524.GX2063@tucnak> <2e1df3d2-7238-9c1f-fd6e-46a3cbed84e6@mentor.com> <20180117175118.GW2063@tucnak> <86cadd6e-aac1-2df0-ca5b-d1d1bf726f1b@mentor.com> Message-ID: <0e0fc11d-df1c-c156-e0b1-9712c7cd4956@mentor.com> Date: Mon, 7 May 2018 13:36:39 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) [ was: Re: [PATCH, PR82428] Add __builtin_goacc_{gang,worker,vector}_{id,size} ] On 05/03/2018 12:36 PM, Tom de Vries wrote: > On 01/18/2018 09:55 AM, Tom de Vries wrote: >> diff --git >> a/libgomp/testsuite/libgomp.oacc-c-c++-common/gang-static-2.c >> b/libgomp/testsuite/libgomp.oacc-c-c++-common/gang-static-2.c >> index 6de739a..e273a79 100644 >> --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/gang-static-2.c >> +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/gang-static-2.c >> @@ -1,25 +1,23 @@ >> -/* { dg-do run { target openacc_nvidia_accel_selected } } */ >> -/* This code uses nvptx inline assembly guarded with acc_on_device, >> which is >> -   not optimized away at -O0, and then confuses the target assembler. >> -   { dg-skip-if "" { *-*-* } { "-O0" } { "" } } */ >> - >>   #include >>   #include >> +#include > > Hi, > > it seems I've broken installed testing of libgomp with this patch. The > compiler cannot find gomp-constants.h. > > In the build-area testing setup, the compiler can find gomp-constants.h > because in libgomp.exp we find: > ... >     if { $blddir != "" } { >         ... >         # The top-level include directory, for gomp-constants.h. >         lappend ALWAYS_CFLAGS "additional_flags=-I${srcdir}/../../include" >     } > ... > but this line is not active for installed testing. > > Patch below fixes this. > > Is this approach ok for trunk? > Assuming no objections, committed as attached. Thanks, - Tom [openacc, testsuite] Allow installed testing of libgomp to find gomp-constants.h 2018-05-07 Tom de Vries PR testsuite/85677 * testsuite/lib/libgomp.exp (libgomp_init): Move inclusion of top-level include directory in ALWAYS_CFLAGS out of $blddir != "" condition. --- libgomp/testsuite/lib/libgomp.exp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp index 8ac2446..c41b3e6 100644 --- a/libgomp/testsuite/lib/libgomp.exp +++ b/libgomp/testsuite/lib/libgomp.exp @@ -187,9 +187,9 @@ proc libgomp_init { args } { lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/.libs" lappend ALWAYS_CFLAGS "additional_flags=-I${blddir}" lappend ALWAYS_CFLAGS "ldflags=-L${blddir}/.libs" - # The top-level include directory, for gomp-constants.h. - lappend ALWAYS_CFLAGS "additional_flags=-I${srcdir}/../../include" } + # The top-level include directory, for gomp-constants.h. + lappend ALWAYS_CFLAGS "additional_flags=-I${srcdir}/../../include" lappend ALWAYS_CFLAGS "additional_flags=-I${srcdir}/.." # For build-tree testing, also consider the library paths used for builing.