From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 43832 invoked by alias); 6 Sep 2019 12:15:42 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 43823 invoked by uid 89); 6 Sep 2019 12:15:42 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.1 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 autolearn=ham version=3.3.1 spammy=HContent-Transfer-Encoding:8bit X-HELO: esa1.mentor.iphmx.com Received: from esa1.mentor.iphmx.com (HELO esa1.mentor.iphmx.com) (68.232.129.153) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 06 Sep 2019 12:15:40 +0000 IronPort-SDR: 04pkRBB61bDxARFI6+YJjaJ14ySEH97uiK7A9aOfqaoQ/cuVMvSIqR3O5mexjxBM3+J+ihWDsz kKF7hnXqbwvUM4cYpFiBGZo96D4ItIoI4UGi2N/m9Z2mPMD5X4vNL72uKkZHyRdR3evFvTEw6m YqEChcM1PD1Bw3MzIX0wvhG4URqvUAuI6wNDgQu6nstskcKBmgxZVtE2dN+c+RDeWQer08HVqk VddMP7S6dSVg/RH2ISKWFx6Z13rtBOJYwEthDFwRlqgxVQ3SsOH1LFpmR0Dt691Py6/qXJOJGa L/U= Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 06 Sep 2019 04:15:38 -0800 IronPort-SDR: Sbepu5MY5hXA/iV/lgCGkw5h9NtQ7F2/smHSYzHNxKHkoOwDXZRytHETfn1VHvGzUejX7Nn9Oc gO4Pa5xfXzFmcwdq7NNyKU4cvqrPAZBcpmdUlCx3Hmc9yj00rWj0ZK8Ng5L4ifX6RFfedpBcVj zCxGtjl01loN2euppklDl1U5ARVGO26h+DANA2gwfjzh/WrtMgKiuX/+nQQeACgrxXv21HGUkw ffALXhlExUl4ZkoBGf+cL5s45xn9DGsHj0jXVufQji+Zk9AxXTsTFTNqOJrCu7cR1XB7Q+jg1g W9E= From: Julian Brown To: CC: Chung-Lin Tang , Andrew Stubbs Subject: [PATCH 1/2] [og9] Fix tree check failure with reduction localization Date: Fri, 06 Sep 2019 12:15:00 -0000 Message-ID: <20190906121525.120912-1-julian@codesourcery.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: julian@codesourcery.com X-IsSubscribed: yes X-SW-Source: 2019-09/txt/msg00372.txt.bz2 This patch fixes a tree-checking failure with the recently-applied patch on the openacc-gcc-9-branch to localize reductions. Tested with offloading to NVPTX. I will apply shortly. Julian ChangeLog gcc/ * gimplify.c (gimplify_omp_workshare): Use OMP_CLAUSES, OMP_BODY instead of OMP_TARGET_CLAUSES, OMP_TARGET_BODY. --- gcc/ChangeLog.openacc | 5 +++++ gcc/gimplify.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog.openacc b/gcc/ChangeLog.openacc index ddde3b8f84f..9e7893aa11e 100644 --- a/gcc/ChangeLog.openacc +++ b/gcc/ChangeLog.openacc @@ -1,3 +1,8 @@ +2019-09-06 Julian Brown + + * gimplify.c (gimplify_omp_workshare): Use OMP_CLAUSES, OMP_BODY + instead of OMP_TARGET_CLAUSES, OMP_TARGET_BODY. + 2019-09-05 Andrew Stubbs Backport from mainline: diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 685db1763e0..3d869447d70 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -12253,8 +12253,7 @@ gimplify_omp_workshare (tree *expr_p, gimple_seq *pre_p) /* FIXME: Reductions are not supported in kernels regions yet. */ if (/*ort == ORT_ACC_KERNELS ||*/ ort == ORT_ACC_PARALLEL) - localize_reductions (OMP_TARGET_CLAUSES (*expr_p), - OMP_TARGET_BODY (*expr_p)); + localize_reductions (OMP_CLAUSES (expr), OMP_BODY (expr)); gimple *g = gimplify_and_return_first (OMP_BODY (expr), &body); if (gimple_code (g) == GIMPLE_BIND) -- 2.22.0