diff options
| author | marxin <marxin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-03-24 13:04:12 +0000 |
|---|---|---|
| committer | marxin <marxin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-03-24 13:04:12 +0000 |
| commit | c15bc2b20e9ab66699afe6888c98920b4936d4ce (patch) | |
| tree | ae7e8fb917ef1ed5af713a7fc654c7468ed7c233 /libgomp | |
| parent | f365d2979d2e8aa6e6a457379ec0def349ee3c21 (diff) | |
| download | gcc-c15bc2b20e9ab66699afe6888c98920b4936d4ce.tar.gz | |
Properly assign to packet header (PR hsa/70394)
* plugin/plugin-hsa.c (packet_store_release): New function
that is taken from the HSA runtime manual.
(GOMP_OFFLOAD_run): Use the function.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@234454 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 6 | ||||
| -rw-r--r-- | libgomp/plugin/plugin-hsa.c | 13 |
2 files changed, 17 insertions, 2 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index cb8c98edabe..5f2c401e461 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,9 @@ +2016-03-24 Martin Liska <mliska@suse.cz> + + * plugin/plugin-hsa.c (packet_store_release): New function + that is taken from the HSA runtime manual. + (GOMP_OFFLOAD_run): Use the function. + 2016-03-23 Jakub Jelinek <jakub@redhat.com> PR c++/70376 diff --git a/libgomp/plugin/plugin-hsa.c b/libgomp/plugin/plugin-hsa.c index f7ef6000e1c..0b3b67ac01c 100644 --- a/libgomp/plugin/plugin-hsa.c +++ b/libgomp/plugin/plugin-hsa.c @@ -1185,6 +1185,14 @@ failure: return false; } +/* Atomically store pair of uint16_t values (HEADER and REST) to a PACKET. */ + +void +packet_store_release (uint32_t* packet, uint16_t header, uint16_t rest) +{ + __atomic_store_n (packet, header | (rest << 16), __ATOMIC_RELEASE); +} + /* Part of the libgomp plugin interface. Run a kernel on device N and pass it an array of pointers in VARS as a parameter. The kernel is identified by FN_PTR which must point to a kernel_info structure. */ @@ -1232,7 +1240,6 @@ GOMP_OFFLOAD_run (int n, void *fn_ptr, void *vars, void **args) + index % agent->command_q->size; memset (((uint8_t *) packet) + 4, 0, sizeof (*packet) - 4); - packet->setup |= (uint16_t) 1 << HSA_KERNEL_DISPATCH_PACKET_SETUP_DIMENSIONS; packet->grid_size_x = kla->gdims[0]; uint32_t wgs = kla->wdims[0]; if (wgs == 0) @@ -1275,7 +1282,9 @@ GOMP_OFFLOAD_run (int n, void *fn_ptr, void *vars, void **args) HSA_DEBUG ("Going to dispatch kernel %s\n", kernel->name); - __atomic_store_n ((uint16_t *) (&packet->header), header, __ATOMIC_RELEASE); + packet_store_release ((uint32_t *) packet, header, + 1 << HSA_KERNEL_DISPATCH_PACKET_SETUP_DIMENSIONS); + hsa_signal_store_release (agent->command_q->doorbell_signal, index); /* TODO: GPU agents in Carrizo APUs cannot properly update L2 cache for |