fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-07 00:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

venus: handle empty resolved query feedback list

Browse source 
On the off chance the combined list resolves to empty due to resets,
skip adding query feedback by not increasing the total cmd buffer
count for query feedback.

Signed-off-by: Juston Li <justonli@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27163>
This commit is contained in:
Juston Li 2024-01-24 15:50:32 -08:00 • committed by Marge Bot
parent df1cd20096
commit 305256e344
1 changed files with 43 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
src/virtio/vulkan/vn_queue.c
View file

@ -585,6 +585,15 @@ vn_combine_query_feedback_batches_and_record(
cmd_handle_ptr += stride;
}
if (list_is_empty(&combined_batches)) {
/* On the off chance the combined list resolves to empty due to
* resets, we can return with a null feedback cmd to indicate
* the query feedback cmd is noop and can be skipped.
*/
*out_feedback_cmd = NULL;
return VK_SUCCESS;
}
struct vn_query_feedback_cmd *feedback_cmd;
result = vn_feedback_query_cmd_alloc(dev_handle, feedback_cmd_pool,
&feedback_cmd);
@ -609,7 +618,7 @@ recycle_combined_batches:
static VkResult
vn_queue_submission_add_query_feedback(struct vn_queue_submission *submit,
uint32_t cmd_count,
uint32_t *cmd_count,
struct vn_feedback_cmds *feedback_cmds)
{
struct vk_queue *queue_vk = vk_queue_from_handle(submit->queue_handle);
@ -618,7 +627,7 @@ vn_queue_submission_add_query_feedback(struct vn_queue_submission *submit,
VkCommandBuffer *src_cmd_handles =
vn_get_feedback_cmd_handle(submit, feedback_cmds, 0);
VkCommandBuffer *feedback_cmd_handle =
vn_get_feedback_cmd_handle(submit, feedback_cmds, cmd_count);
vn_get_feedback_cmd_handle(submit, feedback_cmds, *cmd_count);
const uint32_t stride = submit->batch_type == VK_STRUCTURE_TYPE_SUBMIT_INFO
? sizeof(VkCommandBuffer *)
: sizeof(VkCommandBufferSubmitInfo);
@ -633,12 +642,15 @@ vn_queue_submission_add_query_feedback(struct vn_queue_submission *submit,
struct vn_query_feedback_cmd *feedback_cmd;
VkResult result = vn_combine_query_feedback_batches_and_record(
dev_handle, src_cmd_handles, cmd_count, stride, feedback_cmd_pool,
dev_handle, src_cmd_handles, *cmd_count, stride, feedback_cmd_pool,
&feedback_cmd);
if (result != VK_SUCCESS)
return result;
*feedback_cmd_handle = vn_command_buffer_to_handle(feedback_cmd->cmd);
if (!feedback_cmd) {
/* No query feedback needed, return without incrementing cmd_count */
return VK_SUCCESS;
}
/* link query feedback cmd lifecycle with a cmd in the original batch so
* that the feedback cmd can be reset and recycled when that cmd gets
@ -648,25 +660,26 @@ vn_queue_submission_add_query_feedback(struct vn_queue_submission *submit,
* since we don't know if all its instances have completed execution.
* Should be rare enough to just log and leak the feedback cmd.
*/
struct vn_command_buffer *linked_cmd = NULL;
for (uint32_t i = 0; i < cmd_count; i++) {
bool found_companion_cmd = false;
for (uint32_t i = 0; i < *cmd_count; i++) {
VkCommandBuffer *cmd_handle =
vn_get_feedback_cmd_handle(submit, feedback_cmds, i);
struct vn_command_buffer *cmd =
vn_command_buffer_from_handle(*cmd_handle);
if (!cmd->builder.is_simultaneous) {
linked_cmd = cmd;
cmd->linked_query_feedback_cmd = feedback_cmd;
found_companion_cmd = true;
break;
}
}
if (!linked_cmd) {
if (!found_companion_cmd) {
vn_log(dev->instance,
"Could not find non simultaneous cmd to link query feedback\n");
return VK_SUCCESS;
}
linked_cmd->linked_query_feedback_cmd = feedback_cmd;
(*cmd_count)++;
*feedback_cmd_handle = vn_command_buffer_to_handle(feedback_cmd->cmd);
return VK_SUCCESS;
}
@ -674,7 +687,7 @@ vn_queue_submission_add_query_feedback(struct vn_queue_submission *submit,
static VkResult
vn_queue_submission_add_sem_feedback(struct vn_queue_submission *submit,
uint32_t batch_index,
uint32_t cmd_buffer_count,
uint32_t *cmd_buffer_count,
struct vn_feedback_cmds *feedback_cmds)
{
struct vn_queue *queue = vn_queue_from_handle(submit->queue_handle);
@ -685,7 +698,7 @@ vn_queue_submission_add_sem_feedback(struct vn_queue_submission *submit,
/* Set the sem feedback cmds we appended in our copy of cmd buffers
* with cmds to write the signal value.
*/
uint32_t cmd_index = cmd_buffer_count;
uint32_t cmd_index = *cmd_buffer_count;
for (uint32_t i = 0; i < signal_semaphore_count; i++) {
struct vn_semaphore *sem = vn_semaphore_from_handle(
vn_get_signal_semaphore(submit, batch_index, i));
@ -705,6 +718,7 @@ vn_queue_submission_add_sem_feedback(struct vn_queue_submission *submit,
}
}
*cmd_buffer_count = cmd_index;
return VK_SUCCESS;
}
@ -712,13 +726,26 @@ static VkResult
vn_queue_submission_add_feedback_cmds(struct vn_queue_submission *submit,
uint32_t batch_index,
uint32_t cmd_buffer_count,
uint32_t feedback_cmd_count,
bool batch_has_feedback_query,
bool batch_has_feedback_sem,
struct vn_feedback_cmds *feedback_cmds)
{
VkResult result;
uint32_t new_cmd_buffer_count = cmd_buffer_count + feedback_cmd_count;
uint32_t new_cmd_buffer_count = cmd_buffer_count;
if (batch_has_feedback_query) {
result = vn_queue_submission_add_query_feedback(
submit, &new_cmd_buffer_count, feedback_cmds);
if (result != VK_SUCCESS)
return result;
}
if (batch_has_feedback_sem) {
result = vn_queue_submission_add_sem_feedback(
submit, batch_index, &new_cmd_buffer_count, feedback_cmds);
if (result != VK_SUCCESS)
return result;
}
/* Update SubmitInfo to use our copy of cmd buffers with sem adn query
* feedback cmds appended and update the cmd buffer count.
@ -754,23 +781,6 @@ vn_queue_submission_add_feedback_cmds(struct vn_queue_submission *submit,
unreachable("unexpected batch type");
}
if (batch_has_feedback_query) {
result = vn_queue_submission_add_query_feedback(
submit, cmd_buffer_count, feedback_cmds);
if (result != VK_SUCCESS)
return result;
/* increment for the cmd buffer used for query feedback cmd */
cmd_buffer_count++;
}
if (batch_has_feedback_sem) {
result = vn_queue_submission_add_sem_feedback(
submit, batch_index, cmd_buffer_count, feedback_cmds);
if (result != VK_SUCCESS)
return result;
}
return VK_SUCCESS;
}
@ -922,8 +932,8 @@ vn_queue_submission_setup_batches(struct vn_queue_submission *submit)
}
result = vn_queue_submission_add_feedback_cmds(
submit, batch_index, cmd_buffer_count, feedback_cmd_count,
batch_has_feedback_query, batch_has_feedback_sem, &feedback_cmds);
submit, batch_index, cmd_buffer_count, batch_has_feedback_query,
batch_has_feedback_sem, &feedback_cmds);
if (result != VK_SUCCESS)
return result;