diff options
author | Paul-Antoine Arras <parras@baylibre.com> | 2025-03-13 17:16:41 +0100 |
---|---|---|
committer | Paul-Antoine Arras <parras@baylibre.com> | 2025-03-21 19:24:16 +0100 |
commit | 99e2906ae255fc7b8edb008d7cd47b28b078a809 (patch) | |
tree | aa20eea780d8962d8be0da6122795911e7376390 /include | |
parent | f45d14b495d603b8d5fbdffe6fced03cb3e2fc10 (diff) | |
download | gcc-99e2906ae255fc7b8edb008d7cd47b28b078a809.zip gcc-99e2906ae255fc7b8edb008d7cd47b28b078a809.tar.gz gcc-99e2906ae255fc7b8edb008d7cd47b28b078a809.tar.bz2 |
OpenMP: 'interop' construct - add ME support + target-independent libgomp
This patch partially enables use of the OpenMP interop construct by adding
middle end support, mostly in the omplower pass, and in the target-independent
part of the libgomp runtime. It follows up on previous patches for C, C++ and
Fortran front ends support. The full interop feature requires another patch to
enable foreign runtime support in libgomp plugins.
gcc/ChangeLog:
* builtin-types.def
(BT_FN_VOID_INT_INT_PTR_PTR_PTR_INT_PTR_INT_PTR_UINT_PTR): New.
* gimple-low.cc (lower_stmt): Handle GIMPLE_OMP_INTEROP.
* gimple-pretty-print.cc (dump_gimple_omp_interop): New function.
(pp_gimple_stmt_1): Handle GIMPLE_OMP_INTEROP.
* gimple.cc (gimple_build_omp_interop): New function.
(gimple_copy): Handle GIMPLE_OMP_INTEROP.
* gimple.def (GIMPLE_OMP_INTEROP): Define.
* gimple.h (gimple_build_omp_interop): Declare.
(gimple_omp_interop_clauses): New function.
(gimple_omp_interop_clauses_ptr): Likewise.
(gimple_omp_interop_set_clauses): Likewise.
(gimple_return_set_retval): Handle GIMPLE_OMP_INTEROP.
* gimplify.cc (gimplify_scan_omp_clauses): Handle OMP_CLAUSE_INIT,
OMP_CLAUSE_USE and OMP_CLAUSE_DESTROY.
(gimplify_omp_interop): New function.
(gimplify_expr): Replace sorry with call to gimplify_omp_interop.
* omp-builtins.def (BUILT_IN_GOMP_INTEROP): Define.
* omp-low.cc (scan_sharing_clauses): Handle OMP_CLAUSE_INIT,
OMP_CLAUSE_USE and OMP_CLAUSE_DESTROY.
(scan_omp_1_stmt): Handle GIMPLE_OMP_INTEROP.
(lower_omp_interop_action_clauses): New function.
(lower_omp_interop): Likewise.
(lower_omp_1): Handle GIMPLE_OMP_INTEROP.
gcc/c/ChangeLog:
* c-parser.cc (c_parser_omp_clause_destroy): Make addressable.
(c_parser_omp_clause_init): Make addressable.
gcc/cp/ChangeLog:
* parser.cc (cp_parser_omp_clause_init): Make addressable.
gcc/fortran/ChangeLog:
* trans-openmp.cc (gfc_trans_omp_clauses): Make OMP_CLAUSE_DESTROY and
OMP_CLAUSE_INIT addressable.
* types.def (BT_FN_VOID_INT_INT_PTR_PTR_PTR_INT_PTR_INT_PTR_UINT_PTR):
New.
include/ChangeLog:
* gomp-constants.h (GOMP_DEVICE_DEFAULT_OMP_61, GOMP_INTEROP_TARGET,
GOMP_INTEROP_TARGETSYNC, GOMP_INTEROP_FLAG_NOWAIT): Define.
libgomp/ChangeLog:
* icv-device.c (omp_set_default_device): Check
GOMP_DEVICE_DEFAULT_OMP_61.
* libgomp-plugin.h (struct interop_obj_t): New.
(enum gomp_interop_flag): New.
(GOMP_OFFLOAD_interop): Declare.
(GOMP_OFFLOAD_get_interop_int): Declare.
(GOMP_OFFLOAD_get_interop_ptr): Declare.
(GOMP_OFFLOAD_get_interop_str): Declare.
(GOMP_OFFLOAD_get_interop_type_desc): Declare.
* libgomp.h (_LIBGOMP_OMP_LOCK_DEFINED): Define.
(struct gomp_device_descr): Add interop_func, get_interop_int_func,
get_interop_ptr_func, get_interop_str_func, get_interop_type_desc_func.
* libgomp.map: Add GOMP_interop.
* libgomp_g.h (GOMP_interop): Declare.
* target.c (resolve_device): Handle GOMP_DEVICE_DEFAULT_OMP_61.
(omp_get_interop_int): Replace stub with actual implementation.
(omp_get_interop_ptr): Likewise.
(omp_get_interop_str): Likewise.
(omp_get_interop_type_desc): Likewise.
(struct interop_data_t): Define.
(gomp_interop_internal): New function.
(GOMP_interop): Likewise.
(gomp_load_plugin_for_device): Load symbols for get_interop_int,
get_interop_ptr, get_interop_str and get_interop_type_desc.
* testsuite/libgomp.c-c++-common/interop-1.c: New test.
gcc/testsuite/ChangeLog:
* c-c++-common/gomp/interop-1.c: Remove dg-prune-output "sorry".
* c-c++-common/gomp/interop-2.c: Likewise.
* c-c++-common/gomp/interop-3.c: Likewise.
* c-c++-common/gomp/interop-4.c: Remove dg-message "not supported".
* g++.dg/gomp/interop-5.C: Likewise.
* gfortran.dg/gomp/interop-4.f90: Likewise.
* c-c++-common/gomp/interop-5.c: New test.
* gfortran.dg/gomp/interop-5.f90: New test.
Co-authored-by: Tobias Burnus <tburnus@baylibre.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/gomp-constants.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/include/gomp-constants.h b/include/gomp-constants.h index ccf61ca..7d6b85f 100644 --- a/include/gomp-constants.h +++ b/include/gomp-constants.h @@ -280,10 +280,14 @@ enum gomp_map_kind omp_invalid_device) to -3 (so that for dev_num >= -2U we can subtract 1). -4 is then what we use for omp_invalid_device, which unlike the other non-conforming device numbers results - in fatal error regardless of OMP_TARGET_OFFLOAD. */ + in fatal error regardless of OMP_TARGET_OFFLOAD. + Furthermore, OpenMP 6.1 exposes the default device to the user; hence, + GOMP_DEVICE_DEFAULT_OMP_61 can be used for it, + with and without remapped device numbers. */ #define GOMP_DEVICE_ICV -1 #define GOMP_DEVICE_HOST_FALLBACK -2 #define GOMP_DEVICE_INVALID -4 +#define GOMP_DEVICE_DEFAULT_OMP_61 -5 /* GOMP_task/GOMP_taskloop* flags argument. */ #define GOMP_TASK_FLAG_UNTIED (1 << 0) @@ -406,6 +410,13 @@ enum gomp_map_kind #define GOMP_INTEROP_IFR_SEPARATOR ((char)(-__INT8_MAX__-1)) #define GOMP_INTEROP_IFR_UNKNOWN ((char)(-__INT8_MAX__)) +/* GOMP_interop target_targetsync argument. */ +#define GOMP_INTEROP_TARGET (1 << 0) +#define GOMP_INTEROP_TARGETSYNC (1 << 1) + +/* GOMP_interop flags argument. */ +#define GOMP_INTEROP_FLAG_NOWAIT (1 << 0) + /* HSA specific data structures. */ /* Identifiers of device-specific target arguments. */ |