From 45a3c2d197de018e1b35b32c3b082949bdc24694 Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@gmail.com>
Date: Tue, 28 May 2024 18:43:12 +0200
Subject: [PATCH] tu: Rename tu_query.cc/h to tu_query_pool.cc/h

Match the structure of the common Vulkan runtime and NVK.
Additionally update a comment to reflect the current state.

Signed-off-by: Valentine Burley <valentine.burley@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29441>
---
 src/freedreno/vulkan/meson.build                       | 2 +-
 src/freedreno/vulkan/tu_device.cc                      | 2 +-
 src/freedreno/vulkan/{tu_query.cc => tu_query_pool.cc} | 5 +++--
 src/freedreno/vulkan/{tu_query.h => tu_query_pool.h}   | 6 +++---
 src/freedreno/vulkan/tu_rmv.cc                         | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)
 rename src/freedreno/vulkan/{tu_query.cc => tu_query_pool.cc} (99%)
 rename src/freedreno/vulkan/{tu_query.h => tu_query_pool.h} (93%)

diff --git a/src/freedreno/vulkan/meson.build b/src/freedreno/vulkan/meson.build
index b648ff16c9a..55ba0039bbe 100644
--- a/src/freedreno/vulkan/meson.build
+++ b/src/freedreno/vulkan/meson.build
@@ -39,7 +39,7 @@ libtu_files = files(
   'tu_pass.cc',
   'tu_pipeline.cc',
   'tu_sampler.cc',
-  'tu_query.cc',
+  'tu_query_pool.cc',
   'tu_rmv.cc',
   'tu_shader.cc',
   'tu_suballoc.cc',
diff --git a/src/freedreno/vulkan/tu_device.cc b/src/freedreno/vulkan/tu_device.cc
index 86644c20451..f8569b4f5a8 100644
--- a/src/freedreno/vulkan/tu_device.cc
+++ b/src/freedreno/vulkan/tu_device.cc
@@ -38,7 +38,7 @@
 #include "tu_dynamic_rendering.h"
 #include "tu_image.h"
 #include "tu_pass.h"
-#include "tu_query.h"
+#include "tu_query_pool.h"
 #include "tu_rmv.h"
 #include "tu_tracepoints.h"
 #include "tu_wsi.h"
diff --git a/src/freedreno/vulkan/tu_query.cc b/src/freedreno/vulkan/tu_query_pool.cc
similarity index 99%
rename from src/freedreno/vulkan/tu_query.cc
rename to src/freedreno/vulkan/tu_query_pool.cc
index f92e688207d..76ce6aed7a2 100644
--- a/src/freedreno/vulkan/tu_query.cc
+++ b/src/freedreno/vulkan/tu_query_pool.cc
@@ -6,7 +6,7 @@
  * Copyright © 2015 Intel Corporation
  */
 
-#include "tu_query.h"
+#include "tu_query_pool.h"
 
 #include <fcntl.h>
 
@@ -989,7 +989,8 @@ emit_begin_perf_query(struct tu_cmd_buffer *cmdbuf,
     *     See emit_perfcntrs_pass_start.
     *  2) Pick the right cs setting proper pass index to the reg and prepend
     *     it to the command buffer at each submit time.
-    *     See tu_QueueSubmit in tu_drm.c
+    *     See tu_queue_build_msm_gem_submit_cmds in tu_knl_drm_msm.cc and
+    *     tu_knl_drm_virtio.cc and kgsl_queue_submit in tu_knl_kgsl.cc
     *  3) If the pass index in the reg is true, then executes the command
     *     stream below CP_COND_REG_EXEC.
     */
diff --git a/src/freedreno/vulkan/tu_query.h b/src/freedreno/vulkan/tu_query_pool.h
similarity index 93%
rename from src/freedreno/vulkan/tu_query.h
rename to src/freedreno/vulkan/tu_query_pool.h
index a56d4eeb19d..a9e43f199ab 100644
--- a/src/freedreno/vulkan/tu_query.h
+++ b/src/freedreno/vulkan/tu_query_pool.h
@@ -7,8 +7,8 @@
  * Copyright © 2015 Intel Corporation
  */
 
-#ifndef TU_QUERY_H
-#define TU_QUERY_H
+#ifndef TU_QUERY_POOL_H
+#define TU_QUERY_POOL_H
 
 #include "tu_common.h"
 
@@ -42,4 +42,4 @@ struct tu_query_pool
 VK_DEFINE_NONDISP_HANDLE_CASTS(tu_query_pool, base, VkQueryPool,
                                VK_OBJECT_TYPE_QUERY_POOL)
 
-#endif /* TU_QUERY_H */
+#endif /* TU_QUERY_POOL_H */
diff --git a/src/freedreno/vulkan/tu_rmv.cc b/src/freedreno/vulkan/tu_rmv.cc
index de54b14954e..3cecf923e86 100644
--- a/src/freedreno/vulkan/tu_rmv.cc
+++ b/src/freedreno/vulkan/tu_rmv.cc
@@ -11,7 +11,7 @@
 #include "tu_device.h"
 #include "tu_event.h"
 #include "tu_image.h"
-#include "tu_query.h"
+#include "tu_query_pool.h"
 
 #include <cstdio>