AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util/u_queue: always enable UTIL_QUEUE_INIT_SCALE_THREADS, remove the flag

Browse Source 
It means that threads are created on demand except for the first one.
It reduces process startup time.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24173>
This commit is contained in:
Marek Olšák
2023-07-16 03:44:53 -04:00
parent bfdfe5aa82
commit 4b93ae7e7a
5 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/u_queue.c
+5 -5
View File
@@ -442,9 +442,10 @@ util_queue_init(struct util_queue *queue,
snprintf(queue->name, sizeof(queue->name), "%s", name);
}
queue->create_threads_on_demand = true;
queue->flags = flags;
queue->max_threads = num_threads;
queue->num_threads = (flags & UTIL_QUEUE_INIT_SCALE_THREADS) ? 1 : num_threads;
queue->num_threads = 1;
queue->max_jobs = max_jobs;
queue->global_data = global_data;
@@ -582,7 +583,7 @@ util_queue_add_job_locked(struct util_queue *queue,
/* Scale the number of threads up if there's already one job waiting. */
if (queue->num_queued > 0 &&
queue->flags & UTIL_QUEUE_INIT_SCALE_THREADS &&
queue->create_threads_on_demand &&
execute != util_queue_finish_execute &&
queue->num_threads < queue->max_threads) {
util_queue_adjust_num_threads(queue, queue->num_threads + 1, true);
@@ -719,8 +720,7 @@ util_queue_finish(struct util_queue *queue)
* Also note that util_queue_add_job can unlock the mutex if there is not
* enough space in the queue and wait for space.
*/
unsigned saved_flags = queue->flags;
queue->flags &= ~UTIL_QUEUE_INIT_SCALE_THREADS;
queue->create_threads_on_demand = false;
fences = malloc(queue->num_threads * sizeof(*fences));
util_barrier_init(&barrier, queue->num_threads);
@@ -730,7 +730,7 @@ util_queue_finish(struct util_queue *queue)
util_queue_add_job_locked(queue, &barrier, &fences[i],
util_queue_finish_execute, NULL, 0, true);
}
queue->flags = saved_flags;
queue->create_threads_on_demand = true;
mtx_unlock(&queue->lock);
for (unsigned i = 0; i < queue->num_threads; ++i) {