[Mesa-dev] [PATCH 1/2] gallium/util: import the multithreaded job queue from amdgpu winsys (v2)
From: Marek Olšák
v2: rename the event to util_queue_fence
---
src/gallium/auxiliary/Makefile.sources| 2 +
src/gallium/auxiliary/util/u_queue.c | 129 ++
src/gallium/auxiliary/util/u_queue.h | 80
src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | 23 ++---
src/gallium/winsys/amdgpu/drm/amdgpu_cs.h | 4 +-
src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 63 +
src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h | 11 +--
7 files changed, 229 insertions(+), 83 deletions(-)
create mode 100644 src/gallium/auxiliary/util/u_queue.c
create mode 100644 src/gallium/auxiliary/util/u_queue.h
diff --git a/src/gallium/auxiliary/Makefile.sources
b/src/gallium/auxiliary/Makefile.sources
index 7b3853e..ab58358 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -274,6 +274,8 @@ C_SOURCES := \
util/u_pstipple.c \
util/u_pstipple.h \
util/u_pwr8.h \
+ util/u_queue.c \
+ util/u_queue.h \
util/u_range.h \
util/u_rect.h \
util/u_resource.c \
diff --git a/src/gallium/auxiliary/util/u_queue.c
b/src/gallium/auxiliary/util/u_queue.c
new file mode 100644
index 000..8e58414
--- /dev/null
+++ b/src/gallium/auxiliary/util/u_queue.c
@@ -0,0 +1,129 @@
+/*
+ * Copyright © 2016 Advanced Micro Devices, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS, AUTHORS
+ * AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ */
+
+#include "u_queue.h"
+
+static PIPE_THREAD_ROUTINE(util_queue_thread_func, param)
+{
+ struct util_queue *queue = (struct util_queue*)param;
+ unsigned i;
+
+ while (1) {
+ struct util_queue_job job;
+
+ pipe_semaphore_wait(&queue->queued);
+ if (queue->kill_thread)
+ break;
+
+ pipe_mutex_lock(queue->lock);
+ job = queue->jobs[0];
+ for (i = 1; i < queue->num_jobs; i++)
+ queue->jobs[i - 1] = queue->jobs[i];
+ queue->jobs[--queue->num_jobs].job = NULL;
+ pipe_mutex_unlock(queue->lock);
+
+ pipe_semaphore_signal(&queue->has_space);
+
+ if (job.job) {
+ queue->execute_job(job.job);
+ pipe_semaphore_signal(&job.fence->done);
+ }
+ }
+
+ /* signal remaining jobs before terminating */
+ pipe_mutex_lock(queue->lock);
+ for (i = 0; i < queue->num_jobs; i++) {
+ pipe_semaphore_signal(&queue->jobs[i].fence->done);
+ queue->jobs[i].job = NULL;
+ }
+ queue->num_jobs = 0;
+ pipe_mutex_unlock(queue->lock);
+ return 0;
+}
+
+void
+util_queue_init(struct util_queue *queue,
+void (*execute_job)(void *))
+{
+ memset(queue, 0, sizeof(*queue));
+ queue->execute_job = execute_job;
+ pipe_mutex_init(queue->lock);
+ pipe_semaphore_init(&queue->has_space, ARRAY_SIZE(queue->jobs));
+ pipe_semaphore_init(&queue->queued, 0);
+ queue->thread = pipe_thread_create(util_queue_thread_func, queue);
+}
+
+void
+util_queue_destroy(struct util_queue *queue)
+{
+ queue->kill_thread = 1;
+ pipe_semaphore_signal(&queue->queued);
+ pipe_thread_wait(queue->thread);
+ pipe_semaphore_destroy(&queue->has_space);
+ pipe_semaphore_destroy(&queue->queued);
+ pipe_mutex_destroy(queue->lock);
+}
+
+void
+util_queue_fence_init(struct util_queue_fence *fence)
+{
+ pipe_semaphore_init(&fence->done, 1);
+}
+
+void
+util_queue_fence_destroy(struct util_queue_fence *fence)
+{
+ pipe_semaphore_destroy(&fence->done);
+}
+
+void
+util_queue_add_job(struct util_queue *queue,
+ void *job,
+ struct util_queue_fence *fence)
+{
+ /* Set the semaphore to "busy". */
+ pipe_semaphore_wait(&fence->done);
+
+ /* if the queue is full, wait until there is space */
+ pipe_semaphore_wait(&queue->has_space);
+
+ pipe_mutex_lock(queue->lock);
+ assert(queue->num_jobs < ARRAY_SIZE(queue->jobs));
+ queue->jobs[queue->num_jobs].job = j
Re: [Mesa-dev] [PATCH 1/2] gallium/util: import the multithreaded job queue from amdgpu winsys
On 14.06.2016 15:04, Marek Olšák wrote:
The event doesn't limit the number of outstanding jobs. It's like a
fence - you can wait for it or you don't. The limitation is that you
must have exactly one event instance for each active job.
Right, that's what I meant: only one job can be outstanding for each
util_queue_event. I didn't express myself very clearly.
util_queue_fence is a better name IMO. I don't plan to extend the
feature set beyond that.
I guess that works as well.
Nicolai
Marek
On Jun 14, 2016 1:26 PM, "Nicolai Hähnle" mailto:nhaeh...@gmail.com>> wrote:
On 13.06.2016 19:34, Marek Olšák wrote:
From: Marek Olšák mailto:marek.ol...@amd.com>>
---
src/gallium/auxiliary/Makefile.sources| 2 +
src/gallium/auxiliary/util/u_queue.c | 129
++
src/gallium/auxiliary/util/u_queue.h | 80
src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | 23 ++---
src/gallium/winsys/amdgpu/drm/amdgpu_cs.h | 4 +-
src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 63 +
src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h | 11 +--
7 files changed, 229 insertions(+), 83 deletions(-)
create mode 100644 src/gallium/auxiliary/util/u_queue.c
create mode 100644 src/gallium/auxiliary/util/u_queue.h
diff --git a/src/gallium/auxiliary/Makefile.sources
b/src/gallium/auxiliary/Makefile.sources
index 7b3853e..ab58358 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -274,6 +274,8 @@ C_SOURCES := \
util/u_pstipple.c \
util/u_pstipple.h \
util/u_pwr8.h \
+ util/u_queue.c \
+ util/u_queue.h \
util/u_range.h \
util/u_rect.h \
util/u_resource.c \
diff --git a/src/gallium/auxiliary/util/u_queue.c
b/src/gallium/auxiliary/util/u_queue.c
new file mode 100644
index 000..311b591
--- /dev/null
+++ b/src/gallium/auxiliary/util/u_queue.c
@@ -0,0 +1,129 @@
+/*
+ * Copyright © 2016 Advanced Micro Devices, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person
obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction,
including
+ * without limitation the rights to use, copy, modify, merge,
publish,
+ * distribute, sub license, and/or sell copies of the Software,
and to
+ * permit persons to whom the Software is furnished to do so,
subject to
+ * the following conditions:
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS,
AUTHORS
+ * AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * The above copyright notice and this permission notice
(including the
+ * next paragraph) shall be included in all copies or
substantial portions
+ * of the Software.
+ */
+
+#include "u_queue.h"
+
+static PIPE_THREAD_ROUTINE(util_queue_thread_func, param)
+{
+ struct util_queue *queue = (struct util_queue*)param;
+ unsigned i;
+
+ while (1) {
+ struct util_queue_job job;
+
+ pipe_semaphore_wait(&queue->queued);
+ if (queue->kill_thread)
+ break;
+
+ pipe_mutex_lock(queue->lock);
+ job = queue->jobs[0];
+ for (i = 1; i < queue->num_jobs; i++)
+ queue->jobs[i - 1] = queue->jobs[i];
+ queue->jobs[--queue->num_jobs].job = NULL;
+ pipe_mutex_unlock(queue->lock);
+
+ pipe_semaphore_signal(&queue->has_space);
+
+ if (job.job) {
+ queue->execute_job(job.job);
+ pipe_semaphore_signal(&job.event->done);
+ }
+ }
+
+ /* signal remaining jobs before terminating */
+ pipe_mutex_lock(queue->lock);
+ for (i = 0; i < queue->num_jobs; i++) {
+ pipe_semaphore_signal(&queue->jobs[i].event->done);
+ queue->jobs[i].j
Re: [Mesa-dev] [PATCH 1/2] gallium/util: import the multithreaded job queue from amdgpu winsys
The event doesn't limit the number of outstanding jobs. It's like a fence -
you can wait for it or you don't. The limitation is that you must have
exactly one event instance for each active job. util_queue_fence is a
better name IMO. I don't plan to extend the feature set beyond that.
Marek
On Jun 14, 2016 1:26 PM, "Nicolai Hähnle" wrote:
> On 13.06.2016 19:34, Marek Olšák wrote:
>
>> From: Marek Olšák
>>
>> ---
>> src/gallium/auxiliary/Makefile.sources| 2 +
>> src/gallium/auxiliary/util/u_queue.c | 129
>> ++
>> src/gallium/auxiliary/util/u_queue.h | 80
>> src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | 23 ++---
>> src/gallium/winsys/amdgpu/drm/amdgpu_cs.h | 4 +-
>> src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 63 +
>> src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h | 11 +--
>> 7 files changed, 229 insertions(+), 83 deletions(-)
>> create mode 100644 src/gallium/auxiliary/util/u_queue.c
>> create mode 100644 src/gallium/auxiliary/util/u_queue.h
>>
>> diff --git a/src/gallium/auxiliary/Makefile.sources
>> b/src/gallium/auxiliary/Makefile.sources
>> index 7b3853e..ab58358 100644
>> --- a/src/gallium/auxiliary/Makefile.sources
>> +++ b/src/gallium/auxiliary/Makefile.sources
>> @@ -274,6 +274,8 @@ C_SOURCES := \
>> util/u_pstipple.c \
>> util/u_pstipple.h \
>> util/u_pwr8.h \
>> + util/u_queue.c \
>> + util/u_queue.h \
>> util/u_range.h \
>> util/u_rect.h \
>> util/u_resource.c \
>> diff --git a/src/gallium/auxiliary/util/u_queue.c
>> b/src/gallium/auxiliary/util/u_queue.c
>> new file mode 100644
>> index 000..311b591
>> --- /dev/null
>> +++ b/src/gallium/auxiliary/util/u_queue.c
>> @@ -0,0 +1,129 @@
>> +/*
>> + * Copyright © 2016 Advanced Micro Devices, Inc.
>> + * All Rights Reserved.
>> + *
>> + * Permission is hereby granted, free of charge, to any person obtaining
>> + * a copy of this software and associated documentation files (the
>> + * "Software"), to deal in the Software without restriction, including
>> + * without limitation the rights to use, copy, modify, merge, publish,
>> + * distribute, sub license, and/or sell copies of the Software, and to
>> + * permit persons to whom the Software is furnished to do so, subject to
>> + * the following conditions:
>> + *
>> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
>> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
>> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
>> + * NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS, AUTHORS
>> + * AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
>> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
>> + * USE OR OTHER DEALINGS IN THE SOFTWARE.
>> + *
>> + * The above copyright notice and this permission notice (including the
>> + * next paragraph) shall be included in all copies or substantial
>> portions
>> + * of the Software.
>> + */
>> +
>> +#include "u_queue.h"
>> +
>> +static PIPE_THREAD_ROUTINE(util_queue_thread_func, param)
>> +{
>> + struct util_queue *queue = (struct util_queue*)param;
>> + unsigned i;
>> +
>> + while (1) {
>> + struct util_queue_job job;
>> +
>> + pipe_semaphore_wait(&queue->queued);
>> + if (queue->kill_thread)
>> + break;
>> +
>> + pipe_mutex_lock(queue->lock);
>> + job = queue->jobs[0];
>> + for (i = 1; i < queue->num_jobs; i++)
>> + queue->jobs[i - 1] = queue->jobs[i];
>> + queue->jobs[--queue->num_jobs].job = NULL;
>> + pipe_mutex_unlock(queue->lock);
>> +
>> + pipe_semaphore_signal(&queue->has_space);
>> +
>> + if (job.job) {
>> + queue->execute_job(job.job);
>> + pipe_semaphore_signal(&job.event->done);
>> + }
>> + }
>> +
>> + /* signal remaining jobs before terminating */
>> + pipe_mutex_lock(queue->lock);
>> + for (i = 0; i < queue->num_jobs; i++) {
>> + pipe_semaphore_signal(&queue->jobs[i].event->done);
>> + queue->jobs[i].job = NULL;
>> + }
>> + queue->num_jobs = 0;
>> + pipe_mutex_unlock(queue->lock);
>> + return 0;
>> +}
>> +
>> +void
>> +util_queue_init(struct util_queue *queue,
>> +void (*execute_job)(void *))
>> +{
>> + memset(queue, 0, sizeof(*queue));
>> + queue->execute_job = execute_job;
>> + pipe_mutex_init(queue->lock);
>> + pipe_semaphore_init(&queue->has_space, ARRAY_SIZE(queue->jobs));
>> + pipe_semaphore_init(&queue->queued, 0);
>> + queue->thread = pipe_thread_create(util_queue_thread_func, queue);
>> +}
>> +
>> +void
>> +util_queue_destroy(struct util_queue *queue)
>> +{
>> + queue->kill_thread = 1;
>> + pipe_semaphore_signal(&queue->queued);
>> + pipe_thread_wait(queue->thread);
>> + pipe_semaphore_destroy(&queue->has_space);
>> + pipe_semaphore_destroy(&queue->queue
Re: [Mesa-dev] [PATCH 1/2] gallium/util: import the multithreaded job queue from amdgpu winsys
On 13.06.2016 19:34, Marek Olšák wrote:
From: Marek Olšák
---
src/gallium/auxiliary/Makefile.sources| 2 +
src/gallium/auxiliary/util/u_queue.c | 129 ++
src/gallium/auxiliary/util/u_queue.h | 80
src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | 23 ++---
src/gallium/winsys/amdgpu/drm/amdgpu_cs.h | 4 +-
src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 63 +
src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h | 11 +--
7 files changed, 229 insertions(+), 83 deletions(-)
create mode 100644 src/gallium/auxiliary/util/u_queue.c
create mode 100644 src/gallium/auxiliary/util/u_queue.h
diff --git a/src/gallium/auxiliary/Makefile.sources
b/src/gallium/auxiliary/Makefile.sources
index 7b3853e..ab58358 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -274,6 +274,8 @@ C_SOURCES := \
util/u_pstipple.c \
util/u_pstipple.h \
util/u_pwr8.h \
+ util/u_queue.c \
+ util/u_queue.h \
util/u_range.h \
util/u_rect.h \
util/u_resource.c \
diff --git a/src/gallium/auxiliary/util/u_queue.c
b/src/gallium/auxiliary/util/u_queue.c
new file mode 100644
index 000..311b591
--- /dev/null
+++ b/src/gallium/auxiliary/util/u_queue.c
@@ -0,0 +1,129 @@
+/*
+ * Copyright © 2016 Advanced Micro Devices, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS, AUTHORS
+ * AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ */
+
+#include "u_queue.h"
+
+static PIPE_THREAD_ROUTINE(util_queue_thread_func, param)
+{
+ struct util_queue *queue = (struct util_queue*)param;
+ unsigned i;
+
+ while (1) {
+ struct util_queue_job job;
+
+ pipe_semaphore_wait(&queue->queued);
+ if (queue->kill_thread)
+ break;
+
+ pipe_mutex_lock(queue->lock);
+ job = queue->jobs[0];
+ for (i = 1; i < queue->num_jobs; i++)
+ queue->jobs[i - 1] = queue->jobs[i];
+ queue->jobs[--queue->num_jobs].job = NULL;
+ pipe_mutex_unlock(queue->lock);
+
+ pipe_semaphore_signal(&queue->has_space);
+
+ if (job.job) {
+ queue->execute_job(job.job);
+ pipe_semaphore_signal(&job.event->done);
+ }
+ }
+
+ /* signal remaining jobs before terminating */
+ pipe_mutex_lock(queue->lock);
+ for (i = 0; i < queue->num_jobs; i++) {
+ pipe_semaphore_signal(&queue->jobs[i].event->done);
+ queue->jobs[i].job = NULL;
+ }
+ queue->num_jobs = 0;
+ pipe_mutex_unlock(queue->lock);
+ return 0;
+}
+
+void
+util_queue_init(struct util_queue *queue,
+void (*execute_job)(void *))
+{
+ memset(queue, 0, sizeof(*queue));
+ queue->execute_job = execute_job;
+ pipe_mutex_init(queue->lock);
+ pipe_semaphore_init(&queue->has_space, ARRAY_SIZE(queue->jobs));
+ pipe_semaphore_init(&queue->queued, 0);
+ queue->thread = pipe_thread_create(util_queue_thread_func, queue);
+}
+
+void
+util_queue_destroy(struct util_queue *queue)
+{
+ queue->kill_thread = 1;
+ pipe_semaphore_signal(&queue->queued);
+ pipe_thread_wait(queue->thread);
+ pipe_semaphore_destroy(&queue->has_space);
+ pipe_semaphore_destroy(&queue->queued);
+ pipe_mutex_destroy(queue->lock);
+}
+
+void
+util_queue_event_init(struct util_queue_event *event)
+{
+ pipe_semaphore_init(&event->done, 1);
+}
+
+void
+util_queue_event_destroy(struct util_queue_event *event)
+{
+ pipe_semaphore_destroy(&event->done);
+}
+
+void
+util_queue_add_job(struct util_queue *queue,
+ void *job,
+ struct util_queue_event *event)
+{
+ /* Set the semaphore to "busy". */
+ pipe_semaphore_wait(&event->done);
+
+ /* if the queue is full, wait until there is space */
+ pipe_semaphore_wait(&queue->has_space);
+
+ pipe_mutex_lock(queue->lock);
+ assert(queue->num_jobs < ARRAY_SIZE(queue->jobs));
+ queue->jobs[queue->num_jo
[Mesa-dev] [PATCH 1/2] gallium/util: import the multithreaded job queue from amdgpu winsys
From: Marek Olšák
---
src/gallium/auxiliary/Makefile.sources| 2 +
src/gallium/auxiliary/util/u_queue.c | 129 ++
src/gallium/auxiliary/util/u_queue.h | 80
src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | 23 ++---
src/gallium/winsys/amdgpu/drm/amdgpu_cs.h | 4 +-
src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 63 +
src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h | 11 +--
7 files changed, 229 insertions(+), 83 deletions(-)
create mode 100644 src/gallium/auxiliary/util/u_queue.c
create mode 100644 src/gallium/auxiliary/util/u_queue.h
diff --git a/src/gallium/auxiliary/Makefile.sources
b/src/gallium/auxiliary/Makefile.sources
index 7b3853e..ab58358 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -274,6 +274,8 @@ C_SOURCES := \
util/u_pstipple.c \
util/u_pstipple.h \
util/u_pwr8.h \
+ util/u_queue.c \
+ util/u_queue.h \
util/u_range.h \
util/u_rect.h \
util/u_resource.c \
diff --git a/src/gallium/auxiliary/util/u_queue.c
b/src/gallium/auxiliary/util/u_queue.c
new file mode 100644
index 000..311b591
--- /dev/null
+++ b/src/gallium/auxiliary/util/u_queue.c
@@ -0,0 +1,129 @@
+/*
+ * Copyright © 2016 Advanced Micro Devices, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS, AUTHORS
+ * AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ */
+
+#include "u_queue.h"
+
+static PIPE_THREAD_ROUTINE(util_queue_thread_func, param)
+{
+ struct util_queue *queue = (struct util_queue*)param;
+ unsigned i;
+
+ while (1) {
+ struct util_queue_job job;
+
+ pipe_semaphore_wait(&queue->queued);
+ if (queue->kill_thread)
+ break;
+
+ pipe_mutex_lock(queue->lock);
+ job = queue->jobs[0];
+ for (i = 1; i < queue->num_jobs; i++)
+ queue->jobs[i - 1] = queue->jobs[i];
+ queue->jobs[--queue->num_jobs].job = NULL;
+ pipe_mutex_unlock(queue->lock);
+
+ pipe_semaphore_signal(&queue->has_space);
+
+ if (job.job) {
+ queue->execute_job(job.job);
+ pipe_semaphore_signal(&job.event->done);
+ }
+ }
+
+ /* signal remaining jobs before terminating */
+ pipe_mutex_lock(queue->lock);
+ for (i = 0; i < queue->num_jobs; i++) {
+ pipe_semaphore_signal(&queue->jobs[i].event->done);
+ queue->jobs[i].job = NULL;
+ }
+ queue->num_jobs = 0;
+ pipe_mutex_unlock(queue->lock);
+ return 0;
+}
+
+void
+util_queue_init(struct util_queue *queue,
+void (*execute_job)(void *))
+{
+ memset(queue, 0, sizeof(*queue));
+ queue->execute_job = execute_job;
+ pipe_mutex_init(queue->lock);
+ pipe_semaphore_init(&queue->has_space, ARRAY_SIZE(queue->jobs));
+ pipe_semaphore_init(&queue->queued, 0);
+ queue->thread = pipe_thread_create(util_queue_thread_func, queue);
+}
+
+void
+util_queue_destroy(struct util_queue *queue)
+{
+ queue->kill_thread = 1;
+ pipe_semaphore_signal(&queue->queued);
+ pipe_thread_wait(queue->thread);
+ pipe_semaphore_destroy(&queue->has_space);
+ pipe_semaphore_destroy(&queue->queued);
+ pipe_mutex_destroy(queue->lock);
+}
+
+void
+util_queue_event_init(struct util_queue_event *event)
+{
+ pipe_semaphore_init(&event->done, 1);
+}
+
+void
+util_queue_event_destroy(struct util_queue_event *event)
+{
+ pipe_semaphore_destroy(&event->done);
+}
+
+void
+util_queue_add_job(struct util_queue *queue,
+ void *job,
+ struct util_queue_event *event)
+{
+ /* Set the semaphore to "busy". */
+ pipe_semaphore_wait(&event->done);
+
+ /* if the queue is full, wait until there is space */
+ pipe_semaphore_wait(&queue->has_space);
+
+ pipe_mutex_lock(queue->lock);
+ assert(queue->num_jobs < ARRAY_SIZE(queue->jobs));
+ queue->jobs[queue->num_jobs].job = job;
+ queue->jobs[queue->num_jobs].even
