zink: merge all the batch state sets onto the struct

less memory fragmentation

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18135>

diff --git a/src/gallium/drivers/zink/zink_batch.c b/src/gallium/drivers/zink/zink_batch.c
index fde3383..1542f35 100644 (file)
--- a/src/gallium/drivers/zink/zink_batch.c
+++ b/src/gallium/drivers/zink/zink_batch.c
@@ -30,7 +30,7 @@ zink_reset_batch_state(struct zink_context *ctx, struct zink_batch_state *bs)
       mesa_loge("ZINK: vkResetCommandPool failed (%s)", vk_Result_to_str(result));
 
    /* unref all used resources */
-   set_foreach_remove(bs->resources, entry) {
+   set_foreach_remove(&bs->resources, entry) {
       struct zink_resource_object *obj = (struct zink_resource_object *)entry->key;
       if (!zink_resource_object_usage_unset(obj, bs)) {
          obj->unordered_read = obj->unordered_write = false;
@@ -49,17 +49,17 @@ zink_reset_batch_state(struct zink_context *ctx, struct zink_batch_state *bs)
       }
    }
 
-   set_foreach_remove(bs->active_queries, entry) {
+   set_foreach_remove(&bs->active_queries, entry) {
       struct zink_query *query = (void*)entry->key;
       zink_prune_query(screen, bs, query);
    }
 
-   set_foreach_remove(bs->surfaces, entry) {
+   set_foreach_remove(&bs->surfaces, entry) {
       struct zink_surface *surf = (struct zink_surface *)entry->key;
       zink_batch_usage_unset(&surf->batch_uses, bs);
       zink_surface_reference(screen, &surf, NULL);
    }
-   set_foreach_remove(bs->bufferviews, entry) {
+   set_foreach_remove(&bs->bufferviews, entry) {
       struct zink_buffer_view *buffer_view = (struct zink_buffer_view *)entry->key;
       zink_batch_usage_unset(&buffer_view->batch_uses, bs);
       zink_buffer_view_reference(screen, &buffer_view, NULL);
@@ -77,7 +77,7 @@ zink_reset_batch_state(struct zink_context *ctx, struct zink_batch_state *bs)
 
    zink_batch_descriptor_reset(screen, bs);
 
-   set_foreach_remove(bs->programs, entry) {
+   set_foreach_remove(&bs->programs, entry) {
       struct zink_program *pg = (struct zink_program*)entry->key;
       zink_batch_usage_unset(&pg->batch_uses, bs);
       zink_program_reference(ctx, &pg, NULL);
@@ -178,10 +178,6 @@ zink_batch_state_destroy(struct zink_screen *screen, struct zink_batch_state *bs
    util_dynarray_fini(&bs->acquires);
    util_dynarray_fini(&bs->acquire_flags);
    util_dynarray_fini(&bs->dead_swapchains);
-   _mesa_set_destroy(bs->surfaces, NULL);
-   _mesa_set_destroy(bs->bufferviews, NULL);
-   _mesa_set_destroy(bs->programs, NULL);
-   _mesa_set_destroy(bs->active_queries, NULL);
    zink_batch_descriptor_deinit(screen, bs);
    ralloc_free(bs);
 }
@@ -219,17 +215,16 @@ create_batch_state(struct zink_context *ctx)
    }
 
 #define SET_CREATE_OR_FAIL(ptr) \
-   ptr = _mesa_pointer_set_create(bs); \
-   if (!ptr) \
+   if (!_mesa_set_init(ptr, bs, _mesa_hash_pointer, _mesa_key_pointer_equal)) \
       goto fail
 
    bs->ctx = ctx;
 
-   SET_CREATE_OR_FAIL(bs->resources);
-   SET_CREATE_OR_FAIL(bs->surfaces);
-   SET_CREATE_OR_FAIL(bs->bufferviews);
-   SET_CREATE_OR_FAIL(bs->programs);
-   SET_CREATE_OR_FAIL(bs->active_queries);
+   SET_CREATE_OR_FAIL(&bs->resources);
+   SET_CREATE_OR_FAIL(&bs->surfaces);
+   SET_CREATE_OR_FAIL(&bs->bufferviews);
+   SET_CREATE_OR_FAIL(&bs->programs);
+   SET_CREATE_OR_FAIL(&bs->active_queries);
    util_dynarray_init(&bs->wait_semaphores, NULL);
    util_dynarray_init(&bs->wait_semaphore_stages, NULL);
    util_dynarray_init(&bs->zombie_samplers, NULL);
@@ -559,7 +554,7 @@ check_oom_flush(struct zink_context *ctx, const struct zink_batch *batch)
 void
 zink_batch_reference_resource(struct zink_batch *batch, struct zink_resource *res)
 {
-   if (!batch_ptr_add_usage(batch, batch->state->resources, res->obj))
+   if (!batch_ptr_add_usage(batch, &batch->state->resources, res->obj))
       return;
    pipe_reference(NULL, &res->obj->reference);
    batch->state->resource_size += res->obj->size;
@@ -570,7 +565,7 @@ zink_batch_reference_resource(struct zink_batch *batch, struct zink_resource *re
 void
 zink_batch_reference_resource_move(struct zink_batch *batch, struct zink_resource *res)
 {
-   if (!batch_ptr_add_usage(batch, batch->state->resources, res->obj))
+   if (!batch_ptr_add_usage(batch, &batch->state->resources, res->obj))
       return;
    batch->state->resource_size += res->obj->size;
    check_oom_flush(batch->state->ctx, batch);
@@ -580,7 +575,7 @@ zink_batch_reference_resource_move(struct zink_batch *batch, struct zink_resourc
 void
 zink_batch_reference_bufferview(struct zink_batch *batch, struct zink_buffer_view *buffer_view)
 {
-   if (!batch_ptr_add_usage(batch, batch->state->bufferviews, buffer_view))
+   if (!batch_ptr_add_usage(batch, &batch->state->bufferviews, buffer_view))
       return;
    pipe_reference(NULL, &buffer_view->reference);
    batch->has_work = true;
@@ -589,7 +584,7 @@ zink_batch_reference_bufferview(struct zink_batch *batch, struct zink_buffer_vie
 void
 zink_batch_reference_surface(struct zink_batch *batch, struct zink_surface *surface)
 {
-   if (!batch_ptr_add_usage(batch, batch->state->surfaces, surface))
+   if (!batch_ptr_add_usage(batch, &batch->state->surfaces, surface))
       return;
    struct pipe_surface *surf = NULL;
    pipe_surface_reference(&surf, &surface->base);
@@ -614,7 +609,7 @@ zink_batch_reference_program(struct zink_batch *batch,
                              struct zink_program *pg)
 {
    if (zink_batch_usage_matches(pg->batch_uses, batch->state) ||
-       !batch_ptr_add_usage(batch, batch->state->programs, pg))
+       !batch_ptr_add_usage(batch, &batch->state->programs, pg))
       return;
    pipe_reference(NULL, &pg->reference);
    zink_batch_usage_set(&pg->batch_uses, batch->state);

diff --git a/src/gallium/drivers/zink/zink_query.c b/src/gallium/drivers/zink/zink_query.c
index db9a853..1a0c494 100644 (file)
--- a/src/gallium/drivers/zink/zink_query.c
+++ b/src/gallium/drivers/zink/zink_query.c
@@ -831,7 +831,7 @@ begin_query(struct zink_context *ctx, struct zink_batch *batch, struct zink_quer
       VKCTX(CmdWriteTimestamp)(batch->state->cmdbuf, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, start->vkq[0]->pool->query_pool, start->vkq[0]->query_id);
       update_qbo(ctx, q);
       zink_batch_usage_set(&q->batch_uses, batch->state);
-      _mesa_set_add(batch->state->active_queries, q);
+      _mesa_set_add(&batch->state->active_queries, q);
    }
    /* ignore the rest of begin_query for timestamps */
    if (is_time_query(q))
@@ -866,7 +866,7 @@ begin_query(struct zink_context *ctx, struct zink_batch *batch, struct zink_quer
    if (needs_stats_list(q))
       list_addtail(&q->stats_list, &ctx->primitives_generated_queries);
    zink_batch_usage_set(&q->batch_uses, batch->state);
-   _mesa_set_add(batch->state->active_queries, q);
+   _mesa_set_add(&batch->state->active_queries, q);
    if (q->needs_rast_discard_workaround) {
       ctx->primitives_generated_active = true;
       if (zink_set_rasterizer_discard(ctx, true))
@@ -997,7 +997,7 @@ zink_end_query(struct pipe_context *pctx,
       VKCTX(CmdWriteTimestamp)(batch->state->cmdbuf, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
                                start->vkq[0]->pool->query_pool, start->vkq[0]->query_id);
       zink_batch_usage_set(&query->batch_uses, batch->state);
-      _mesa_set_add(batch->state->active_queries, query);
+      _mesa_set_add(&batch->state->active_queries, query);
       check_update(ctx, query);
    } else if (query->active)
       end_query(ctx, batch, query);
@@ -1054,7 +1054,7 @@ suspend_query(struct zink_context *ctx, struct zink_query *query)
 void
 zink_suspend_queries(struct zink_context *ctx, struct zink_batch *batch)
 {
-   set_foreach(batch->state->active_queries, entry) {
+   set_foreach(&batch->state->active_queries, entry) {
       struct zink_query *query = (void*)entry->key;
       if (query->active && !is_time_query(query))
          /* the fence is going to steal the set off the batch, so we have to copy

diff --git a/src/gallium/drivers/zink/zink_types.h b/src/gallium/drivers/zink/zink_types.h
index 069ebdc..95dbf81 100644 (file)
--- a/src/gallium/drivers/zink/zink_types.h
+++ b/src/gallium/drivers/zink/zink_types.h
@@ -436,11 +436,11 @@ struct zink_batch_state {
 
    struct util_queue_fence flush_completed;
 
-   struct set *programs;
+   struct set programs;
 
-   struct set *resources;
-   struct set *surfaces;
-   struct set *bufferviews;
+   struct set resources;
+   struct set surfaces;
+   struct set bufferviews;
 
    struct util_dynarray unref_resources;
    struct util_dynarray bindless_releases[2];
@@ -449,7 +449,7 @@ struct zink_batch_state {
    struct util_dynarray zombie_samplers;
    struct util_dynarray dead_framebuffers;
 
-   struct set *active_queries; /* zink_query objects which were active at some point in this batch */
+   struct set active_queries; /* zink_query objects which were active at some point in this batch */
 
    struct zink_batch_descriptor_data dd;