OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: move semaphore caching to zink_reset_batch_state()

Browse Source 
this makes semaphores available for reuse more rapidly

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20681>
This commit is contained in:
Mike Blumenkrantz
2023-01-12 14:25:25 -05:00
committed by Marge Bot
parent b8252784cf
commit 7399b2241f
2 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/gallium/drivers/zink/zink_batch.c
View File

@@ -139,14 +139,15 @@ zink_reset_batch_state(struct zink_context *ctx, struct zink_batch_state *bs)
util_dynarray_clear(&bs->wait_semaphore_stages); util_dynarray_clear(&bs->wait_semaphore_stages);
bs->present = VK_NULL_HANDLE; bs->present = VK_NULL_HANDLE;
/* semaphores are not destroyed here; /* check the arrays first to avoid locking unnecessarily */
* destroying semaphores triggers ioctls, so defer deletion to the submit thread to avoid blocking if (util_dynarray_contains(&bs->acquires, VkSemaphore) || util_dynarray_contains(&bs->wait_semaphores, VkSemaphore)) {
*/ simple_mtx_lock(&screen->semaphores_lock);
memcpy(&bs->unref_semaphores, &bs->acquires, sizeof(struct util_dynarray)); util_dynarray_append_dynarray(&screen->semaphores, &bs->acquires);
util_dynarray_init(&bs->acquires, NULL); util_dynarray_clear(&bs->acquires);
while (util_dynarray_contains(&bs->wait_semaphores, VkSemaphore)) util_dynarray_append_dynarray(&screen->semaphores, &bs->wait_semaphores);
util_dynarray_append(&bs->unref_semaphores, VkSemaphore, util_dynarray_pop(&bs->wait_semaphores, VkSemaphore)); util_dynarray_clear(&bs->wait_semaphores);
util_dynarray_init(&bs->wait_semaphores, NULL); simple_mtx_unlock(&screen->semaphores_lock);
}
bs->swapchain = NULL; bs->swapchain = NULL;
/* only reset submitted here so that tc fence desync can pick up the 'completed' flag /* only reset submitted here so that tc fence desync can pick up the 'completed' flag
@@ -198,13 +199,6 @@ unref_resources(struct zink_screen *screen, struct zink_batch_state *bs)
/* this is typically where resource objects get destroyed */ /* this is typically where resource objects get destroyed */
zink_resource_object_reference(screen, &obj, NULL); zink_resource_object_reference(screen, &obj, NULL);
} }
/* check the arrays first to avoid locking unnecessarily */
if (!util_dynarray_contains(&bs->unref_semaphores, VkSemaphore))
return;
simple_mtx_lock(&screen->semaphores_lock);
util_dynarray_append_dynarray(&screen->semaphores, &bs->unref_semaphores);
util_dynarray_clear(&bs->unref_semaphores);
simple_mtx_unlock(&screen->semaphores_lock);
} }
/* utility for resetting a batch state; called on context destruction */ /* utility for resetting a batch state; called on context destruction */
@@ -274,7 +268,6 @@ zink_batch_state_destroy(struct zink_screen *screen, struct zink_batch_state *bs
util_dynarray_fini(&bs->bindless_releases[0]); util_dynarray_fini(&bs->bindless_releases[0]);
util_dynarray_fini(&bs->bindless_releases[1]); util_dynarray_fini(&bs->bindless_releases[1]);
util_dynarray_fini(&bs->acquires); util_dynarray_fini(&bs->acquires);
util_dynarray_fini(&bs->unref_semaphores);
util_dynarray_fini(&bs->acquire_flags); util_dynarray_fini(&bs->acquire_flags);
zink_batch_descriptor_deinit(screen, bs); zink_batch_descriptor_deinit(screen, bs);
ralloc_free(bs); ralloc_free(bs);
@@ -331,7 +324,6 @@ create_batch_state(struct zink_context *ctx)
util_dynarray_init(&bs->persistent_resources, NULL); util_dynarray_init(&bs->persistent_resources, NULL);
util_dynarray_init(&bs->unref_resources, NULL); util_dynarray_init(&bs->unref_resources, NULL);
util_dynarray_init(&bs->acquires, NULL); util_dynarray_init(&bs->acquires, NULL);
util_dynarray_init(&bs->unref_semaphores, NULL);
util_dynarray_init(&bs->acquire_flags, NULL); util_dynarray_init(&bs->acquire_flags, NULL);
util_dynarray_init(&bs->bindless_releases[0], NULL); util_dynarray_init(&bs->bindless_releases[0], NULL);
util_dynarray_init(&bs->bindless_releases[1], NULL); util_dynarray_init(&bs->bindless_releases[1], NULL);

1
src/gallium/drivers/zink/zink_types.h
View File

@@ -544,7 +544,6 @@ struct zink_batch_state {
struct zink_resource *swapchain; struct zink_resource *swapchain;
struct util_dynarray acquires; struct util_dynarray acquires;
struct util_dynarray acquire_flags; struct util_dynarray acquire_flags;
struct util_dynarray unref_semaphores;
struct util_queue_fence flush_completed; struct util_queue_fence flush_completed;