From patchwork Sat Sep 26 06:16:11 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: 523073 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 8F0EA1401AD for ; Sat, 26 Sep 2015 16:18:47 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=wu3QB+Rc; 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=SSYSxyP4w6BRENzRX0gk+qZnum0e5PLeBJlOl75zgj391QFOlt KBm1L9kevskI5sHLzhBpBdax5tmyP6b++STlPE22nfTz+USB+Os0kFO0tSCeVoSB fBld43e2ktpZ0HWv0HktTojzUTaz1HcPXfX1gBvMukpeBFFANRNYM+Pt4= 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=GKM+DNtBbOWQlxUHpP9H9wRq/uo=; b=wu3QB+Rc+d52WhXBXjz2 HDsv8jlIZJvfL74SjCGkbBGDvPOXvDeHrU9U33X/EZ+lE9Uyu40PN4B5hn+ijbzu JoophecM+JkluCnCjlpyzeIOQl8QIKsevGN7YSU4NJZqt2GVsxGBL7f2Wu4T9GH2 UPz+siGURnRVCr/Js4E0BOk= Received: (qmail 9050 invoked by alias); 26 Sep 2015 06:18:40 -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 9031 invoked by uid 89); 26 Sep 2015 06:18:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS 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; Sat, 26 Sep 2015 06:16:40 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49307) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1Zfimj-0001Gv-O5 for gcc-patches@gnu.org; Sat, 26 Sep 2015 02:16:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zfimg-00067K-6n for gcc-patches@gnu.org; Sat, 26 Sep 2015 02:16:37 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:51301) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zfimg-000676-0d for gcc-patches@gnu.org; Sat, 26 Sep 2015 02:16:34 -0400 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-02.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1Zfime-00026y-40 from Tom_deVries@mentor.com for gcc-patches@gnu.org; Fri, 25 Sep 2015 23:16:32 -0700 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-02.mgc.mentorg.com (137.202.0.106) with Microsoft SMTP Server id 14.3.224.2; Sat, 26 Sep 2015 07:16:30 +0100 To: "gcc-patches@gnu.org" From: Tom de Vries Subject: [gom4, committed] Don't parallelize oacc kernels region with adjacent loops Message-ID: <5606382B.9020505@mentor.com> Date: Sat, 26 Sep 2015 08:16:11 +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 prevents adjacent loops in a kernels region to paralellized. This fixes an ICE in the test-case. Committed to gomp-4_0-branch. Thanks, - Tom Don't parallelize oacc kernels region with adjacent loops 2015-09-26 Tom de Vries * omp-low.c (mark_loops_in_oacc_kernels_region): Don't parallelize the kernels region if it contains more than one outer loop. * gfortran.dg/goacc/kernels-loops-adjacent.f95: New test. --- gcc/omp-low.c | 17 ++++++++++++++++- .../gfortran.dg/goacc/kernels-loops-adjacent.f95 | 19 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/goacc/kernels-loops-adjacent.f95 diff --git a/gcc/omp-low.c b/gcc/omp-low.c index 99b3939..a5904eb 100644 --- a/gcc/omp-low.c +++ b/gcc/omp-low.c @@ -9392,9 +9392,24 @@ mark_loops_in_oacc_kernels_region (basic_block region_entry, bitmap_set_bit (excludes_bitmap, bb->index); } - /* Mark the loops in the region. */ + /* Don't parallelize the kernels region if it contains more than one outer + loop. */ + unsigned int nr_outer_loops = 0; struct loop *loop; FOR_EACH_LOOP (loop, 0) + { + if (loop_outer (loop) != current_loops->tree_root) + continue; + + if (bitmap_bit_p (dominated_bitmap, loop->header->index) + && !bitmap_bit_p (excludes_bitmap, loop->header->index)) + nr_outer_loops++; + } + if (nr_outer_loops != 1) + return; + + /* Mark the loop nest to parallelize in the region. */ + FOR_EACH_LOOP (loop, 0) if (bitmap_bit_p (dominated_bitmap, loop->header->index) && !bitmap_bit_p (excludes_bitmap, loop->header->index)) loop->in_oacc_kernels_region = true; diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loops-adjacent.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loops-adjacent.f95 new file mode 100644 index 0000000..fef3d10 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loops-adjacent.f95 @@ -0,0 +1,19 @@ +! { dg-additional-options "-O2" } +! { dg-additional-options "-ftree-parallelize-loops=10" } + +program main + implicit none + + integer :: a(10000), b(10000) + integer :: d + + !$acc kernels + a = 1 + b = 2 + a = a + b + !$acc end kernels + + d = sum(a) + + print *,d +end program main -- 1.9.1