pvr: Process queries and emit write program when ending sub_cmd.

Signed-off-by: Rajnesh Kanwal <rajnesh.kanwal@imgtec.com>
Reviewed-by: Frank Binns <frank.binns@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19371>

src/imagination/vulkan/pvr_cmd_buffer.c

@@ -1439,6 +1439,9 @@ VkResult pvr_cmd_buffer_end_sub_cmd(struct pvr_cmd_buffer *cmd_buffer)
    struct pvr_cmd_buffer_state *state = &cmd_buffer->state;
    struct pvr_sub_cmd *sub_cmd = state->current_sub_cmd;
    struct pvr_device *device = cmd_buffer->device;
+   const struct pvr_query_pool *query_pool = NULL;
+   struct pvr_bo *query_indices_bo = NULL;
+   size_t query_indices_size = 0;
    VkResult result;
 
    /* FIXME: Is this NULL check required because this function is called from
@@ -1457,6 +1460,51 @@ VkResult pvr_cmd_buffer_end_sub_cmd(struct pvr_cmd_buffer *cmd_buffer)
    case PVR_SUB_CMD_TYPE_GRAPHICS: {
       struct pvr_sub_cmd_gfx *const gfx_sub_cmd = &sub_cmd->gfx;
 
+      query_indices_size =
+         util_dynarray_num_elements(&state->query_indices, char);
+
+      if (query_indices_size > 0) {
+         const bool secondary_cont =
+            cmd_buffer->vk.level == VK_COMMAND_BUFFER_LEVEL_SECONDARY &&
+            cmd_buffer->usage_flags &
+               VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT;
+
+         assert(gfx_sub_cmd->query_pool);
+
+         if (secondary_cont) {
+            void *buff;
+
+            buff =
+               util_dynarray_grow_bytes(&state->query_indices,
+                                        1,
+                                        gfx_sub_cmd->sec_query_indices.size);
+            if (!buff) {
+               state->status =
+                  vk_error(cmd_buffer, VK_ERROR_OUT_OF_HOST_MEMORY);
+               return state->status;
+            }
+
+            memcpy(buff, state->query_indices.data, state->query_indices.size);
+         } else {
+            const void *data = util_dynarray_begin(&state->query_indices);
+
+            result = pvr_cmd_buffer_upload_general(cmd_buffer,
+                                                   data,
+                                                   query_indices_size,
+                                                   &query_indices_bo);
+            if (result != VK_SUCCESS) {
+               state->status = result;
+               return result;
+            }
+
+            query_pool = gfx_sub_cmd->query_pool;
+         }
+
+         sub_cmd->flags |= PVR_SUB_COMMAND_FLAG_OCCLUSION_QUERY;
+
+         util_dynarray_clear(&state->query_indices);
+      }
+
       if (cmd_buffer->vk.level == VK_COMMAND_BUFFER_LEVEL_SECONDARY) {
          result = pvr_csb_emit_return(&gfx_sub_cmd->control_stream);
          if (result != VK_SUCCESS) {
@@ -1530,6 +1578,26 @@ VkResult pvr_cmd_buffer_end_sub_cmd(struct pvr_cmd_buffer *cmd_buffer)
 
    state->current_sub_cmd = NULL;
 
+   if (query_pool) {
+      struct pvr_query_info query_info;
+
+      assert(query_indices_bo);
+      assert(query_indices_size);
+
+      query_info.type = PVR_QUERY_TYPE_AVAILABILITY_WRITE;
+
+      /* sizeof(uint32_t) is for the size of single query. */
+      query_info.availability_write.num_query_indices =
+         query_indices_size / sizeof(uint32_t);
+      query_info.availability_write.index_bo = query_indices_bo;
+
+      query_info.availability_write.num_queries = query_pool->query_count;
+      query_info.availability_write.availability_bo =
+         query_pool->availability_buffer;
+
+      return pvr_add_query_program(cmd_buffer, &query_info);
+   }
+
    return VK_SUCCESS;
 }
 
@@ -1662,7 +1730,11 @@ VkResult pvr_cmd_buffer_start_sub_cmd(struct pvr_cmd_buffer *cmd_buffer,
       sub_cmd->gfx.framebuffer = state->render_pass_info.framebuffer;
       sub_cmd->gfx.empty_cmd = true;
 
+      if (state->vis_test_enabled)
+         sub_cmd->gfx.query_pool = state->query_pool;
+
       pvr_reset_graphics_dirty_state(cmd_buffer, true);
+
       if (pvr_cmd_uses_deferred_cs_cmds(cmd_buffer)) {
          pvr_csb_init(device,
                       PVR_CMD_STREAM_TYPE_GRAPHICS_DEFERRED,

src/imagination/vulkan/pvr_private.h

@@ -119,6 +119,7 @@ enum pvr_event_type {
 
 enum pvr_sub_command_flags {
    PVR_SUB_COMMAND_FLAG_WAIT_ON_PREVIOUS_FRAG = BITFIELD_BIT(0),
+   PVR_SUB_COMMAND_FLAG_OCCLUSION_QUERY = BITFIELD_BIT(1),
 };
 
 enum pvr_depth_stencil_usage {
@@ -1265,6 +1266,8 @@ struct pvr_query_pool {
     */
    uint32_t result_stride;
 
+   uint32_t query_count;
+
    struct pvr_bo *result_buffer;
    struct pvr_bo *availability_buffer;
 };

src/imagination/vulkan/pvr_query.c

@@ -69,6 +69,8 @@ VkResult pvr_CreateQueryPool(VkDevice _device,
    pool->result_stride =
       ALIGN_POT(query_size, PVRX(CR_ISP_OCLQRY_BASE_ADDR_ALIGNMENT));
 
+   pool->query_count = pCreateInfo->queryCount;
+
    /* Each Phantom writes to a separate offset within the vis test heap so
     * allocate space for the total number of Phantoms.
     */