@@ -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 ...
@@ -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})
@@ -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
@@ -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