From patchwork Mon Jun 1 10:10:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 478878 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 E73D11412DE for ; Mon, 1 Jun 2015 20:10:40 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=Sn01l2u9; 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 :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; q=dns; s=default; b=XjpLmL+Frqd4/VyH1 JL2VxvPB4EydgYd5UOAnvjxxJPpGcjrU+9g+kKiOEdf19bCvfZC6LqWi063QKVFp 3h0tMmeloMBrU8sRtpBNTBVoshTdKaxXfmN8iBpb1Idb4h3nApJPjS28lIRiQOf/ x8iAnTyinM63vxcd6UxRzBcrNI= 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 :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; s=default; bh=f1/le0tDjohTNDcPZOR8rAu qcLc=; b=Sn01l2u9douHYRi3QGKOUpG2+9J7GPQWmV+7iRlfTtjFowPPR+Qy21H jFsgWuGxGA5SxUALTuT/cRl6g0XGbrDdWE10y5RbDNOAnLh2RM7rn1Vimf2Zsbni MXDrSw3qdh67K8KkFUxUEO+Lx51h73v/wNNAEa1tVBWZt5+rwryE= Received: (qmail 117035 invoked by alias); 1 Jun 2015 10:10:34 -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 117012 invoked by uid 89); 1 Jun 2015 10:10:31 -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, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: fencepost.gnu.org Received: from fencepost.gnu.org (HELO fencepost.gnu.org) (208.118.235.10) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Mon, 01 Jun 2015 10:10:30 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59652) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1YzMfs-0000bp-6F for gcc-patches@gnu.org; Mon, 01 Jun 2015 06:10:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YzMfn-0003mO-3s for gcc-patches@gnu.org; Mon, 01 Jun 2015 06:10:28 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:41222) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzMfm-0003ll-Uh for gcc-patches@gnu.org; Mon, 01 Jun 2015 06:10:23 -0400 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 1YzMfi-0006C7-9g from Tom_deVries@mentor.com ; Mon, 01 Jun 2015 03:10:18 -0700 Received: from [127.0.0.1] (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; Mon, 1 Jun 2015 11:10:16 +0100 Message-ID: <556C2F84.80207@mentor.com> Date: Mon, 1 Jun 2015 12:10:12 +0200 From: Tom de Vries User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Bernd Schmidt , CC: Jakub Jelinek Subject: Re: [gomp4] Avoiding predication for certain blocks References: <55689279.2020809@codesourcery.com> In-Reply-To: <55689279.2020809@codesourcery.com> X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 On 29/05/15 18:23, Bernd Schmidt wrote: > When predicating the code for OpenACC, we should avoid the entry block > in an offloaded region, which contains setup code that should be run in > every thread. The following patch adds a new marker statement that is > used to identify this block. Currently, predication doesn't happen > anyway due to an oversight in the algorithm, but I'll be fixing that in > a followup patch. > > Committed on gomp-4_0-branch. > Hi Bernd, this causes an ICE in kernels-eternal.c. The GIMPLE_OMP_ENTRY_END is removed the first time (!ssa) we call expand_omp_target. The second time we call expand_omp_target (ssa), it's no longer there, and we call 'gimple_code (NULL)' here: ... basic_block entry_succ_bb = single_succ (entry_bb); gsi = gsi_last_bb (entry_succ_bb); if (gimple_code (gsi_stmt (gsi)) == GIMPLE_OMP_ENTRY_END) gsi_remove (&gsi, true); ... This patch fixes that by not attempting to remove GIMPLE_OMP_ENTRY_END when in ssa. Committed to gomp-4_0-branch. Thanks, - Tom Fix GIMPLE_OMP_ENTRY_END handling in expand_omp_target for ssa 2015-06-01 Tom de Vries * omp-low.c (expand_omp_target): Fix GIMPLE_OMP_ENTRY_END handling for ssa. --- gcc/omp-low.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gcc/omp-low.c b/gcc/omp-low.c index a74a2bea..2634051 100644 --- a/gcc/omp-low.c +++ b/gcc/omp-low.c @@ -9486,9 +9486,12 @@ expand_omp_target (struct omp_region *region) } basic_block entry_succ_bb = single_succ (entry_bb); - gsi = gsi_last_bb (entry_succ_bb); - if (gimple_code (gsi_stmt (gsi)) == GIMPLE_OMP_ENTRY_END) - gsi_remove (&gsi, true); + if (!gimple_in_ssa_p (cfun)) + { + gsi = gsi_last_bb (entry_succ_bb); + if (gimple_code (gsi_stmt (gsi)) == GIMPLE_OMP_ENTRY_END) + gsi_remove (&gsi, true); + } if (offloaded && do_splitoff) -- 1.9.1