diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2015-11-03 20:18:33 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@codesourcery.com> | 2015-11-03 20:18:33 +0000 |
| commit | b8793dd4b7f04d4052df6530d95f2cdd87bfba8c (patch) | |
| tree | eafcfcced078b7b42a1f3c2ceaf94fb816bcddc6 | |
| parent | 68e0555091cd9afb0e5cbe7ed2218c4fcc6783b2 (diff) | |
* libgomp.h (struct acc_dispatch_t): Remove args from exec_func.
* plugin/plugin-nvptx.c (nvptx_exec): Remove sizes & kinds arg.
(GOMP_OFFLOAD_openacc_parallel): Likewise.
* oacc-host.c (host_openacc_exec): Likewise.
* oacc-parallel.c (GOACC_parallel_keyed): Adjust exec_func call.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@229721 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libgomp/ChangeLog | 8 | ||||
| -rw-r--r-- | libgomp/libgomp.h | 4 | ||||
| -rw-r--r-- | libgomp/oacc-host.c | 2 | ||||
| -rw-r--r-- | libgomp/oacc-parallel.c | 4 | ||||
| -rw-r--r-- | libgomp/plugin/plugin-nvptx.c | 7 |
5 files changed, 14 insertions, 11 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 7894a7e2c16..0effe1c0208 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,11 @@ +2015-11-03 Nathan Sidwell <nathan@codesourcery.com> + + * libgomp.h (struct acc_dispatch_t): Remove args from exec_func. + * plugin/plugin-nvptx.c (nvptx_exec): Remove sizes & kinds arg. + (GOMP_OFFLOAD_openacc_parallel): Likewise. + * oacc-host.c (host_openacc_exec): Likewise. + * oacc-parallel.c (GOACC_parallel_keyed): Adjust exec_func call. + 2015-11-03 Julian Brown <julian@codesourcery.com> Thomas Schwinge <thomas@codesourcery.com> diff --git a/libgomp/libgomp.h b/libgomp/libgomp.h index 9c8b1fb8744..23b516ee37e 100644 --- a/libgomp/libgomp.h +++ b/libgomp/libgomp.h @@ -812,8 +812,8 @@ typedef struct acc_dispatch_t struct target_mem_desc *data_environ; /* Execute. */ - void (*exec_func) (void (*) (void *), size_t, void **, void **, size_t *, - unsigned short *, int, unsigned *, void *); + void (*exec_func) (void (*) (void *), size_t, void **, void **, int, + unsigned *, void *); /* Async cleanup callback registration. */ void (*register_async_cleanup_func) (void *); diff --git a/libgomp/oacc-host.c b/libgomp/oacc-host.c index 8e4ba04b465..98748041bfc 100644 --- a/libgomp/oacc-host.c +++ b/libgomp/oacc-host.c @@ -135,8 +135,6 @@ host_openacc_exec (void (*fn) (void *), size_t mapnum __attribute__ ((unused)), void **hostaddrs, void **devaddrs __attribute__ ((unused)), - size_t *sizes __attribute__ ((unused)), - unsigned short *kinds __attribute__ ((unused)), int async __attribute__ ((unused)), unsigned *dims __attribute ((unused)), void *targ_mem_desc __attribute__ ((unused))) diff --git a/libgomp/oacc-parallel.c b/libgomp/oacc-parallel.c index b150106981e..525846b0098 100644 --- a/libgomp/oacc-parallel.c +++ b/libgomp/oacc-parallel.c @@ -175,8 +175,8 @@ GOACC_parallel_keyed (int device, void (*fn) (void *), devaddrs[i] = (void *) (tgt->list[i].key->tgt->tgt_start + tgt->list[i].key->tgt_offset); - acc_dev->openacc.exec_func (tgt_fn, mapnum, hostaddrs, devaddrs, sizes, - kinds, async, dims, tgt); + acc_dev->openacc.exec_func (tgt_fn, mapnum, hostaddrs, devaddrs, + async, dims, tgt); /* If running synchronously, unmap immediately. */ if (async < acc_async_noval) diff --git a/libgomp/plugin/plugin-nvptx.c b/libgomp/plugin/plugin-nvptx.c index 5c9334900c2..657028e161d 100644 --- a/libgomp/plugin/plugin-nvptx.c +++ b/libgomp/plugin/plugin-nvptx.c @@ -877,8 +877,7 @@ event_add (enum ptx_event_type type, CUevent *e, void *h) void nvptx_exec (void (*fn), size_t mapnum, void **hostaddrs, void **devaddrs, - size_t *sizes, unsigned short *kinds, int async, unsigned *dims, - void *targ_mem_desc) + int async, unsigned *dims, void *targ_mem_desc) { struct targ_fn_descriptor *targ_fn = (struct targ_fn_descriptor *) fn; CUfunction function; @@ -1653,11 +1652,9 @@ void (*device_run) (int n, void *fn_ptr, void *vars) = NULL; void GOMP_OFFLOAD_openacc_parallel (void (*fn) (void *), size_t mapnum, void **hostaddrs, void **devaddrs, - size_t *sizes, unsigned short *kinds, int async, unsigned *dims, void *targ_mem_desc) { - nvptx_exec (fn, mapnum, hostaddrs, devaddrs, sizes, kinds, - async, dims, targ_mem_desc); + nvptx_exec (fn, mapnum, hostaddrs, devaddrs, async, dims, targ_mem_desc); } void |