Module: Mesa Branch: main Commit: 5a15c3eff7713504a0f9ada08588d4c0349719ec URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5a15c3eff7713504a0f9ada08588d4c0349719ec
Author: Jason Ekstrand <[email protected]> Date: Mon Feb 7 15:22:54 2022 -0600 anv: Drop anv_cmd_buffer::pool Reviewed-by: Lionel Landwerlin <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14917> --- src/intel/vulkan/anv_batch_chain.c | 26 +++++++++++++------------- src/intel/vulkan/anv_blorp.c | 4 ++-- src/intel/vulkan/anv_cmd_buffer.c | 15 +++++++++------ src/intel/vulkan/anv_measure.c | 4 ++-- src/intel/vulkan/anv_private.h | 2 +- src/intel/vulkan/genX_blorp_exec.c | 8 ++++---- src/intel/vulkan/genX_cmd_buffer.c | 14 +++++++------- src/intel/vulkan/genX_query.c | 2 +- 8 files changed, 39 insertions(+), 36 deletions(-) diff --git a/src/intel/vulkan/anv_batch_chain.c b/src/intel/vulkan/anv_batch_chain.c index 70e61807c86..83552324558 100644 --- a/src/intel/vulkan/anv_batch_chain.c +++ b/src/intel/vulkan/anv_batch_chain.c @@ -349,7 +349,7 @@ anv_batch_bo_create(struct anv_cmd_buffer *cmd_buffer, { VkResult result; - struct anv_batch_bo *bbo = vk_alloc(&cmd_buffer->pool->vk.alloc, sizeof(*bbo), + struct anv_batch_bo *bbo = vk_alloc(&cmd_buffer->vk.pool->alloc, sizeof(*bbo), 8, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); if (bbo == NULL) return vk_error(cmd_buffer, VK_ERROR_OUT_OF_HOST_MEMORY); @@ -359,7 +359,7 @@ anv_batch_bo_create(struct anv_cmd_buffer *cmd_buffer, if (result != VK_SUCCESS) goto fail_alloc; - result = anv_reloc_list_init(&bbo->relocs, &cmd_buffer->pool->vk.alloc); + result = anv_reloc_list_init(&bbo->relocs, &cmd_buffer->vk.pool->alloc); if (result != VK_SUCCESS) goto fail_bo_alloc; @@ -370,7 +370,7 @@ anv_batch_bo_create(struct anv_cmd_buffer *cmd_buffer, fail_bo_alloc: anv_bo_pool_free(&cmd_buffer->device->batch_bo_pool, bbo->bo); fail_alloc: - vk_free(&cmd_buffer->pool->vk.alloc, bbo); + vk_free(&cmd_buffer->vk.pool->alloc, bbo); return result; } @@ -382,7 +382,7 @@ anv_batch_bo_clone(struct anv_cmd_buffer *cmd_buffer, { VkResult result; - struct anv_batch_bo *bbo = vk_alloc(&cmd_buffer->pool->vk.alloc, sizeof(*bbo), + struct anv_batch_bo *bbo = vk_alloc(&cmd_buffer->vk.pool->alloc, sizeof(*bbo), 8, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); if (bbo == NULL) return vk_error(cmd_buffer, VK_ERROR_OUT_OF_HOST_MEMORY); @@ -392,7 +392,7 @@ anv_batch_bo_clone(struct anv_cmd_buffer *cmd_buffer, if (result != VK_SUCCESS) goto fail_alloc; - result = anv_reloc_list_init_clone(&bbo->relocs, &cmd_buffer->pool->vk.alloc, + result = anv_reloc_list_init_clone(&bbo->relocs, &cmd_buffer->vk.pool->alloc, &other_bbo->relocs); if (result != VK_SUCCESS) goto fail_bo_alloc; @@ -406,7 +406,7 @@ anv_batch_bo_clone(struct anv_cmd_buffer *cmd_buffer, fail_bo_alloc: anv_bo_pool_free(&cmd_buffer->device->batch_bo_pool, bbo->bo); fail_alloc: - vk_free(&cmd_buffer->pool->vk.alloc, bbo); + vk_free(&cmd_buffer->vk.pool->alloc, bbo); return result; } @@ -508,9 +508,9 @@ static void anv_batch_bo_destroy(struct anv_batch_bo *bbo, struct anv_cmd_buffer *cmd_buffer) { - anv_reloc_list_finish(&bbo->relocs, &cmd_buffer->pool->vk.alloc); + anv_reloc_list_finish(&bbo->relocs, &cmd_buffer->vk.pool->alloc); anv_bo_pool_free(&cmd_buffer->device->batch_bo_pool, bbo->bo); - vk_free(&cmd_buffer->pool->vk.alloc, bbo); + vk_free(&cmd_buffer->vk.pool->alloc, bbo); } static VkResult @@ -639,7 +639,7 @@ anv_cmd_buffer_record_chain_submit(struct anv_cmd_buffer *cmd_buffer_from, .start = last_bbo->bo->map, .end = last_bbo->bo->map + last_bbo->bo->size, .relocs = &last_bbo->relocs, - .alloc = &cmd_buffer_from->pool->vk.alloc, + .alloc = &cmd_buffer_from->vk.pool->alloc, }; __anv_cmd_pack(GFX8_MI_BATCH_BUFFER_START)(&local_batch, bb_start, &gen_bb_start); @@ -852,7 +852,7 @@ anv_cmd_buffer_init_batch_bo_chain(struct anv_cmd_buffer *cmd_buffer) list_addtail(&batch_bo->link, &cmd_buffer->batch_bos); - cmd_buffer->batch.alloc = &cmd_buffer->pool->vk.alloc; + cmd_buffer->batch.alloc = &cmd_buffer->vk.pool->alloc; cmd_buffer->batch.user_data = cmd_buffer; if (cmd_buffer->device->can_chain_batches) { @@ -877,7 +877,7 @@ anv_cmd_buffer_init_batch_bo_chain(struct anv_cmd_buffer *cmd_buffer) goto fail_seen_bbos; result = anv_reloc_list_init(&cmd_buffer->surface_relocs, - &cmd_buffer->pool->vk.alloc); + &cmd_buffer->vk.pool->alloc); if (result != VK_SUCCESS) goto fail_bt_blocks; cmd_buffer->last_ss_pool_center = 0; @@ -906,7 +906,7 @@ anv_cmd_buffer_fini_batch_bo_chain(struct anv_cmd_buffer *cmd_buffer) anv_binding_table_pool_free(cmd_buffer->device, *bt_block); u_vector_finish(&cmd_buffer->bt_block_states); - anv_reloc_list_finish(&cmd_buffer->surface_relocs, &cmd_buffer->pool->vk.alloc); + anv_reloc_list_finish(&cmd_buffer->surface_relocs, &cmd_buffer->vk.pool->alloc); u_vector_finish(&cmd_buffer->seen_bbos); @@ -1167,7 +1167,7 @@ anv_cmd_buffer_add_secondary(struct anv_cmd_buffer *primary, assert(!"Invalid execution mode"); } - anv_reloc_list_append(&primary->surface_relocs, &primary->pool->vk.alloc, + anv_reloc_list_append(&primary->surface_relocs, &primary->vk.pool->alloc, &secondary->surface_relocs, 0); } diff --git a/src/intel/vulkan/anv_blorp.c b/src/intel/vulkan/anv_blorp.c index 9f0fe902d7c..e16aaa75f55 100644 --- a/src/intel/vulkan/anv_blorp.c +++ b/src/intel/vulkan/anv_blorp.c @@ -137,8 +137,8 @@ static void anv_blorp_batch_init(struct anv_cmd_buffer *cmd_buffer, struct blorp_batch *batch, enum blorp_batch_flags flags) { - if (!(cmd_buffer->pool->queue_family->queueFlags & VK_QUEUE_GRAPHICS_BIT)) { - assert(cmd_buffer->pool->queue_family->queueFlags & VK_QUEUE_COMPUTE_BIT); + if (!(cmd_buffer->queue_family->queueFlags & VK_QUEUE_GRAPHICS_BIT)) { + assert(cmd_buffer->queue_family->queueFlags & VK_QUEUE_COMPUTE_BIT); flags |= BLORP_BATCH_USE_COMPUTE; } diff --git a/src/intel/vulkan/anv_cmd_buffer.c b/src/intel/vulkan/anv_cmd_buffer.c index 0aae0eac1c2..b06db9ac08f 100644 --- a/src/intel/vulkan/anv_cmd_buffer.c +++ b/src/intel/vulkan/anv_cmd_buffer.c @@ -238,7 +238,7 @@ anv_cmd_pipeline_state_finish(struct anv_cmd_buffer *cmd_buffer, if (pipe_state->push_descriptors[i]) { anv_descriptor_set_layout_unref(cmd_buffer->device, pipe_state->push_descriptors[i]->set.layout); - vk_free(&cmd_buffer->pool->vk.alloc, pipe_state->push_descriptors[i]); + vk_free(&cmd_buffer->vk.pool->alloc, pipe_state->push_descriptors[i]); } } } @@ -251,7 +251,7 @@ anv_cmd_state_finish(struct anv_cmd_buffer *cmd_buffer) anv_cmd_pipeline_state_finish(cmd_buffer, &state->gfx.base); anv_cmd_pipeline_state_finish(cmd_buffer, &state->compute.base); - vk_free(&cmd_buffer->pool->vk.alloc, state->attachments); + vk_free(&cmd_buffer->vk.pool->alloc, state->attachments); } static void @@ -282,7 +282,10 @@ static VkResult anv_create_cmd_buffer( cmd_buffer->batch.status = VK_SUCCESS; cmd_buffer->device = device; - cmd_buffer->pool = pool; + + assert(pool->vk.queue_family_index < device->physical->queue.family_count); + cmd_buffer->queue_family = + &device->physical->queue.families[pool->vk.queue_family_index]; result = anv_cmd_buffer_init_batch_bo_chain(cmd_buffer); if (result != VK_SUCCESS) @@ -362,10 +365,10 @@ anv_cmd_buffer_destroy(struct anv_cmd_buffer *cmd_buffer) anv_cmd_state_finish(cmd_buffer); - vk_free(&cmd_buffer->pool->vk.alloc, cmd_buffer->self_mod_locations); + vk_free(&cmd_buffer->vk.pool->alloc, cmd_buffer->self_mod_locations); vk_command_buffer_finish(&cmd_buffer->vk); - vk_free(&cmd_buffer->pool->vk.alloc, cmd_buffer); + vk_free(&cmd_buffer->vk.pool->alloc, cmd_buffer); } void anv_FreeCommandBuffers( @@ -1527,7 +1530,7 @@ anv_cmd_buffer_push_descriptor_set(struct anv_cmd_buffer *cmd_buffer, &pipe_state->push_descriptors[_set]; if (*push_set == NULL) { - *push_set = vk_zalloc(&cmd_buffer->pool->vk.alloc, + *push_set = vk_zalloc(&cmd_buffer->vk.pool->alloc, sizeof(struct anv_push_descriptor_set), 8, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); if (*push_set == NULL) { diff --git a/src/intel/vulkan/anv_measure.c b/src/intel/vulkan/anv_measure.c index 75ed941943a..c77ac00bf71 100644 --- a/src/intel/vulkan/anv_measure.c +++ b/src/intel/vulkan/anv_measure.c @@ -108,7 +108,7 @@ anv_measure_init(struct anv_cmd_buffer *cmd_buffer) const size_t batch_bytes = sizeof(struct anv_measure_batch) + config->batch_size * sizeof(struct intel_measure_snapshot); struct anv_measure_batch * measure = - vk_alloc(&cmd_buffer->pool->vk.alloc, + vk_alloc(&cmd_buffer->vk.pool->alloc, batch_bytes, 8, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); @@ -363,7 +363,7 @@ anv_measure_destroy(struct anv_cmd_buffer *cmd_buffer) intel_measure_gather(&physical->measure_device, &physical->info); anv_device_release_bo(device, measure->bo); - vk_free(&cmd_buffer->pool->vk.alloc, measure); + vk_free(&cmd_buffer->vk.pool->alloc, measure); cmd_buffer->measure = NULL; } diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index 7bce8bc1d04..b6de17d01d4 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -3154,7 +3154,7 @@ struct anv_cmd_buffer { struct anv_device * device; - struct anv_cmd_pool * pool; + struct anv_queue_family * queue_family; struct list_head pool_link; struct anv_batch batch; diff --git a/src/intel/vulkan/genX_blorp_exec.c b/src/intel/vulkan/genX_blorp_exec.c index 5700a739a22..9d235afaaf3 100644 --- a/src/intel/vulkan/genX_blorp_exec.c +++ b/src/intel/vulkan/genX_blorp_exec.c @@ -86,7 +86,7 @@ blorp_surface_reloc(struct blorp_batch *batch, uint32_t ss_offset, if (ANV_ALWAYS_SOFTPIN) { result = anv_reloc_list_add_bo(&cmd_buffer->surface_relocs, - &cmd_buffer->pool->vk.alloc, + &cmd_buffer->vk.pool->alloc, address.buffer); if (unlikely(result != VK_SUCCESS)) anv_batch_set_error(&cmd_buffer->batch, result); @@ -95,7 +95,7 @@ blorp_surface_reloc(struct blorp_batch *batch, uint32_t ss_offset, uint64_t address_u64 = 0; result = anv_reloc_list_add(&cmd_buffer->surface_relocs, - &cmd_buffer->pool->vk.alloc, + &cmd_buffer->vk.pool->alloc, ss_offset, address.buffer, address.offset + delta, &address_u64); @@ -272,7 +272,7 @@ blorp_exec_on_render(struct blorp_batch *batch, assert((batch->flags & BLORP_BATCH_USE_COMPUTE) == 0); struct anv_cmd_buffer *cmd_buffer = batch->driver_batch; - assert(cmd_buffer->pool->queue_family->queueFlags & VK_QUEUE_GRAPHICS_BIT); + assert(cmd_buffer->queue_family->queueFlags & VK_QUEUE_GRAPHICS_BIT); const unsigned scale = params->fast_clear_op ? UINT_MAX : 1; genX(cmd_buffer_emit_hashing_mode)(cmd_buffer, params->x1 - params->x0, @@ -356,7 +356,7 @@ blorp_exec_on_compute(struct blorp_batch *batch, assert(batch->flags & BLORP_BATCH_USE_COMPUTE); struct anv_cmd_buffer *cmd_buffer = batch->driver_batch; - assert(cmd_buffer->pool->queue_family->queueFlags & VK_QUEUE_COMPUTE_BIT); + assert(cmd_buffer->queue_family->queueFlags & VK_QUEUE_COMPUTE_BIT); genX(flush_pipeline_select_gpgpu)(cmd_buffer); diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 153ca1ecb92..df791bb8f72 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -87,7 +87,7 @@ convert_pc_to_bits(struct GENX(PIPE_CONTROL) *pc) { static bool is_render_queue_cmd_buffer(const struct anv_cmd_buffer *cmd_buffer) { - struct anv_queue_family *queue_family = cmd_buffer->pool->queue_family; + struct anv_queue_family *queue_family = cmd_buffer->queue_family; return (queue_family->queueFlags & VK_QUEUE_GRAPHICS_BIT) != 0; } @@ -295,12 +295,12 @@ add_surface_reloc(struct anv_cmd_buffer *cmd_buffer, if (anv_use_relocations(cmd_buffer->device->physical)) { const struct isl_device *isl_dev = &cmd_buffer->device->isl_dev; result = anv_reloc_list_add(&cmd_buffer->surface_relocs, - &cmd_buffer->pool->vk.alloc, + &cmd_buffer->vk.pool->alloc, state.offset + isl_dev->ss.addr_offset, addr.bo, addr.offset, NULL); } else { result = anv_reloc_list_add_bo(&cmd_buffer->surface_relocs, - &cmd_buffer->pool->vk.alloc, + &cmd_buffer->vk.pool->alloc, addr.bo); } @@ -320,7 +320,7 @@ add_surface_state_relocs(struct anv_cmd_buffer *cmd_buffer, if (!anv_address_is_null(state.aux_address)) { VkResult result = anv_reloc_list_add(&cmd_buffer->surface_relocs, - &cmd_buffer->pool->vk.alloc, + &cmd_buffer->vk.pool->alloc, state.state.offset + isl_dev->ss.aux_addr_offset, state.aux_address.bo, state.aux_address.offset, @@ -332,7 +332,7 @@ add_surface_state_relocs(struct anv_cmd_buffer *cmd_buffer, if (!anv_address_is_null(state.clear_address)) { VkResult result = anv_reloc_list_add(&cmd_buffer->surface_relocs, - &cmd_buffer->pool->vk.alloc, + &cmd_buffer->vk.pool->alloc, state.state.offset + isl_dev->ss.clear_color_state_offset, state.clear_address.bo, @@ -1544,10 +1544,10 @@ cmd_buffer_alloc_state_attachments(struct anv_cmd_buffer *cmd_buffer, { struct anv_cmd_state *state = &cmd_buffer->state; - vk_free(&cmd_buffer->pool->vk.alloc, state->attachments); + vk_free(&cmd_buffer->vk.pool->alloc, state->attachments); if (attachment_count > 0) { - state->attachments = vk_zalloc(&cmd_buffer->pool->vk.alloc, + state->attachments = vk_zalloc(&cmd_buffer->vk.pool->alloc, attachment_count * sizeof(state->attachments[0]), 8, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); diff --git a/src/intel/vulkan/genX_query.c b/src/intel/vulkan/genX_query.c index e3a293edfea..a1b92123065 100644 --- a/src/intel/vulkan/genX_query.c +++ b/src/intel/vulkan/genX_query.c @@ -335,7 +335,7 @@ khr_perf_query_ensure_relocs(struct anv_cmd_buffer *cmd_buffer) const struct anv_physical_device *pdevice = device->physical; cmd_buffer->self_mod_locations = - vk_alloc(&cmd_buffer->pool->vk.alloc, + vk_alloc(&cmd_buffer->vk.pool->alloc, pdevice->n_perf_query_commands * sizeof(*cmd_buffer->self_mod_locations), 8, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
