Hi Chung-Lin!
On Tue, 25 Sep 2018 21:10:47 +0800, Chung-Lin Tang <chunglin_t...@mentor.com>
wrote:
> --- a/libgomp/oacc-async.c
> +++ b/libgomp/oacc-async.c
> +attribute_hidden struct goacc_asyncqueue *
> +lookup_goacc_asyncqueue (struct goacc_thread *thr, bool create, int async)
> +{
> + /* The special value acc_async_noval (-1) maps to the thread-specific
> + default async stream. */
> + if (async == acc_async_noval)
> + async = thr->default_async;
> +
> + if (async == acc_async_sync)
> + return NULL;
> +
> + if (async < 0)
> + gomp_fatal ("bad async %d", async);
To make this "resolve" part more obvious, that is, the translation from
the "async" argument to an "asyncqueue" array index:
> + if (!create
> + && (async >= dev->openacc.async.nasyncqueue
> + || !dev->openacc.async.asyncqueue[async]))
> + return NULL;
> +[...]
..., I propose adding a "async2id" function for that, and then rename all
"asyncqueue[async]" to "asyncqueue[id]".
And, this also restores the current trunk behavior, so that
"acc_async_noval" gets its own, separate "asyncqueue".
commit e0d10cd744906c031af536bbf523ed6607370bf7
Author: Thomas Schwinge <tho...@codesourcery.com>
Date: Wed Dec 12 15:22:29 2018 +0100
into async re-work: libgomp/oacc-async.c:async2id
---
libgomp/oacc-async.c | 58 +++++++++++++++++++++++++++++++++++-----------------
1 file changed, 39 insertions(+), 19 deletions(-)
diff --git libgomp/oacc-async.c libgomp/oacc-async.c
index c9b134ac3380..b091ba2460ac 100644
--- libgomp/oacc-async.c
+++ libgomp/oacc-async.c
@@ -54,53 +54,73 @@ get_goacc_thread_device (void)
return thr->dev;
}
-attribute_hidden struct goacc_asyncqueue *
-lookup_goacc_asyncqueue (struct goacc_thread *thr, bool create, int async)
+/* Translate from an OpenACC async-argument to an internal asyncqueue ID, or -1
+ if no asyncqueue is to be used. */
+
+static int
+async2id (int async)
{
- /* The special value acc_async_noval (-1) maps to the thread-specific
- default async stream. */
- if (async == acc_async_noval)
- async = 0; //TODO thr->default_async;
+ if (!async_valid_p (async))
+ gomp_fatal ("invalid async-argument: %d", async);
if (async == acc_async_sync)
+ return -1;
+ else if (async == acc_async_noval)
+ return 0;
+ else if (async >= 0)
+ return 1 + async;
+ else
+ __builtin_unreachable ();
+}
+
+/* Return the asyncqueue to be used for OpenACC async-argument ASYNC. This
+ might return NULL if no asyncqueue is to be used. Otherwise, if CREATE,
+ create the asyncqueue if it doesn't exist yet. */
+
+attribute_hidden struct goacc_asyncqueue *
+lookup_goacc_asyncqueue (struct goacc_thread *thr, bool create, int async)
+{
+ int id = async2id (async);
+ if (id < 0)
return NULL;
- if (async < 0)
- gomp_fatal ("bad async %d", async);
-
struct gomp_device_descr *dev = thr->dev;
if (!create
- && (async >= dev->openacc.async.nasyncqueue
- || !dev->openacc.async.asyncqueue[async]))
+ && (id >= dev->openacc.async.nasyncqueue
+ || !dev->openacc.async.asyncqueue[id]))
return NULL;
gomp_mutex_lock (&dev->openacc.async.lock);
- if (async >= dev->openacc.async.nasyncqueue)
+ if (id >= dev->openacc.async.nasyncqueue)
{
- int diff = async + 1 - dev->openacc.async.nasyncqueue;
+ int diff = id + 1 - dev->openacc.async.nasyncqueue;
dev->openacc.async.asyncqueue
= gomp_realloc (dev->openacc.async.asyncqueue,
- sizeof (goacc_aq) * (async + 1));
+ sizeof (goacc_aq) * (id + 1));
memset (dev->openacc.async.asyncqueue + dev->openacc.async.nasyncqueue,
0, sizeof (goacc_aq) * diff);
- dev->openacc.async.nasyncqueue = async + 1;
+ dev->openacc.async.nasyncqueue = id + 1;
}
- if (!dev->openacc.async.asyncqueue[async])
+ if (!dev->openacc.async.asyncqueue[id])
{
- dev->openacc.async.asyncqueue[async] = dev->openacc.async.construct_func
();
+ dev->openacc.async.asyncqueue[id] = dev->openacc.async.construct_func ();
/* Link new async queue into active list. */
goacc_aq_list n = gomp_malloc (sizeof (struct goacc_asyncqueue_list));
- n->aq = dev->openacc.async.asyncqueue[async];
+ n->aq = dev->openacc.async.asyncqueue[id];
n->next = dev->openacc.async.active;
dev->openacc.async.active = n;
}
gomp_mutex_unlock (&dev->openacc.async.lock);
- return dev->openacc.async.asyncqueue[async];
+ return dev->openacc.async.asyncqueue[id];
}
+/* Return the asyncqueue to be used for OpenACC async-argument ASYNC. This
+ might return NULL if no asyncqueue is to be used. Otherwise, create the
+ asyncqueue if it doesn't exist yet. */
+
attribute_hidden struct goacc_asyncqueue *
get_goacc_asyncqueue (int async)
{
Grüße
Thomas
