OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[nvptx] Add early-out cases in nvptx_goacc_validate_dims

Browse Source 
Add early-out cases for for oacc_min_dims_p and routine_p in
nvptx_goacc_validate_dims, allowing simplification of the rest of the
function.

2019-01-03  Tom de Vries  <tdevries@suse.de>

	* config/nvptx/nvptx.c (nvptx_goacc_validate_dims_1): Add early-out
	cases for oacc_min_dims_p and routine_p.  Add asserts for
	oacc_default_dims_p and offload_region_p.

From-SVN: r267556
This commit is contained in:
Tom de Vries 2019-01-03 15:08:15 +00:00 committed by Tom de Vries
parent 5f57c8f347
commit 4b1716079d
2 changed files with 56 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2019-01-03 Tom de Vries <tdevries@suse.de>
* config/nvptx/nvptx.c (nvptx_goacc_validate_dims_1): Add early-out
cases for oacc_min_dims_p and routine_p. Add asserts for
oacc_default_dims_p and offload_region_p.
2019-01-03 Tom de Vries <tdevries@suse.de>
* config/nvptx/nvptx.c (nvptx_goacc_validate_dims_1): New function,

62
gcc/config/nvptx/nvptx.c
View File

@ -5254,19 +5254,57 @@ nvptx_goacc_validate_dims_1 (tree decl, int dims[], int fn_level)
dims[GOMP_DIM_GANG] = fn_level > GOMP_DIM_GANG ? 1 : 0;
}
/* The vector size must be 32, unless this is a SEQ routine. */
if ((offload_region_p || oacc_default_dims_p
|| (routine_p && !routine_seq_p))
&& dims[GOMP_DIM_VECTOR] >= 0
if (oacc_min_dims_p)
{
gcc_assert (dims[GOMP_DIM_VECTOR] == 1);
gcc_assert (dims[GOMP_DIM_WORKER] == 1);
gcc_assert (dims[GOMP_DIM_GANG] == 1);
dims[GOMP_DIM_VECTOR] = PTX_WARP_SIZE;
return;
}
if (routine_p)
{
if (!routine_seq_p)
dims[GOMP_DIM_VECTOR] = PTX_WARP_SIZE;
return;
}
if (oacc_default_dims_p)
{
/* -1 : not set
0 : set at runtime, f.i. -fopenacc-dims=-
>= 1: set at compile time, f.i. -fopenacc-dims=1. */
gcc_assert (dims[GOMP_DIM_VECTOR] >= -1);
gcc_assert (dims[GOMP_DIM_WORKER] >= -1);
gcc_assert (dims[GOMP_DIM_GANG] >= -1);
/* But -fopenacc-dims=- is not yet supported on trunk. */
gcc_assert (dims[GOMP_DIM_VECTOR] != 0);
gcc_assert (dims[GOMP_DIM_WORKER] != 0);
gcc_assert (dims[GOMP_DIM_GANG] != 0);
}
if (offload_region_p)
{
/* -1 : not set
0 : set using variable, f.i. num_gangs (n)
>= 1: set using constant, f.i. num_gangs (1). */
gcc_assert (dims[GOMP_DIM_VECTOR] >= -1);
gcc_assert (dims[GOMP_DIM_WORKER] >= -1);
gcc_assert (dims[GOMP_DIM_GANG] >= -1);
}
if (dims[GOMP_DIM_VECTOR] >= 0
&& dims[GOMP_DIM_VECTOR] != PTX_VECTOR_LENGTH)
{
if ((offload_region_p || oacc_default_dims_p)
&& dims[GOMP_DIM_VECTOR] >= 0)
warning_at (decl ? DECL_SOURCE_LOCATION (decl) : UNKNOWN_LOCATION, 0,
dims[GOMP_DIM_VECTOR]
? G_("using vector_length (%d), ignoring %d")
: G_("using vector_length (%d), ignoring runtime setting"),
PTX_VECTOR_LENGTH, dims[GOMP_DIM_VECTOR]);
warning_at (decl ? DECL_SOURCE_LOCATION (decl) : UNKNOWN_LOCATION, 0,
dims[GOMP_DIM_VECTOR]
? G_("using vector_length (%d), ignoring %d")
: G_("using vector_length (%d), ignoring runtime setting"),
PTX_VECTOR_LENGTH, dims[GOMP_DIM_VECTOR]);
dims[GOMP_DIM_VECTOR] = PTX_VECTOR_LENGTH;
}
@ -5279,7 +5317,7 @@ nvptx_goacc_validate_dims_1 (tree decl, int dims[], int fn_level)
dims[GOMP_DIM_WORKER] = PTX_WORKER_LENGTH;
}
if (oacc_default_dims_p || oacc_min_dims_p)
if (oacc_default_dims_p)
{
dims[GOMP_DIM_VECTOR] = PTX_VECTOR_LENGTH;
if (dims[GOMP_DIM_WORKER] < 0)