diff options
Diffstat (limited to 'libgomp/libgomp.h')
| -rw-r--r-- | libgomp/libgomp.h | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/libgomp/libgomp.h b/libgomp/libgomp.h index 44ad980..a433983 100644 --- a/libgomp/libgomp.h +++ b/libgomp/libgomp.h @@ -43,7 +43,14 @@ #include "config.h" #include <stdint.h> + +/* Include omp.h by parts. */ +#include "omp-lock.h" +#define _LIBGOMP_OMP_LOCK_DEFINED 1 +#include "omp.h.in" + #include "libgomp-plugin.h" + #include "gomp-constants.h" #ifdef HAVE_PTHREAD_H @@ -1353,6 +1360,7 @@ typedef struct acc_dispatch_t __typeof (GOMP_OFFLOAD_openacc_async_exec) *exec_func; __typeof (GOMP_OFFLOAD_openacc_async_dev2host) *dev2host_func; __typeof (GOMP_OFFLOAD_openacc_async_host2dev) *host2dev_func; + __typeof (GOMP_OFFLOAD_openacc_async_dev2dev) *dev2dev_func; } async; __typeof (GOMP_OFFLOAD_openacc_get_property) *get_property_func; @@ -1413,12 +1421,18 @@ struct gomp_device_descr __typeof (GOMP_OFFLOAD_free) *free_func; __typeof (GOMP_OFFLOAD_dev2host) *dev2host_func; __typeof (GOMP_OFFLOAD_host2dev) *host2dev_func; + __typeof (GOMP_OFFLOAD_dev2dev) *dev2dev_func; __typeof (GOMP_OFFLOAD_memcpy2d) *memcpy2d_func; __typeof (GOMP_OFFLOAD_memcpy3d) *memcpy3d_func; - __typeof (GOMP_OFFLOAD_dev2dev) *dev2dev_func; + __typeof (GOMP_OFFLOAD_memset) *memset_func; __typeof (GOMP_OFFLOAD_can_run) *can_run_func; __typeof (GOMP_OFFLOAD_run) *run_func; __typeof (GOMP_OFFLOAD_async_run) *async_run_func; + __typeof (GOMP_OFFLOAD_interop) *interop_func; + __typeof (GOMP_OFFLOAD_get_interop_int) *get_interop_int_func; + __typeof (GOMP_OFFLOAD_get_interop_ptr) *get_interop_ptr_func; + __typeof (GOMP_OFFLOAD_get_interop_str) *get_interop_str_func; + __typeof (GOMP_OFFLOAD_get_interop_type_desc) *get_interop_type_desc_func; /* Splay tree containing information about mapped memory regions. */ struct splay_tree_s mem_map; @@ -1455,11 +1469,14 @@ extern void gomp_copy_host2dev (struct gomp_device_descr *, extern void gomp_copy_dev2host (struct gomp_device_descr *, struct goacc_asyncqueue *, void *, const void *, size_t); +extern void gomp_copy_dev2dev (struct gomp_device_descr *, + struct goacc_asyncqueue *, void *, const void *, + size_t); extern uintptr_t gomp_map_val (struct target_mem_desc *, void **, size_t); -extern void gomp_attach_pointer (struct gomp_device_descr *, +extern bool gomp_attach_pointer (struct gomp_device_descr *, struct goacc_asyncqueue *, splay_tree, splay_tree_key, uintptr_t, size_t, - struct gomp_coalesce_buf *, bool); + struct gomp_coalesce_buf *, bool, bool); extern void gomp_detach_pointer (struct gomp_device_descr *, struct goacc_asyncqueue *, splay_tree_key, uintptr_t, bool, struct gomp_coalesce_buf *); @@ -1501,11 +1518,6 @@ gomp_work_share_init_done (void) /* Now that we're back to default visibility, include the globals. */ #include "libgomp_g.h" -/* Include omp.h by parts. */ -#include "omp-lock.h" -#define _LIBGOMP_OMP_LOCK_DEFINED 1 -#include "omp.h.in" - #if !defined (HAVE_ATTRIBUTE_VISIBILITY) \ || !defined (HAVE_ATTRIBUTE_ALIAS) \ || !defined (HAVE_AS_SYMVER_DIRECTIVE) \ |