From patchwork Fri Sep 18 08:29:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 519172 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 6CE56140180 for ; Fri, 18 Sep 2015 18:29:53 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=ll6cL/i/; 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:from :to:cc:subject:date:message-id:mime-version:content-type; q=dns; s=default; b=xts6YWKPpcsH9p1dmKt7jqp9FQPeHEVArg5+IAqMy3yYd/eLa6 zPXNmAljEiVv2vQYPQT1WBUKpdwNHVhIjgHb/ggqp8xe0NAjUh++uiJFg3tJU9iV wLdyZYnYpjrKbO3huWI+QJTocwJh7vxurZ6ecdgsCCl9I0ZrdwlaWXqas= 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:cc:subject:date:message-id:mime-version:content-type; s= default; bh=7/YLrfCWcLXoZ/FIHoawhVaKpko=; b=ll6cL/i/14hYMZ8cgwak 3Lt6kpJ6sUf4J2QHvEAth1Is8lKLupXO58AjxwZkMoen+N1Xkz5N/70o3lwXoegf 7oj/3u9XqAGVCZln123C5tBxuELED14zJvrcZzu4kLtKUkS7/iWAWIKhLD5Rgd8i vfk2ZpdkUPLmplicd0E52hU= Received: (qmail 75937 invoked by alias); 18 Sep 2015 08:29:46 -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 75125 invoked by uid 89); 18 Sep 2015 08:29:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS 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; Fri, 18 Sep 2015 08:29:44 +0000 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 1Zcr36-0005Co-N4 from Thomas_Schwinge@mentor.com for gcc-patches@gcc.gnu.org; Fri, 18 Sep 2015 01:29:40 -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.3.224.2; Fri, 18 Sep 2015 09:29:38 +0100 From: Thomas Schwinge To: CC: Subject: [gomp4] Address texinfo warnings User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Fri, 18 Sep 2015 10:29:24 +0200 Message-ID: <87bnd0gmfv.fsf@schwinge.name> MIME-Version: 1.0 Hi! The generator tool interpreted "[]" as the name of a formal parameter, which resulted in the following texinfo warnings: [...]/source-gcc/gcc/doc//tm.texi:5744: warning: unlikely character [ in @var. [...]/source-gcc/gcc/doc//tm.texi:5744: warning: unlikely character ] in @var. [...]/source-gcc/gcc/doc//tm.texi:5757: warning: unlikely character [ in @var. [...]/source-gcc/gcc/doc//tm.texi:5757: warning: unlikely character ] in @var. [...]/source-gcc/gcc/doc//tm.texi:5764: warning: unlikely character [ in @var. [...]/source-gcc/gcc/doc//tm.texi:5764: warning: unlikely character ] in @var. Fixing this by spelling out the formal parameters' names. Also fixing a few typos. Committed to gomp-4_0-branch in r227898: commit 1ee012489f5c3f0d175156fc3718c023f86137c1 Author: tschwinge Date: Fri Sep 18 08:28:08 2015 +0000 Address texinfo warnings gcc/ * target.def (validate_dims, dim_limit, fork_join, lock): Spell out the formal parameters' names. Fix typos. * doc/tm.texi: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@227898 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog.gomp | 6 ++++++ gcc/doc/tm.texi | 20 ++++++++++---------- gcc/omp-low.c | 2 +- gcc/target.def | 20 ++++++++++---------- 4 files changed, 27 insertions(+), 21 deletions(-) Grüße, Thomas diff --git gcc/ChangeLog.gomp gcc/ChangeLog.gomp index f4a83e2..b551413 100644 --- gcc/ChangeLog.gomp +++ gcc/ChangeLog.gomp @@ -1,3 +1,9 @@ +2015-09-18 Thomas Schwinge + + * target.def (validate_dims, dim_limit, fork_join, lock): + Spell out the formal parameters' names. Fix typos. + * doc/tm.texi: Regenerate. + 2015-09-16 Nathan Sidwell * omp-low.c (oacc_validate_dims): New function, broken out of ... diff --git gcc/doc/tm.texi gcc/doc/tm.texi index a151a10..b618a0e 100644 --- gcc/doc/tm.texi +++ gcc/doc/tm.texi @@ -5740,32 +5740,32 @@ usable. In that case, the smaller the number is, the more desirable it is to use it. @end deftypefn -@deftypefn {Target Hook} bool TARGET_GOACC_VALIDATE_DIMS (tree, int @var{[]}, @var{int}) +@deftypefn {Target Hook} bool TARGET_GOACC_VALIDATE_DIMS (tree @var{decl}, int @var{dims[]}, int @var{fn_level}) This hook should check the launch dimensions provided. It should fill -in anything that needs default to non-unity and verify non-defaults. -Defaults are represented as -1. Diagnostics should be issuedas -ppropriate. Return true if changes have been made. You must override +in anything that needs to default to non-unity and verify non-defaults. +Defaults are represented as -1. Diagnostics should be issued as +appropriate. Return true if changes have been made. You must override this hook to provide dimensions larger than 1. @end deftypefn -@deftypefn {Target Hook} unsigned TARGET_GOACC_DIM_LIMIT (unsigned) +@deftypefn {Target Hook} unsigned TARGET_GOACC_DIM_LIMIT (unsigned @var{axis}) This hook should return the maximum size of a particular dimension, or zero if unbounded. @end deftypefn -@deftypefn {Target Hook} bool TARGET_GOACC_FORK_JOIN (gimple, const @var{int[]}, @var{bool}) +@deftypefn {Target Hook} bool TARGET_GOACC_FORK_JOIN (gimple @var{stmt}, const int @var{dims[]}, bool @var{is_fork}) This hook should convert IFN_GOACC_FORK and IFN_GOACC_JOIN function calls to target-specific gimple. It is executed during the oacc_xform pass. It should return true, if the functions should be deleted. The -default hook returns true, if there is no RTL expanders for them. +default hook returns true, if there are no RTL expanders for them. @end deftypefn -@deftypefn {Target Hook} bool TARGET_GOACC_LOCK (gimple, const @var{int[]}, @var{unsigned}) +@deftypefn {Target Hook} bool TARGET_GOACC_LOCK (gimple @var{stmt}, const int @var{dims[]}, unsigned @var{ifn_code}) This hook should convert IFN_GOACC_LOCK, IFN_GOACC_UNLOCK, -IFN_GOACC_LOCK_INIT function calls to target-specific gimple. It is +IFN_GOACC_LOCK_INIT function calls to target-specific gimple. It is executed during the oacc_xform pass. It should return true, if the functions should be deleted. The default hook returns true, if there -is no RTL expanders for them. +are no RTL expanders for them. @end deftypefn @deftypefn {Target Hook} bool TARGET_GOACC_REDUCTION (gimple @var{call}) diff --git gcc/omp-low.c gcc/omp-low.c index 487e7a7..33c8caf 100644 --- gcc/omp-low.c +++ gcc/omp-low.c @@ -9412,7 +9412,7 @@ oacc_launch_pack (unsigned code, tree device, unsigned op) represented as a list of INTEGER_CST. Those that are runtime expres are represented as an INTEGER_CST of zero. Defaults are set as NULL_TREE and will be filled in later by the target hook - TARGET_OACC_VALIDATE_DIMS. + TARGET_GOACC_VALIDATE_DIMS. TOOO. Normally the attribute will just contain a single such list. If however it contains a list of lists, this will represent the use of diff --git gcc/target.def gcc/target.def index 80b401f..0b09514 100644 --- gcc/target.def +++ gcc/target.def @@ -1647,18 +1647,18 @@ HOOK_VECTOR (TARGET_GOACC, goacc) DEFHOOK (validate_dims, "This hook should check the launch dimensions provided. It should fill\n\ -in anything that needs default to non-unity and verify non-defaults.\n\ -Defaults are represented as -1. Diagnostics should be issuedas \n\ -ppropriate. Return true if changes have been made. You must override\n\ +in anything that needs to default to non-unity and verify non-defaults.\n\ +Defaults are represented as -1. Diagnostics should be issued as\n\ +appropriate. Return true if changes have been made. You must override\n\ this hook to provide dimensions larger than 1.", -bool, (tree, int [], int), +bool, (tree decl, int dims[], int fn_level), default_goacc_validate_dims) DEFHOOK (dim_limit, "This hook should return the maximum size of a particular dimension,\n\ or zero if unbounded.", -unsigned, (unsigned), +unsigned, (unsigned axis), default_goacc_dim_limit) DEFHOOK @@ -1666,18 +1666,18 @@ DEFHOOK "This hook should convert IFN_GOACC_FORK and IFN_GOACC_JOIN function\n\ calls to target-specific gimple. It is executed during the oacc_xform\n\ pass. It should return true, if the functions should be deleted. The\n\ -default hook returns true, if there is no RTL expanders for them.", -bool, (gimple, const int[], bool), +default hook returns true, if there are no RTL expanders for them.", +bool, (gimple stmt, const int dims[], bool is_fork), default_goacc_fork_join) DEFHOOK (lock, "This hook should convert IFN_GOACC_LOCK, IFN_GOACC_UNLOCK,\n\ -IFN_GOACC_LOCK_INIT function calls to target-specific gimple. It is\n\ +IFN_GOACC_LOCK_INIT function calls to target-specific gimple. It is\n\ executed during the oacc_xform pass. It should return true, if the\n\ functions should be deleted. The default hook returns true, if there\n\ -is no RTL expanders for them.", -bool, (gimple, const int[], unsigned), +are no RTL expanders for them.", +bool, (gimple stmt, const int dims[], unsigned ifn_code), default_goacc_lock) DEFHOOK