From patchwork Wed Sep 23 10:36:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 521643 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 2E15814010F for ; Wed, 23 Sep 2015 20:37:19 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=T3gbwEIC; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; q=dns; s=default; b=phd1asys0H6uBu4j cj9AxE2qdyBl9F+yGk3rtFrcjMh+DDsXmpiBPGwjuhGlr+9o+aJ8pcAriSDEpa0P TYTcK5DDwDKVZnB00xdN3Ilp1oxVj/wGw8OddnrttTEA6MLybJOI0S7RZOJRnEJo ppuM2izhhbKS8afWMr+tWdACuQ0= 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:from :to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=default; bh=RyGQEmp4MMCof26zjKXoS0 9QY7w=; b=T3gbwEIC/Kn4MtuE6W2KwFZ9FAdszw3V9IslYEq9aDevv+85HYaHfe gaxxdfL5+Io5/VqowY+MDlrONbOwlKQAVJs6/exOh9gH39LbH1rkOTUk+pPNzjMu a/SjuoDF1Q59K1/Z+C+CkgrVziVsVhk/0vPgSvaLuCDF2PMbqW0sw= Received: (qmail 13775 invoked by alias); 23 Sep 2015 10:37:12 -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 13766 invoked by uid 89); 23 Sep 2015 10:37:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 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; Wed, 23 Sep 2015 10:37:10 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1ZehQA-0001Ml-NS from Thomas_Schwinge@mentor.com for gcc-patches@gcc.gnu.org; Wed, 23 Sep 2015 03:37:07 -0700 Received: from feldtkeller.schwinge.homeip.net (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.3.224.2; Wed, 23 Sep 2015 11:37:05 +0100 From: Thomas Schwinge To: Cesar Philippidis , CC: Tom de Vries , Nathan Sidwell Subject: Re: [gomp4, wip] remove references to ganglocal shared memory inside gcc In-Reply-To: <55FC16D6.7050802@codesourcery.com> References: <55DE69C3.4060707@codesourcery.com> <55E5D283.8080105@mentor.com> <87y4g415qi.fsf@kepler.schwinge.homeip.net> <55FC16D6.7050802@codesourcery.com> User-Agent: Notmuch/0.9-125-g4686d11 (http://notmuchmail.org) Emacs/24.5.1 (i586-pc-linux-gnu) Date: Wed, 23 Sep 2015 12:36:58 +0200 Message-ID: <87y4fxxvzp.fsf@kepler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Fri, 18 Sep 2015 06:51:18 -0700, Cesar Philippidis wrote: > On 09/18/2015 01:39 AM, Thomas Schwinge wrote: > > > On Tue, 1 Sep 2015 18:29:55 +0200, Tom de Vries wrote: > >> On 27/08/15 03:37, Cesar Philippidis wrote: > >>> - ctx->ganglocal_size_host = align_and_expand (&gl_host, host_size, align); > >> > >> I suspect this caused a bootstrap failure (align_and_expand unused). > >> Worked-around as attached. > > If I remember correctly, this has only ever been used in the "ganglocal" > > implementation -- which is now gone. So, should align_and_expand also be > > elided (Cesar)? > > Most likely. I probably overlooked it when I was working on that > ganglocal removal patch. Can you remove it please? I'm already juggling > a couple of patches right now. Together with removal of printing the declarator for sdata, committed to gomp-4_0-branch in r228038: commit f5890b47c1b6f09134c4bfadcc7ece0d5403a1d7 Author: tschwinge Date: Wed Sep 23 10:35:31 2015 +0000 More "ganglocal" cleanup gcc/ * config/nvptx/nvptx.c (nvptx_file_start): Don't print declaration of sdata. * omp-low.c (align_and_expand): Remove function. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@228038 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog.gomp | 6 ++++++ gcc/config/nvptx/nvptx.c | 1 - gcc/omp-low.c | 15 --------------- 3 files changed, 6 insertions(+), 16 deletions(-) Grüße, Thomas diff --git gcc/ChangeLog.gomp gcc/ChangeLog.gomp index 21c6fa0..c66f80a 100644 --- gcc/ChangeLog.gomp +++ gcc/ChangeLog.gomp @@ -1,3 +1,9 @@ +2015-09-23 Thomas Schwinge + + * config/nvptx/nvptx.c (nvptx_file_start): Don't print declaration + of sdata. + * omp-low.c (align_and_expand): Remove function. + 2015-09-22 Cesar Philippidis * gimplify.c (oacc_default_clause): Inspect pointer types when diff --git gcc/config/nvptx/nvptx.c gcc/config/nvptx/nvptx.c index 5640e34..37b50a3 100644 --- gcc/config/nvptx/nvptx.c +++ gcc/config/nvptx/nvptx.c @@ -4063,7 +4063,6 @@ nvptx_file_start (void) else fputs ("\t.target\tsm_30\n", asm_out_file); fprintf (asm_out_file, "\t.address_size %d\n", GET_MODE_BITSIZE (Pmode)); - fprintf (asm_out_file, "\t.extern .shared .u8 sdata[];\n"); fputs ("// END PREAMBLE\n", asm_out_file); } diff --git gcc/omp-low.c gcc/omp-low.c index ee527d0..ec76096 100644 --- gcc/omp-low.c +++ gcc/omp-low.c @@ -1446,21 +1446,6 @@ omp_copy_decl (tree var, copy_body_data *cb) return error_mark_node; } -/* Modify the old size *POLDSZ to align it up to ALIGN, and then return - a value with SIZE added to it. */ -static tree ATTRIBUTE_UNUSED -align_and_expand (tree *poldsz, tree size, unsigned int align) -{ - tree oldsz = *poldsz; - oldsz = fold_build2 (BIT_AND_EXPR, size_type_node, - fold_build2 (PLUS_EXPR, size_type_node, - oldsz, size_int (align - 1)), - fold_build1 (BIT_NOT_EXPR, size_type_node, - size_int (align - 1))); - *poldsz = oldsz; - return fold_build2 (PLUS_EXPR, size_type_node, oldsz, size); -} - /* Debugging dumps for parallel regions. */ void dump_omp_region (FILE *, struct omp_region *, int); void debug_omp_region (struct omp_region *);