From patchwork Tue Jan 10 13:26:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 713254 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 3tyXqq2c3Fz9sR9 for ; Wed, 11 Jan 2017 00:27:02 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="g7C3l5A8"; 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:subject:in-reply-to:references:date:message-id:mime-version :content-type; q=dns; s=default; b=HEcFsjscPc3fUiuTYkOOaLbIrrdAW OQj8czDJ6aBFaQ5M7oJFXdopN4RlEqmTWSZvOObSr8qubpEkA/RN9RF5aY8Qo7a2 8DUG2oU5b+buKLa0h+720kVTU9P2jaR2J7DWd+6+tzye+Xv8Eqxsyx4A0JpbKWFO rYH28pphKhK8MU= 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:subject:in-reply-to:references:date:message-id:mime-version :content-type; s=default; bh=3/ODrLIWVyoJMIh1DxO8EfMW+nM=; b=g7C 3l5A8APSzP5xz+U0x5S3QoOZAQoeVUlZgFPQLsJvydyqWs1HJcwIkeg4RU7hjeD0 Lge/9MtH/7tgFoHBZ8a79c6hJyCgGLK7iqkXG9q+eUB3JyjMT1+bfF+QtWZr0aex KulifGw9D5U2nNWlhjd4DqkORP+MOdborm/gw9Z8= Received: (qmail 68981 invoked by alias); 10 Jan 2017 13:26:53 -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 68962 invoked by uid 89); 10 Jan 2017 13:26:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy=OMP_CLAUSE_SIZE, omp_clause_size, sk:GOMP_MA, sk:govd_fi 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; Tue, 10 Jan 2017 13:26:42 +0000 Received: from svr-orw-fem-06.mgc.mentorg.com ([147.34.97.120]) by relay1.mentorg.com with esmtp id 1cQwRk-0005AL-8n from Thomas_Schwinge@mentor.com for gcc-patches@gcc.gnu.org; Tue, 10 Jan 2017 05:26:40 -0800 Received: from tftp-cs (147.34.91.1) by SVR-ORW-FEM-06.mgc.mentorg.com (147.34.97.120) with Microsoft SMTP Server id 14.3.224.2; Tue, 10 Jan 2017 05:26:39 -0800 Received: by tftp-cs (Postfix, from userid 49978) id 61456C218F; Tue, 10 Jan 2017 05:26:39 -0800 (PST) From: Thomas Schwinge To: Cesar Philippidis , "gcc-patches@gcc.gnu.org" Subject: Re: [gomp4] remove GOVD_USE_DEVPTR In-Reply-To: <4c801ef9-8410-9175-c4c8-2becb2023cce@codesourcery.com> References: <4c801ef9-8410-9175-c4c8-2becb2023cce@codesourcery.com> User-Agent: Notmuch/0.9-125-g4686d11 (http://notmuchmail.org) Emacs/24.5.1 (x86_64-pc-linux-gnu) Date: Tue, 10 Jan 2017 14:26:30 +0100 Message-ID: <874m17f3ll.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Mon, 7 Nov 2016 12:45:43 -0800, Cesar Philippidis wrote: > It looks like gomp-4_0-branch was using the GOVD_USE_DEVPTR attribute [...] > I've applied this patch remove GOVD_USE_DEVPTR from gomp4. > 2016-11-07 Cesar Philippidis > > gcc/fortran/ > * openmp.c (gfc_match_omp_map_clause): New common_block argument. > [...] That's a different patch, gomp-4_0-branch r240165. Here is the correct one, gomp-4_0-branch r241933: commit 5f6e13b2084c0d037504b4c6c82008246c5f6f6d Author: cesar Date: Mon Nov 7 20:30:34 2016 +0000 gcc/ * gimplify.c (enum gimplify_omp_var_data): Remove stale GOVD_USE_DEVPTR. (gimplify_scan_omp_clauses): Likewise. (gimplify_adjust_omp_clauses_1): Likewise. gcc/testsuite/ * c-c++-common/goacc/deviceptr-4.c: Adjust testcase. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@241933 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog.gomp | 7 +++++++ gcc/gimplify.c | 7 ------- gcc/testsuite/ChangeLog.gomp | 4 ++++ gcc/testsuite/c-c++-common/goacc/deviceptr-4.c | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git gcc/ChangeLog.gomp gcc/ChangeLog.gomp index ab229b6..d36b8f8 100644 --- gcc/ChangeLog.gomp +++ gcc/ChangeLog.gomp @@ -1,3 +1,10 @@ +2016-11-07 Cesar Philippidis + + * gimplify.c (enum gimplify_omp_var_data): Remove stale + GOVD_USE_DEVPTR. + (gimplify_scan_omp_clauses): Likewise. + (gimplify_adjust_omp_clauses_1): Likewise. + 2016-10-28 Cesar Philippidis * config/nvptx/nvptx.c (nvptx_single): Use a single predicate diff --git gcc/gimplify.c gcc/gimplify.c index 0168df5..2c25a2e 100644 --- gcc/gimplify.c +++ gcc/gimplify.c @@ -93,9 +93,6 @@ enum gimplify_omp_var_data /* Flag for GOVD_MAP, if it is a forced mapping. */ GOVD_MAP_FORCE = 262144, - /* OpenACC deviceptr clause. */ - GOVD_USE_DEVPTR = 524288, - GOVD_DATA_SHARE_CLASS = (GOVD_SHARED | GOVD_PRIVATE | GOVD_FIRSTPRIVATE | GOVD_LASTPRIVATE | GOVD_REDUCTION | GOVD_LINEAR | GOVD_LOCAL) @@ -7307,8 +7304,6 @@ gimplify_scan_omp_clauses (tree *list_p, gimple_seq *pre_p, if (OMP_CLAUSE_MAP_KIND (c) == GOMP_MAP_ALWAYS_TO || OMP_CLAUSE_MAP_KIND (c) == GOMP_MAP_ALWAYS_TOFROM) flags |= GOVD_MAP_ALWAYS_TO; - else if (OMP_CLAUSE_MAP_KIND (c) == GOMP_MAP_FORCE_DEVICEPTR) - flags |= GOVD_USE_DEVPTR; goto do_add; case OMP_CLAUSE_DEPEND: @@ -8057,8 +8052,6 @@ gimplify_adjust_omp_clauses_1 (splay_tree_node n, void *data) struct gimplify_omp_ctx *ctx = gimplify_omp_ctxp->outer_context; splay_tree_node on = splay_tree_lookup (ctx->variables, (splay_tree_key) decl); - if (on && (on->value & GOVD_USE_DEVPTR)) - OMP_CLAUSE_SET_MAP_KIND (clause, GOMP_MAP_FORCE_PRESENT); } OMP_CLAUSE_SIZE (clause) = DECL_SIZE_UNIT (decl); } diff --git gcc/testsuite/ChangeLog.gomp gcc/testsuite/ChangeLog.gomp index 5974bca..6050abe 100644 --- gcc/testsuite/ChangeLog.gomp +++ gcc/testsuite/ChangeLog.gomp @@ -1,3 +1,7 @@ +2016-11-07 Cesar Philippidis + + * c-c++-common/goacc/deviceptr-4.c: Adjust testcase. + 2016-10-05 Cesar Philippidis * gfortran.dg/goacc/tile-lowering.f95: Add more coverage. diff --git gcc/testsuite/c-c++-common/goacc/deviceptr-4.c gcc/testsuite/c-c++-common/goacc/deviceptr-4.c index 7962843..db1b916 100644 --- gcc/testsuite/c-c++-common/goacc/deviceptr-4.c +++ gcc/testsuite/c-c++-common/goacc/deviceptr-4.c @@ -8,4 +8,4 @@ subr (int *a) a[0] += 1.0; } -/* { dg-final { scan-tree-dump-times "#pragma omp target oacc_parallel.*map\\(force_present:a" 1 "gimple" } } */ +/* { dg-final { scan-tree-dump-times "#pragma omp target oacc_parallel.*map\\(tofrom:a" 1 "gimple" } } */