mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-19 10:10:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

libgomp: Normalize the names of a few functions of the libgomp plugin API

Browse Source 
libgomp/
	* libgomp-plugin.h (GOMP_OFFLOAD_openacc_parallel): Rename to
	GOMP_OFFLOAD_openacc_exec.  Adjust all users.
	(GOMP_OFFLOAD_openacc_get_current_cuda_device): Rename to
	GOMP_OFFLOAD_openacc_cuda_get_current_device.  Adjust all users.
	(GOMP_OFFLOAD_openacc_get_current_cuda_context): Rename to
	GOMP_OFFLOAD_openacc_cuda_get_current_context.  Adjust all users.
	(GOMP_OFFLOAD_openacc_get_cuda_stream): Rename to
	GOMP_OFFLOAD_openacc_cuda_get_stream.  Adjust all users.
	(GOMP_OFFLOAD_openacc_set_cuda_stream): Rename to
	GOMP_OFFLOAD_openacc_cuda_set_stream.  Adjust all users.

From-SVN: r245125
This commit is contained in:
Thomas Schwinge 2017-02-02 15:13:57 +01:00 committed by Thomas Schwinge
parent da75ca93f8
commit 345a8c1712
5 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libgomp/ChangeLog
View File

@ -1,3 +1,16 @@
2017-02-02 Thomas Schwinge <thomas@codesourcery.com>
* libgomp-plugin.h (GOMP_OFFLOAD_openacc_parallel): Rename to
GOMP_OFFLOAD_openacc_exec. Adjust all users.
(GOMP_OFFLOAD_openacc_get_current_cuda_device): Rename to
GOMP_OFFLOAD_openacc_cuda_get_current_device. Adjust all users.
(GOMP_OFFLOAD_openacc_get_current_cuda_context): Rename to
GOMP_OFFLOAD_openacc_cuda_get_current_context. Adjust all users.
(GOMP_OFFLOAD_openacc_get_cuda_stream): Rename to
GOMP_OFFLOAD_openacc_cuda_get_stream. Adjust all users.
(GOMP_OFFLOAD_openacc_set_cuda_stream): Rename to
GOMP_OFFLOAD_openacc_cuda_set_stream. Adjust all users.
2017-01-31 Thomas Schwinge <thomas@codesourcery.com>
* libgomp-plugin.h: #include <stdbool.h>.

12
libgomp/libgomp-plugin.h
View File

@ -93,8 +93,8 @@ extern bool GOMP_OFFLOAD_dev2dev (int, void *, const void *, size_t);
extern bool GOMP_OFFLOAD_can_run (void *);
extern void GOMP_OFFLOAD_run (int, void *, void *, void **);
extern void GOMP_OFFLOAD_async_run (int, void *, void *, void **, void *);
extern void GOMP_OFFLOAD_openacc_parallel (void (*) (void *), size_t, void **,
void **, int, unsigned *, void *);
extern void GOMP_OFFLOAD_openacc_exec (void (*) (void *), size_t, void **,
void **, int, unsigned *, void *);
extern void GOMP_OFFLOAD_openacc_register_async_cleanup (void *, int);
extern int GOMP_OFFLOAD_openacc_async_test (int);
extern int GOMP_OFFLOAD_openacc_async_test_all (void);
@ -105,10 +105,10 @@ extern void GOMP_OFFLOAD_openacc_async_wait_all_async (int);
extern void GOMP_OFFLOAD_openacc_async_set_async (int);
extern void *GOMP_OFFLOAD_openacc_create_thread_data (int);
extern void GOMP_OFFLOAD_openacc_destroy_thread_data (void *);
extern void *GOMP_OFFLOAD_openacc_get_current_cuda_device (void);
extern void *GOMP_OFFLOAD_openacc_get_current_cuda_context (void);
extern void *GOMP_OFFLOAD_openacc_get_cuda_stream (int);
extern int GOMP_OFFLOAD_openacc_set_cuda_stream (int, void *);
extern void *GOMP_OFFLOAD_openacc_cuda_get_current_device (void);
extern void *GOMP_OFFLOAD_openacc_cuda_get_current_context (void);
extern void *GOMP_OFFLOAD_openacc_cuda_get_stream (int);
extern int GOMP_OFFLOAD_openacc_cuda_set_stream (int, void *);
#ifdef __cplusplus
}

10
libgomp/libgomp.h
View File

