From patchwork Thu Mar 20 14:27:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 332187 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 585E12C00A2 for ; Fri, 21 Mar 2014 01:28:06 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:in-reply-to:references:date:message-id:mime-version :content-type; q=dns; s=default; b=Jq6Rw7fwvW0IDwVo2SktmSLvDiAAX o0EaOKzHw6EFWmAvR5iN3Uv+EUJizWLIaf2G6QUFQv1/fA/Tdbi+SugSYNX+vVgB KE38vdX/iE2Zz5nOrRxlif0cwJjJgqqqI7MdfJEoQV82wxsqSpxaD1PIF0YcCa1d p9WDW9/+I1siYg= 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:from :to:subject:in-reply-to:references:date:message-id:mime-version :content-type; s=default; bh=Uob/G1jy0EEYRu/Pr5P2HHv+gwg=; b=JSw jovSBsjfif5UEUorNxV2WzALTJ4xmxC2LLTGssreW58cBlA6PNy644xdRlaJrlId lHcHgMzWzXtQtHqgs+PirHrCtdWWyhXA/eCo8Dgd2qEge0146qTTXc81sk6SjUzz ddETMsbAxdQIHdRWqQlcfkNy9Ex9bc2lOm8+gLyo= Received: (qmail 16390 invoked by alias); 20 Mar 2014 14:28:00 -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 16376 invoked by uid 89); 20 Mar 2014 14:27:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 20 Mar 2014 14:27:58 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1WQdwp-0003wP-HS from Thomas_Schwinge@mentor.com for gcc-patches@gcc.gnu.org; Thu, 20 Mar 2014 07:27:55 -0700 Received: from SVR-IES-FEM-01.mgc.mentorg.com ([137.202.0.104]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Thu, 20 Mar 2014 07:27:55 -0700 Received: from feldtkeller.schwinge.homeip.net (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.2.247.3; Thu, 20 Mar 2014 14:27:52 +0000 From: Thomas Schwinge To: Subject: Re: [gomp4 2/2] Initial support for the OpenACC kernels construct in the C front end. In-Reply-To: <1393579386-11666-2-git-send-email-thomas@codesourcery.com> References: <1393579386-11666-1-git-send-email-thomas@codesourcery.com> <1393579386-11666-2-git-send-email-thomas@codesourcery.com> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/23.4.1 (i486-pc-linux-gnu) Date: Thu, 20 Mar 2014 15:27:47 +0100 Message-ID: <87a9cllzbw.fsf@kepler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Fri, 28 Feb 2014 10:23:01 +0100, I wrote: > diff --git gcc/testsuite/c-c++-common/goacc/nesting-fail-1.c gcc/testsuite/c-c++-common/goacc/nesting-fail-1.c > index 24a4c11..d88ee8a 100644 > --- gcc/testsuite/c-c++-common/goacc/nesting-fail-1.c > +++ gcc/testsuite/c-c++-common/goacc/nesting-fail-1.c > +/* TODO: While the OpenACC specification does allow for certain kinds of > + nesting, we don't support that yet. */ > +void > +f_acc_kernels (void) > +{ > +#pragma acc parallel > + { > +#pragma acc parallel /* { dg-error "may not be nested" } */ > + ; > +#pragma acc kernels /* { dg-error "may not be nested" } */ > + ; > #pragma acc data /* { dg-error "may not be nested" } */ > ; > } Applied in r208700 to gomp-4_0-branch: commit 82e6bd6f0623d40a7653cf1ca61d14726cbe398f Author: tschwinge Date: Thu Mar 20 14:25:47 2014 +0000 Fix test to actually test for nesting inside of OpenACC kernels construct. gcc/testsuite/ * c-c++-common/goacc/nesting-fail-1.c (f_acc_kernels): Replace OpenACC parallel with kernels directive. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@208700 138bc75d-0d04-0410-961f-82ee72b054a4 Grüße, Thomas diff --git gcc/testsuite/ChangeLog.gomp gcc/testsuite/ChangeLog.gomp index 81876ec..fd38d80 100644 --- gcc/testsuite/ChangeLog.gomp +++ gcc/testsuite/ChangeLog.gomp @@ -1,5 +1,8 @@ 2014-03-20 Thomas Schwinge + * c-c++-common/goacc/nesting-fail-1.c (f_acc_kernels): Replace + OpenACC parallel with kernels directive. + * c-c++-common/goacc/parallel-1.c: Don't recurse. * gfortran.dg/goacc/cache-1.f95: Replace dg-excess-errors usage diff --git gcc/testsuite/c-c++-common/goacc/nesting-fail-1.c gcc/testsuite/c-c++-common/goacc/nesting-fail-1.c index d88ee8a..ca8921f 100644 --- gcc/testsuite/c-c++-common/goacc/nesting-fail-1.c +++ gcc/testsuite/c-c++-common/goacc/nesting-fail-1.c @@ -19,7 +19,7 @@ f_acc_parallel (void) void f_acc_kernels (void) { -#pragma acc parallel +#pragma acc kernels { #pragma acc parallel /* { dg-error "may not be nested" } */ ;