diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2019-12-18 18:02:18 +0100 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gcc.gnu.org> | 2019-12-18 18:02:18 +0100 |
| commit | 5031b6199f2270c39191af57aa47610ad9e6487d (patch) | |
| tree | 6ca8b546c07939ca00fff3e1cc0db196af5a9d31 /libgomp | |
| parent | 1a79b5788df0515f13f9ba262809dcc804692874 (diff) | |
| download | gcc-5031b6199f2270c39191af57aa47610ad9e6487d.zip gcc-5031b6199f2270c39191af57aa47610ad9e6487d.tar.gz gcc-5031b6199f2270c39191af57aa47610ad9e6487d.tar.bz2 | |
[OpenACC] Refactor 'goacc_remove_pointer' interface
No functional changes.
libgomp/
* oacc-mem.c (goacc_remove_pointer): Refactor interface. Adjust
all users.
From-SVN: r279538
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 3 | ||||
| -rw-r--r-- | libgomp/oacc-mem.c | 26 |
2 files changed, 15 insertions, 14 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 9bb22e9..1938199 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,5 +1,8 @@ 2019-12-18 Thomas Schwinge <thomas@codesourcery.com> + * oacc-mem.c (goacc_remove_pointer): Refactor interface. Adjust + all users. + * oacc-mem.c (GOACC_enter_exit_data): Refactor code to call 'goacc_enter_data', 'goacc_exit_data'. diff --git a/libgomp/oacc-mem.c b/libgomp/oacc-mem.c index 6509bd7..d08eb8b 100644 --- a/libgomp/oacc-mem.c +++ b/libgomp/oacc-mem.c @@ -873,8 +873,8 @@ acc_update_self_async (void *h, size_t s, int async) /* Special handling for 'GOMP_MAP_POINTER', 'GOMP_MAP_TO_PSET'. Only the first mapping is considered in reference counting; the following - ones implicitly follow suit. Similarly, 'copyout' ('force_copyfrom') is - done only for the first mapping. */ + ones implicitly follow suit. Similarly, 'copyout' is done only for the + first mapping. */ static void goacc_insert_pointer (size_t mapnum, void **hostaddrs, size_t *sizes, @@ -925,9 +925,10 @@ goacc_insert_pointer (size_t mapnum, void **hostaddrs, size_t *sizes, } static void -goacc_remove_pointer (void *h, size_t s, bool force_copyfrom, int async, - int finalize) +goacc_remove_pointer (void *h, size_t s, unsigned short kind, int async) { + kind &= 0xff; + struct goacc_thread *thr = goacc_thread (); struct gomp_device_descr *acc_dev = thr->dev; splay_tree_key n; @@ -958,6 +959,8 @@ goacc_remove_pointer (void *h, size_t s, bool force_copyfrom, int async, gomp_fatal ("Dynamic reference counting assert fail\n"); } + bool finalize = (kind == GOMP_MAP_DELETE + || kind == GOMP_MAP_FORCE_FROM); if (finalize) { n->refcount -= n->dynamic_refcount; @@ -973,11 +976,12 @@ goacc_remove_pointer (void *h, size_t s, bool force_copyfrom, int async, { goacc_aq aq = get_goacc_asyncqueue (async); - if (force_copyfrom) + bool copyout = (kind == GOMP_MAP_FROM + || kind == GOMP_MAP_FORCE_FROM); + if (copyout) { void *d = (void *) (t->tgt_start + n->tgt_offset + (uintptr_t) h - n->host_start); - gomp_copy_dev2host (acc_dev, aq, h, d, s); } @@ -1194,12 +1198,11 @@ GOACC_enter_exit_data (int flags_m, size_t mapnum, void **hostaddrs, else for (i = 0; i < mapnum; ++i) { - unsigned char kind = kinds[i] & 0xff; - int pointer = find_pointer (i, mapnum, kinds); if (!pointer) { + unsigned char kind = kinds[i] & 0xff; switch (kind) { case GOMP_MAP_RELEASE: @@ -1217,12 +1220,7 @@ GOACC_enter_exit_data (int flags_m, size_t mapnum, void **hostaddrs, } else { - bool finalize = (kind == GOMP_MAP_DELETE - || kind == GOMP_MAP_FORCE_FROM); - bool copyfrom = (kind == GOMP_MAP_FORCE_FROM - || kind == GOMP_MAP_FROM); - goacc_remove_pointer (hostaddrs[i], sizes[i], copyfrom, async, - finalize); + goacc_remove_pointer (hostaddrs[i], sizes[i], kinds[i], async); /* See the above comment. */ i += pointer - 1; } |