mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-28 14:24:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

AMD GCN libgomp plugin queue-full condition locking fix

Browse Source 
libgomp/
	* plugin/plugin-gcn.c (wait_for_queue_nonfull): Don't lock/unlock
	aq->mutex here.
	(queue_push_launch): Lock aq->mutex before calling
	wait_for_queue_nonfull.
	(queue_push_callback): Likewise.
	(queue_push_asyncwait): Likewise.
	(queue_push_placeholder): Likewise.

Reviewed-by: Andrew Stubbs <ams@codesourcery.com>

From-SVN: r278517
This commit is contained in:
Julian Brown 2019-11-20 17:56:30 +00:00 committed by Julian Brown
parent 8d2f4ddfd7
commit d88b27daa1
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libgomp/ChangeLog
View File

@ -1,3 +1,13 @@
2019-11-20 Julian Brown <julian@codesourcery.com>
* plugin/plugin-gcn.c (wait_for_queue_nonfull): Don't lock/unlock
aq->mutex here.
(queue_push_launch): Lock aq->mutex before calling
wait_for_queue_nonfull.
(queue_push_callback): Likewise.
(queue_push_asyncwait): Likewise.
(queue_push_placeholder): Likewise.
2019-11-20 Julian Brown <julian@codesourcery.com> 2019-11-20 Julian Brown <julian@codesourcery.com>
* plugin/plugin-gcn.c (hsa_memory_copy_wrapper): New. * plugin/plugin-gcn.c (hsa_memory_copy_wrapper): New.

23
libgomp/plugin/plugin-gcn.c
View File

@ -2725,20 +2725,17 @@ drain_queue_synchronous (struct goacc_asyncqueue *aq)
pthread_mutex_unlock (&aq->mutex); pthread_mutex_unlock (&aq->mutex);
} }
/* Block the current thread until an async queue is writable. */ /* Block the current thread until an async queue is writable. The aq->mutex
lock should be held on entry, and remains locked on exit. */
static void static void
wait_for_queue_nonfull (struct goacc_asyncqueue *aq) wait_for_queue_nonfull (struct goacc_asyncqueue *aq)
{ {
if (aq->queue_n == ASYNC_QUEUE_SIZE) if (aq->queue_n == ASYNC_QUEUE_SIZE)
{ {
pthread_mutex_lock (&aq->mutex);
/* Queue is full. Wait for it to not be full. */ /* Queue is full. Wait for it to not be full. */
while (aq->queue_n == ASYNC_QUEUE_SIZE) while (aq->queue_n == ASYNC_QUEUE_SIZE)
pthread_cond_wait (&aq->queue_cond_out, &aq->mutex); pthread_cond_wait (&aq->queue_cond_out, &aq->mutex);
pthread_mutex_unlock (&aq->mutex);
} }
} }
@ -2752,10 +2749,10 @@ queue_push_launch (struct goacc_asyncqueue *aq, struct kernel_info *kernel,
{ {
assert (aq->agent == kernel->agent); assert (aq->agent == kernel->agent);
wait_for_queue_nonfull (aq);
pthread_mutex_lock (&aq->mutex); pthread_mutex_lock (&aq->mutex);
wait_for_queue_nonfull (aq);
int queue_last = ((aq->queue_first + aq->queue_n) int queue_last = ((aq->queue_first + aq->queue_n)
% ASYNC_QUEUE_SIZE); % ASYNC_QUEUE_SIZE);
if (DEBUG_QUEUES) if (DEBUG_QUEUES)
@ -2785,10 +2782,10 @@ static void
queue_push_callback (struct goacc_asyncqueue *aq, void (*fn)(void *), queue_push_callback (struct goacc_asyncqueue *aq, void (*fn)(void *),
void *data) void *data)
{ {
wait_for_queue_nonfull (aq);
pthread_mutex_lock (&aq->mutex); pthread_mutex_lock (&aq->mutex);
wait_for_queue_nonfull (aq);
int queue_last = ((aq->queue_first + aq->queue_n) int queue_last = ((aq->queue_first + aq->queue_n)
% ASYNC_QUEUE_SIZE); % ASYNC_QUEUE_SIZE);
if (DEBUG_QUEUES) if (DEBUG_QUEUES)
@ -2818,10 +2815,10 @@ static void
queue_push_asyncwait (struct goacc_asyncqueue *aq, queue_push_asyncwait (struct goacc_asyncqueue *aq,
struct placeholder *placeholderp) struct placeholder *placeholderp)
{ {
wait_for_queue_nonfull (aq);
pthread_mutex_lock (&aq->mutex); pthread_mutex_lock (&aq->mutex);
wait_for_queue_nonfull (aq);
int queue_last = ((aq->queue_first + aq->queue_n) % ASYNC_QUEUE_SIZE); int queue_last = ((aq->queue_first + aq->queue_n) % ASYNC_QUEUE_SIZE);
if (DEBUG_QUEUES) if (DEBUG_QUEUES)
GCN_DEBUG ("queue_push_asyncwait %d:%d: at %i\n", aq->agent->device_id, GCN_DEBUG ("queue_push_asyncwait %d:%d: at %i\n", aq->agent->device_id,
@ -2849,10 +2846,10 @@ queue_push_placeholder (struct goacc_asyncqueue *aq)
{ {
struct placeholder *placeholderp; struct placeholder *placeholderp;
wait_for_queue_nonfull (aq);
pthread_mutex_lock (&aq->mutex); pthread_mutex_lock (&aq->mutex);
wait_for_queue_nonfull (aq);
int queue_last = ((aq->queue_first + aq->queue_n) % ASYNC_QUEUE_SIZE); int queue_last = ((aq->queue_first + aq->queue_n) % ASYNC_QUEUE_SIZE);
if (DEBUG_QUEUES) if (DEBUG_QUEUES)
GCN_DEBUG ("queue_push_placeholder %d:%d: at %i\n", aq->agent->device_id, GCN_DEBUG ("queue_push_placeholder %d:%d: at %i\n", aq->agent->device_id,