From patchwork Wed Dec 9 17:26:34 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: 554728 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 EDBF61402A8 for ; Thu, 10 Dec 2015 04:27:01 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=jIznV+7b; 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:cc :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=Ju4lPO3c030LrKZdQEnySmULB0H1yO9dZ9M81F/VOvP8MOhFbi OwYWEggO4QRRc99Kni6vwGsEiKD8J3wYesHWOuYimGVQJXngWxzpR6wUQ8zSzJnl gkgybca1ExjsiXjd80ABqL7uxhnEnWU48vsf+iyoBW7EIp7dXCo4CqxKU= 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:cc :from:subject:message-id:date:mime-version:content-type; s= default; bh=Z4sMtuTDgNOefXl1Mj+sTXSoAc0=; b=jIznV+7bAOA3ENaBjT5k 5EdyL6G17ZoA4SdmrjZWuwV/4VFpRqOFrLJhNQBndlMOB9iHglAMwQG6GrQVwJVP 9569e7pP7HNSwmQDYbPuLmmv8yimfPWaUeK3vsHphhET0dEw6b9qKwhHAjz4LAgp auLye/vnWgVCgVWztOhApmg= Received: (qmail 93377 invoked by alias); 9 Dec 2015 17:26:52 -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 93366 invoked by uid 89); 9 Dec 2015 17:26:52 -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; Wed, 09 Dec 2015 17:26:50 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37653) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1a6iVr-0004oR-Vq for gcc-patches@gnu.org; Wed, 09 Dec 2015 12:26:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a6iVm-0005Pg-LP for gcc-patches@gnu.org; Wed, 09 Dec 2015 12:26:47 -0500 Received: from relay1.mentorg.com ([192.94.38.131]:38341) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6iVm-0005PY-Fo for gcc-patches@gnu.org; Wed, 09 Dec 2015 12:26:42 -0500 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 1a6iVk-0002tM-Ji from Tom_deVries@mentor.com ; Wed, 09 Dec 2015 09:26:40 -0800 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; Wed, 9 Dec 2015 17:26:39 +0000 To: "gcc-patches@gnu.org" CC: Jakub Jelinek , Thomas Schwinge From: Tom de Vries Subject: [gomp4, committed] Handle ptr iterator in acc loop Message-ID: <5668644A.9070200@mentor.com> Date: Wed, 9 Dec 2015 18:26:34 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.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 ensures that the &b[0][0][0] initializer of the acc loop in the testcase is properly compiled. Committed to gomp-4_0-branch. Thanks, - Tom Handle ptr iterator in acc loop 2015-12-09 Tom de Vries * omp-low.c (expand_omp_for_generic): Gimplify seq_loop loop start and limit. * c-c++-common/goacc/kernels-loop-acc-loop-ptr-it.c: New test. --- gcc/omp-low.c | 5 +++++ .../c-c++-common/goacc/kernels-loop-acc-loop-ptr-it.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/gcc/omp-low.c b/gcc/omp-low.c index 9ef7161..b8399ae 100644 --- a/gcc/omp-low.c +++ b/gcc/omp-low.c @@ -8522,6 +8522,11 @@ expand_omp_for_generic (struct omp_region *region, tree n1 = fold_convert (fd->iter_type, fd->loop.n1); tree n2 = fold_convert (fd->iter_type, fd->loop.n2); + n1 = force_gimple_operand_gsi_1 (&gsi, n1, is_gimple_reg, NULL_TREE, true, + GSI_SAME_STMT); + n2 = force_gimple_operand_gsi_1 (&gsi, n2, is_gimple_reg, NULL_TREE, true, + GSI_SAME_STMT); + assign_stmt = gimple_build_assign (istart0, n1); gsi_insert_before (&gsi, assign_stmt, GSI_SAME_STMT); diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-loop-acc-loop-ptr-it.c b/gcc/testsuite/c-c++-common/goacc/kernels-loop-acc-loop-ptr-it.c new file mode 100644 index 0000000..d806a01 --- /dev/null +++ b/gcc/testsuite/c-c++-common/goacc/kernels-loop-acc-loop-ptr-it.c @@ -0,0 +1,14 @@ +float b[10][15][10]; + +void +foo (void) +{ + float *i; + +#pragma acc kernels + { +#pragma acc loop + for (i = &b[0][0][0]; i < &b[0][0][10]; i++) + ; + } +}