diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2018-12-28 12:34:14 +0100 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gcc.gnu.org> | 2018-12-28 12:34:14 +0100 |
| commit | 59d5960cdba3fb1bd8d9c234fc36fb634b3e9ab2 (patch) | |
| tree | 4a94d5d6765f11cca6f5d093ef0afa7a5c98b934 /include | |
| parent | 5a12987e79513b46d317c6973555c582ba4da895 (diff) | |
For libgomp OpenACC entry points, redefine the "device" argument to "flags"
... so that we're then able to use this for other flags in addition to
"GOACC_FLAG_HOST_FALLBACK".
gcc/
* omp-expand.c (expand_omp_target): Restructure OpenACC vs. OpenMP
code paths. Update for libgomp OpenACC entry points change.
include/
* gomp-constants.h (GOACC_FLAG_HOST_FALLBACK)
(GOACC_FLAGS_MARSHAL_OP, GOACC_FLAGS_UNMARSHAL): Define.
libgomp/
* oacc-parallel.c (GOACC_parallel_keyed, GOACC_parallel)
(GOACC_data_start, GOACC_enter_exit_data, GOACC_update)
(GOACC_declare): Redefine the "device" argument to "flags".
From-SVN: r267448
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/gomp-constants.h | 12 |
2 files changed, 17 insertions, 0 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 74b5a1f1dd4..886e9a6ca35 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2018-12-28 Thomas Schwinge <thomas@codesourcery.com> + + * gomp-constants.h (GOACC_FLAG_HOST_FALLBACK) + (GOACC_FLAGS_MARSHAL_OP, GOACC_FLAGS_UNMARSHAL): Define. + 2018-12-22 Jason Merrill <jason@redhat.com> * demangle.h: Remove support for ancient GNU (pre-3.0), Lucid, diff --git a/include/gomp-constants.h b/include/gomp-constants.h index d3e64d4e352..b6b6733bd87 100644 --- a/include/gomp-constants.h +++ b/include/gomp-constants.h @@ -197,6 +197,18 @@ enum gomp_map_kind /* Internal to libgomp. */ #define GOMP_TARGET_FLAG_UPDATE (1U << 31) + +/* OpenACC construct flags. */ + +/* Force host fallback execution. */ +#define GOACC_FLAG_HOST_FALLBACK (1 << 0) + +/* For legacy reasons, in the ABI, the GOACC_FLAGs are encoded as an inverted + bitmask. */ +#define GOACC_FLAGS_MARSHAL_OP BIT_NOT_EXPR +#define GOACC_FLAGS_UNMARSHAL(X) (~(X)) + + /* Versions of libgomp and device-specific plugins. GOMP_VERSION should be incremented whenever an ABI-incompatible change is introduced to the plugin interface defined in libgomp/libgomp.h. */ |