mirrors/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-24 03:14:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[openacc] Factor out async argument utility functions

Browse Source 
2018-05-09  Tom de Vries  <tom@codesourcery.com>

	PR libgomp/83792
	* oacc-int.h (async_valid_stream_id_p, async_valid_p)
	(async_synchronous_p): New function.
	* oacc-async.c (acc_async_test, acc_wait, acc_wait_all_async): Use
	async_valid_p.
	* oacc-cuda.c (acc_get_cuda_stream, acc_set_cuda_stream): Use
	async_valid_stream_id_p.
	* oacc-mem.c (gomp_acc_remove_pointer): Use async_synchronous_p.
	* oacc-parallel.c (GOACC_parallel_keyed): Same.

From-SVN: r260081
This commit is contained in:
Tom de Vries 2018-05-09 13:52:49 +00:00 committed by Tom de Vries
parent 88b1e41c2d
commit edbd038a5f
6 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libgomp/ChangeLog
View File

@ -1,3 +1,15 @@
2018-05-09 Tom de Vries <tom@codesourcery.com>
PR libgomp/83792
* oacc-int.h (async_valid_stream_id_p, async_valid_p)
(async_synchronous_p): New function.
* oacc-async.c (acc_async_test, acc_wait, acc_wait_all_async): Use
async_valid_p.
* oacc-cuda.c (acc_get_cuda_stream, acc_set_cuda_stream): Use
async_valid_stream_id_p.
* oacc-mem.c (gomp_acc_remove_pointer): Use async_synchronous_p.
* oacc-parallel.c (GOACC_parallel_keyed): Same.
2018-05-07 Tom de Vries <tom@codesourcery.com>
PR testsuite/85677

6
libgomp/oacc-async.c
View File

@ -34,7 +34,7 @@
int
acc_async_test (int async)
{
if (async < acc_async_sync)
if (!async_valid_p (async))
gomp_fatal ("invalid async argument: %d", async);
struct goacc_thread *thr = goacc_thread ();
@ -59,7 +59,7 @@ acc_async_test_all (void)
void
acc_wait (int async)
{
if (async < acc_async_sync)
if (!async_valid_p (async))
gomp_fatal ("invalid async argument: %d", async);
struct goacc_thread *thr = goacc_thread ();
@ -117,7 +117,7 @@ acc_async_wait_all (void)
void
acc_wait_all_async (int async)
{
if (async < acc_async_sync)
if (!async_valid_p (async))
gomp_fatal ("invalid async argument: %d", async);
struct goacc_thread *thr = goacc_thread ();

4
libgomp/oacc-cuda.c
View File

@ -58,7 +58,7 @@ acc_get_cuda_stream (int async)
{
struct goacc_thread *thr = goacc_thread ();
if (async < 0)
if (!async_valid_stream_id_p (async))
return NULL;
if (thr && thr->dev && thr->dev->openacc.cuda.get_stream_func)
@ -72,7 +72,7 @@ acc_set_cuda_stream (int async, void *stream)
{
struct goacc_thread *thr;
if (async < 0 || stream == NULL)
if (!async_valid_stream_id_p (async) || stream == NULL)
return 0;
goacc_lazy_initialize ();

22
libgomp/oacc-int.h
View File

@ -99,6 +99,28 @@ void goacc_restore_bind (void);
void goacc_lazy_initialize (void);
void goacc_host_init (void);
static inline bool
async_valid_stream_id_p (int async)
{
return async >= 0;
}
static inline bool
async_valid_p (int async)
{
return (async == acc_async_noval || async == acc_async_sync
|| async_valid_stream_id_p (async));
}
static inline bool
async_synchronous_p (int async)
{
if (!async_valid_p (async))
return true;
return async == acc_async_sync;
}
#ifdef HAVE_ATTRIBUTE_VISIBILITY
# pragma GCC visibility pop
#endif

2
libgomp/oacc-mem.c
View File

@ -723,7 +723,7 @@ gomp_acc_remove_pointer (void *h, bool force_copyfrom, int async, int mapnum)
gomp_mutex_unlock (&acc_dev->lock);
/* If running synchronously, unmap immediately. */
if (async < acc_async_noval)
if (async_synchronous_p (async))
gomp_unmap_vars (t, true);
else
t->device_descr->openacc.register_async_cleanup_func (t, async);

2
libgomp/oacc-parallel.c
View File

@ -183,7 +183,7 @@ GOACC_parallel_keyed (int device, void (*fn) (void *),
async, dims, tgt);
/* If running synchronously, unmap immediately. */
if (async < acc_async_noval)
if (async_synchronous_p (async))
gomp_unmap_vars (tgt, true);
else
tgt->device_descr->openacc.register_async_cleanup_func (tgt, async);