From patchwork Tue Sep 29 09:53:47 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: 523763 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 8B32C14029C for ; Tue, 29 Sep 2015 19:54:31 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=L6YTFYZB; 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:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=EeChqE1+m0u1lWOrt5xyvkAKZ+RoPjXz24B+BD+D42fZeBspdA rLh35OYLAtJsAkgBxmR52JwcTQxmaK/rr5CumVRBPLbxQ2XEZUvI2k4sG1/wLkF1 sb3TJefztfr8nSm+Zuz+AU+bxNTO5cxtyNRkTMAfjsD45aHTNCi44Pya4= 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:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=Qwpo5X83/GWUy+3Xln7IBrQseyM=; b=L6YTFYZB4m9UB0KjF/lv eSNB8hswew1KTwQXQGlP2jlYkhg1gXfDuj1f7+ZI8mCI1eqFPqopUDI2dgQgRSBt obf8q0SsQz6eOJ1JvbibZR3oQj4gDR+IOlCIDEEQ67Iq7OdC0BQ3VXl01mJXTTkg h7Jo7zdZ4rDt1cypsxR9Vhw= Received: (qmail 112580 invoked by alias); 29 Sep 2015 09:54:24 -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 112569 invoked by uid 89); 29 Sep 2015 09:54:23 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 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 (AES128-SHA encrypted) ESMTPS; Tue, 29 Sep 2015 09:54:22 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47639) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1Zgrc4-00030l-LB for gcc-patches@gnu.org; Tue, 29 Sep 2015 05:54:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zgrby-0000ym-TD for gcc-patches@gnu.org; Tue, 29 Sep 2015 05:54:20 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:45615) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zgrby-0000yV-MP for gcc-patches@gnu.org; Tue, 29 Sep 2015 05:54:14 -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 1Zgrbx-0005e9-Qs from Tom_deVries@mentor.com for gcc-patches@gnu.org; Tue, 29 Sep 2015 02:54:14 -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; Tue, 29 Sep 2015 10:54:12 +0100 To: "gcc-patches@gnu.org" From: Tom de Vries Subject: [gomp4, committed] Don't unnecessarily set address taken in expand_omp_for_generic Message-ID: <560A5FAB.2050900@mentor.com> Date: Tue, 29 Sep 2015 11:53:47 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 Hi, this patch sets the address taken bit for start0 and end0 in expand_omp_for_generic only if necessary. This fixes an ICE while compiling the test-case. Committed to gomp-4_0-branch. Thanks, - Tom Don't unnecessarily set address taken in expand_omp_for_generic 2015-09-29 Tom de Vries * omp-low.c (expand_omp_for_generic): Only set address taken for istart0 and end0 unless necessary. * c-c++-common/goacc/kernels-acc-loop-smaller-equal.c: New test. --- gcc/omp-low.c | 10 ++++++--- .../goacc/kernels-acc-loop-smaller-equal.c | 25 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/c-c++-common/goacc/kernels-acc-loop-smaller-equal.c diff --git a/gcc/omp-low.c b/gcc/omp-low.c index 597035f..a53a872 100644 --- a/gcc/omp-low.c +++ b/gcc/omp-low.c @@ -6564,7 +6564,7 @@ expand_omp_for_generic (struct omp_region *region, gassign *assign_stmt; bool in_combined_parallel = is_combined_parallel (region); bool broken_loop = region->cont == NULL; - bool seq_loop = (!start_fn || !next_fn); + bool seq_loop = (start_fn == BUILT_IN_NONE || next_fn == BUILT_IN_NONE); edge e, ne; tree *counts = NULL; int i; @@ -6576,8 +6576,12 @@ expand_omp_for_generic (struct omp_region *region, type = TREE_TYPE (fd->loop.v); istart0 = create_tmp_var (fd->iter_type, ".istart0"); iend0 = create_tmp_var (fd->iter_type, ".iend0"); - TREE_ADDRESSABLE (istart0) = 1; - TREE_ADDRESSABLE (iend0) = 1; + + if (!seq_loop) + { + TREE_ADDRESSABLE (istart0) = 1; + TREE_ADDRESSABLE (iend0) = 1; + } /* See if we need to bias by LLONG_MIN. */ if (fd->iter_type == long_long_unsigned_type_node diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-acc-loop-smaller-equal.c b/gcc/testsuite/c-c++-common/goacc/kernels-acc-loop-smaller-equal.c new file mode 100644 index 0000000..ba7414a --- /dev/null +++ b/gcc/testsuite/c-c++-common/goacc/kernels-acc-loop-smaller-equal.c @@ -0,0 +1,25 @@ +/* { dg-additional-options "-O2" } */ +/* { dg-additional-options "-ftree-parallelize-loops=32" } */ +/* { dg-additional-options "-fdump-tree-parloops_oacc_kernels-all" } */ +/* { dg-additional-options "-fdump-tree-optimized" } */ + +unsigned int +foo (int n) +{ + unsigned int sum = 1; + + #pragma acc kernels loop + for (int i = 1; i <= n; i++) + sum += i; + + return sum; +} + +/* Check that only one loop is analyzed, and that it can be parallelized. */ +/* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 1 "parloops_oacc_kernels" } } */ +/* { dg-final { scan-tree-dump-not "FAILED:" "parloops_oacc_kernels" } } */ + +/* Check that the loop has been split off into a function. */ +/* { dg-final { scan-tree-dump-times "(?n);; Function .*foo.*\\._omp_fn\\.0" 1 "optimized" } } */ + +/* { dg-final { scan-tree-dump-times "(?n)pragma omp target oacc_parallel.*num_gangs\\(32\\)" 1 "parloops_oacc_kernels" } } */ -- 1.9.1