commit b551ee22dfc806f90fae37e51240afea98299204
author Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mon Aug 17 16:44:45 2020 -0400
committer Marge Bot <eric+marge@anholt.net> Tue Oct 06 12:17:31 2020 +0000
tree c96f0f24ed44dea156ac7034c3e4a2fe033997df
parent 7a40b734ee2ba7da7975ac858022b6f175ddcb5a

zink: handle TIME_ELAPSED queries

these just need to write a timestamp at the start to diff against

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6923>

src/gallium/drivers/zink/zink_query.c

diff --git a/src/gallium/drivers/zink/zink_query.c b/src/gallium/drivers/zink/zink_query.c
index 7c771c0..5bf8f69 100644
--- a/src/gallium/drivers/zink/zink_query.c
+++ b/src/gallium/drivers/zink/zink_query.c
@@ -63,6 +63,7 @@
    case PIPE_QUERY_OCCLUSION_PREDICATE:
    case PIPE_QUERY_OCCLUSION_PREDICATE_CONSERVATIVE:
       return VK_QUERY_TYPE_OCCLUSION;
+   case PIPE_QUERY_TIME_ELAPSED:
    case PIPE_QUERY_TIMESTAMP:
       *use_64bit = true;
       return VK_QUERY_TYPE_TIMESTAMP;
@@ -79,6 +80,12 @@
    }
 }
 
+static bool
+is_time_query(struct zink_query *query)
+{
+   return query->type == PIPE_QUERY_TIMESTAMP || query->type == PIPE_QUERY_TIME_ELAPSED;
+}
+
 static struct pipe_query *
 zink_create_query(struct pipe_context *pctx,
                   unsigned query_type, unsigned index)
@@ -223,11 +230,13 @@
          result->b |= results[i] != 0;
          break;
 
+      case PIPE_QUERY_TIME_ELAPSED:
       case PIPE_QUERY_TIMESTAMP:
          /* the application can sum the differences between all N queries to determine the total execution time.
           * - 17.5. Timestamp Queries
           */
-         result->u64 += results[i] - last_val;
+         if (query->type != PIPE_QUERY_TIME_ELAPSED || i > 0)
+            result->u64 += results[i] - last_val;
          last_val = results[i];
          break;
       case PIPE_QUERY_OCCLUSION_COUNTER:
@@ -254,7 +263,7 @@
    }
    query->last_checked_query = query->curr_query;
 
-   if (query->type == PIPE_QUERY_TIMESTAMP)
+   if (is_time_query(query))
       timestamp_to_nanoseconds(screen, &result->u64);
 
    return TRUE;
@@ -285,8 +294,10 @@
       reset_pool(ctx, batch, q);
    assert(q->curr_query < q->num_queries);
    q->active = true;
+   if (q->type == PIPE_QUERY_TIME_ELAPSED)
+      vkCmdWriteTimestamp(batch->cmdbuf, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, q->query_pool, q->curr_query++);
    /* ignore the rest of begin_query for timestamps */
-   if (q->type == PIPE_QUERY_TIMESTAMP)
+   if (is_time_query(q))
       return;
    if (q->precise)
       flags |= VK_QUERY_CONTROL_PRECISE_BIT;
@@ -325,7 +336,7 @@
 {
    struct zink_screen *screen = zink_screen(ctx->base.screen);
    q->active = q->type == PIPE_QUERY_TIMESTAMP;
-   if (q->type == PIPE_QUERY_TIMESTAMP)
+   if (is_time_query(q))
       vkCmdWriteTimestamp(batch->cmdbuf, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
                           q->query_pool, q->curr_query);
    else if (q->vkqtype == VK_QUERY_TYPE_TRANSFORM_FEEDBACK_STREAM_EXT)