@ -882,7 +882,7 @@ typedef struct acc_dispatch_t
struct target_mem_desc *data_environ;
/* Execute. */
__typeof (GOMP_OFFLOAD_openacc_parallel) *exec_func;
__typeof (GOMP_OFFLOAD_openacc_exec) *exec_func;
/* Async cleanup callback registration. */
__typeof (GOMP_OFFLOAD_openacc_register_async_cleanup)
@ -905,12 +905,12 @@ typedef struct acc_dispatch_t
/* NVIDIA target specific routines. */
struct {
__typeof (GOMP_OFFLOAD_openacc_get_current_cuda_device)
__typeof (GOMP_OFFLOAD_openacc_cuda_get_current_device)
*get_current_device_func;
__typeof (GOMP_OFFLOAD_openacc_get_current_cuda_context)
__typeof (GOMP_OFFLOAD_openacc_cuda_get_current_context)
*get_current_context_func;
__typeof (GOMP_OFFLOAD_openacc_get_cuda_stream) *get_stream_func;
__typeof (GOMP_OFFLOAD_openacc_set_cuda_stream) *set_stream_func;
__typeof (GOMP_OFFLOAD_openacc_cuda_get_stream) *get_stream_func;
__typeof (GOMP_OFFLOAD_openacc_cuda_set_stream) *set_stream_func;
} cuda;
} acc_dispatch_t;

14
libgomp/plugin/plugin-nvptx.c
View File

@ -1922,9 +1922,9 @@ GOMP_OFFLOAD_dev2dev (int ord, void *dst, const void *src, size_t n)
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,
int async, unsigned *dims, void *targ_mem_desc)
GOMP_OFFLOAD_openacc_exec (void (*fn) (void *), size_t mapnum,
void **hostaddrs, void **devaddrs,
int async, unsigned *dims, void *targ_mem_desc)
{
nvptx_exec (fn, mapnum, hostaddrs, devaddrs, async, dims, targ_mem_desc);
}
@ -2014,13 +2014,13 @@ GOMP_OFFLOAD_openacc_destroy_thread_data (void *data)
}
void *
GOMP_OFFLOAD_openacc_get_current_cuda_device (void)
GOMP_OFFLOAD_openacc_cuda_get_current_device (void)
{
return nvptx_get_current_cuda_device ();
}
void *
GOMP_OFFLOAD_openacc_get_current_cuda_context (void)
GOMP_OFFLOAD_openacc_cuda_get_current_context (void)
{
return nvptx_get_current_cuda_context ();
}
@ -2028,7 +2028,7 @@ GOMP_OFFLOAD_openacc_get_current_cuda_context (void)
/* NOTE: This returns a CUstream, not a ptx_stream pointer. */
void *
GOMP_OFFLOAD_openacc_get_cuda_stream (int async)
GOMP_OFFLOAD_openacc_cuda_get_stream (int async)
{
return nvptx_get_cuda_stream (async);
}
@ -2036,7 +2036,7 @@ GOMP_OFFLOAD_openacc_get_cuda_stream (int async)
/* NOTE: This takes a CUstream, not a ptx_stream pointer. */
int
GOMP_OFFLOAD_openacc_set_cuda_stream (int async, void *stream)
GOMP_OFFLOAD_openacc_cuda_set_stream (int async, void *stream)
{
return nvptx_set_cuda_stream (async, stream);
}

10
libgomp/target.c
View File

@ -2399,7 +2399,7 @@ gomp_load_plugin_for_device (struct gomp_device_descr *device,
}
if (device->capabilities & GOMP_OFFLOAD_CAP_OPENACC_200)
{
if (!DLSYM_OPT (openacc.exec, openacc_parallel)
if (!DLSYM_OPT (openacc.exec, openacc_exec)
|| !DLSYM_OPT (openacc.register_async_cleanup,
openacc_register_async_cleanup)
|| !DLSYM_OPT (openacc.async_test, openacc_async_test)
@ -2423,11 +2423,11 @@ gomp_load_plugin_for_device (struct gomp_device_descr *device,
unsigned cuda = 0;
cuda += DLSYM_OPT (openacc.cuda.get_current_device,
openacc_get_current_cuda_device);
openacc_cuda_get_current_device);
cuda += DLSYM_OPT (openacc.cuda.get_current_context,
openacc_get_current_cuda_context);
cuda += DLSYM_OPT (openacc.cuda.get_stream, openacc_get_cuda_stream);
cuda += DLSYM_OPT (openacc.cuda.set_stream, openacc_set_cuda_stream);
openacc_cuda_get_current_context);
cuda += DLSYM_OPT (openacc.cuda.get_stream, openacc_cuda_get_stream);
cuda += DLSYM_OPT (openacc.cuda.set_stream, openacc_cuda_set_stream);
if (cuda && cuda != 4)
{
/* Make sure all the CUDA functions are there if any of them are. */