[gomp4] Address texinfo warnings

Thomas Schwinge thomas@codesourcery.com
Fri Sep 18 08:31:00 GMT 2015


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 <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Fri Sep 18 08:28:08 2015 +0000

    Address texinfo warnings
    
    	gcc/
    	* target.def <goacc> (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(-)

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  <thomas@codesourcery.com>
+
+	* target.def <goacc> (validate_dims, dim_limit, fork_join, lock):
+	Spell out the formal parameters' names.  Fix typos.
+	* doc/tm.texi: Regenerate.
+
 2015-09-16  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* 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


Grüße,
 Thomas
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 472 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/gcc-patches/attachments/20150918/676d44f9/attachment.sig>


More information about the Gcc-patches mailing list