radv: Move a whole bunch of debug/profiling related into a subdir

For slightly better separation of debug and driver code.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41044>

docs/drivers/amd/hang-debugging.rst

@@ -35,7 +35,7 @@ there are a couple of files:
 * ``app_info.log``: ``VkApplicationInfo`` fields.
 * ``bo_history.log``: A list of every GPU memory allocation and deallocation.
   If the GPU hang was caused by a page fault, you can use
-  `radv_check_va.py <https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/src/amd/vulkan/radv_check_va.py>`__
+  `radv_check_va.py <https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/src/amd/vulkan/tools/radv_check_va.py>`__
   to figure out if address is invalid or used after the memory was deallocated.
 * ``bo_ranges.log``: Address ranges that were valid at the time of submission.
 * ``dmesg.log``: Output of ``dmesg``, if available.

src/amd/vulkan/layers/radv_rra_layer.c

@@ -5,9 +5,9 @@
  */
 
 #include "meta/radv_meta.h"
+#include "tools/radv_rra.h"
 #include "util/u_process.h"
 #include "radv_event.h"
-#include "radv_rra.h"
 #include "vk_acceleration_structure.h"
 
 VKAPI_ATTR VkResult VKAPI_CALL

src/amd/vulkan/layers/radv_sqtt_layer.c

@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include "tools/radv_spm.h"
+#include "tools/radv_sqtt.h"
 #include "ac_shader_util.h"
 #include "radv_cmd_buffer.h"
 #include "radv_cs.h"
@@ -11,7 +13,6 @@
 #include "radv_pipeline_rt.h"
 #include "radv_queue.h"
 #include "radv_shader.h"
-#include "radv_sqtt.h"
 #include "vk_semaphore.h"
 
 #include "ac_rgp.h"

src/amd/vulkan/meson.build

@@ -105,6 +105,20 @@ libradv_files = files(
   'nir/radv_nir_rt_stage_monolithic.c',
   'nir/radv_nir_rt_traversal_shader.c',
   'nir/radv_nir_trim_fs_color_exports.c',
+  'tools/radv_debug_nir.c',
+  'tools/radv_debug_nir.h',
+  'tools/radv_debug.c',
+  'tools/radv_debug.h',
+  'tools/radv_rmv.c',
+  'tools/radv_rmv.h',
+  'tools/radv_rra_gfx10_3.c',
+  'tools/radv_rra_gfx12.c',
+  'tools/radv_rra.c',
+  'tools/radv_rra.h',
+  'tools/radv_spm.c',
+  'tools/radv_spm.h',
+  'tools/radv_sqtt.c',
+  'tools/radv_sqtt.h',
   'radv_acceleration_structure.c',
   'radv_android.c',
   'radv_android.h',
@@ -120,10 +134,6 @@ libradv_files = files(
   'radv_cp_reg_shadowing.h',
   'radv_cs.c',
   'radv_cs.h',
-  'radv_debug_nir.c',
-  'radv_debug_nir.h',
-  'radv_debug.c',
-  'radv_debug.h',
   'radv_device.c',
   'radv_device.h',
   'radv_device_memory.c',
@@ -167,12 +177,6 @@ libradv_files = files(
   'radv_queue.c',
   'radv_queue.h',
   'radv_radeon_winsys.h',
-  'radv_rmv.c',
-  'radv_rmv.h',
-  'radv_rra_gfx10_3.c',
-  'radv_rra_gfx12.c',
-  'radv_rra.c',
-  'radv_rra.h',
   'radv_sampler.c',
   'radv_sampler.h',
   'radv_sdma.c',
@@ -185,10 +189,6 @@ libradv_files = files(
   'radv_shader_info.h',
   'radv_shader_object.c',
   'radv_shader_object.h',
-  'radv_spm.c',
-  'radv_spm.h',
-  'radv_sqtt.c',
-  'radv_sqtt.h',
   'radv_query.c',
   'radv_query.h',
   'radv_video.c',

src/amd/vulkan/meta/radv_meta.c

@@ -7,7 +7,7 @@
  */
 
 #include "radv_meta.h"
-#include "radv_debug_nir.h"
+#include "tools/radv_debug_nir.h"
 #include "radv_shader_object.h"
 
 #include "vk_common_entrypoints.h"

src/amd/vulkan/meta/radv_meta.h

@@ -9,6 +9,7 @@
 #ifndef RADV_META_H
 #define RADV_META_H
 
+#include "tools/radv_sqtt.h"
 #include "radv_buffer.h"
 #include "radv_buffer_view.h"
 #include "radv_cmd_buffer.h"
@@ -22,7 +23,6 @@
 #include "radv_pipeline_compute.h"
 #include "radv_queue.h"
 #include "radv_shader.h"
-#include "radv_sqtt.h"
 
 #ifdef __cplusplus
 extern "C" {

src/amd/vulkan/meta/radv_meta_buffer.c

@@ -8,8 +8,8 @@
  */
 
 #include "nir/radv_meta_nir.h"
+#include "tools/radv_debug.h"
 #include "radv_cp_dma.h"
-#include "radv_debug.h"
 #include "radv_meta.h"
 #include "radv_sdma.h"
 #include "vk_shader_module.h"

src/amd/vulkan/nir/radv_nir_lower_printf.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "radv_debug_nir.h"
+#include "tools/radv_debug_nir.h"
 #include "radv_nir.h"
 
 #include "util/u_printf.h"

src/amd/vulkan/nir/radv_nir_rt_common.c

@@ -6,6 +6,7 @@
 
 #include "nir/radv_nir_rt_common.h"
 #include "bvh/bvh.h"
+#include "tools/radv_debug.h"
 #include "nir_builder.h"
 
 #include "radv_device.h"

src/amd/vulkan/nir/radv_nir_rt_traversal_shader.c

@@ -10,12 +10,12 @@
 #include "nir/radv_nir_rt_stage_common.h"
 #include "nir/radv_nir_rt_traversal_shader.h"
 
+#include "tools/radv_rra.h"
 #include "aco_nir_call_attribs.h"
 #include "nir_builder.h"
 #include "radv_meta_nir.h"
 #include "radv_nir_rt_stage_functions.h"
 #include "radv_physical_device.h"
-#include "radv_rra.h"
 
 /* Variables only used internally to ray traversal. This is data that describes
  * the current state of the traversal vs. what we'd give to a shader.  e.g. what

src/amd/vulkan/radv_buffer.c

@@ -9,13 +9,13 @@
  */
 
 #include "radv_buffer.h"
+#include "tools/radv_rmv.h"
 #include "radv_device.h"
 #include "radv_device_memory.h"
 #include "radv_dgc.h"
 #include "radv_entrypoints.h"
 #include "radv_instance.h"
 #include "radv_physical_device.h"
-#include "radv_rmv.h"
 
 #include "vk_common_entrypoints.h"
 #include "vk_debug_utils.h"

src/amd/vulkan/radv_cmd_buffer.c

@@ -10,19 +10,19 @@
 
 #include "radv_cmd_buffer.h"
 #include "meta/radv_meta.h"
+#include "tools/radv_debug.h"
+#include "tools/radv_rmv.h"
+#include "tools/radv_rra.h"
 #include "ac_formats.h"
 #include "ac_shader_util.h"
 #include "radv_cp_dma.h"
 #include "radv_cs.h"
-#include "radv_debug.h"
 #include "radv_descriptor_update_template.h"
 #include "radv_dgc.h"
 #include "radv_event.h"
 #include "radv_pipeline_layout.h"
 #include "radv_pipeline_rt.h"
 #include "radv_radeon_winsys.h"
-#include "radv_rmv.h"
-#include "radv_rra.h"
 #include "radv_sdma.h"
 #include "radv_shader.h"
 #include "radv_shader_object.h"

src/amd/vulkan/radv_cp_dma.c

@@ -9,11 +9,11 @@
  */
 
 #include "radv_cp_dma.h"
+#include "tools/radv_debug.h"
+#include "tools/radv_sqtt.h"
 #include "radv_buffer.h"
 #include "radv_cs.h"
-#include "radv_debug.h"
 #include "radv_shader.h"
-#include "radv_sqtt.h"
 #include "sid.h"
 
 /* Set this if you want the 3D engine to wait until CP DMA is done.

src/amd/vulkan/radv_cp_reg_shadowing.c

@@ -6,6 +6,7 @@
  */
 
 #include "radv_cp_reg_shadowing.h"
+#include "tools/radv_debug.h"
 #include "ac_shadowed_regs.h"
 #include "radv_buffer.h"
 #include "radv_cs.h"

src/amd/vulkan/radv_cs.c

@@ -9,6 +9,8 @@
  */
 
 #include "radv_cs.h"
+#include "tools/radv_debug.h"
+#include "tools/radv_sqtt.h"
 #include "radv_buffer.h"
 #include "radv_sdma.h"
 #include "radv_shader.h"

src/amd/vulkan/radv_descriptor_pool.c

@@ -6,13 +6,13 @@
  */
 
 #include "radv_descriptor_pool.h"
+#include "tools/radv_rmv.h"
 #include "radv_buffer.h"
 #include "radv_descriptor_set.h"
 #include "radv_descriptors.h"
 #include "radv_device.h"
 #include "radv_entrypoints.h"
 #include "radv_physical_device.h"
-#include "radv_rmv.h"
 
 #include "vk_log.h"
 

src/amd/vulkan/radv_device.c

@@ -28,17 +28,16 @@
 
 #include "layers/radv_app_workarounds.h"
 #include "meta/radv_meta.h"
+#include "tools/radv_debug.h"
+#include "tools/radv_rmv.h"
+#include "tools/radv_spm.h"
+#include "tools/radv_sqtt.h"
 #include "util/u_debug.h"
 #include "radv_cs.h"
-#include "radv_debug.h"
-#include "radv_debug_nir.h"
 #include "radv_entrypoints.h"
 #include "radv_formats.h"
 #include "radv_physical_device.h"
-#include "radv_rmv.h"
 #include "radv_shader.h"
-#include "radv_spm.h"
-#include "radv_sqtt.h"
 #include "vk_common_entrypoints.h"
 #include "vk_pipeline_cache.h"
 #include "vk_util.h"

src/amd/vulkan/radv_device.h

@@ -16,11 +16,12 @@
 
 #include "util/mesa-blake3.h"
 
-#include "radv_debug_nir.h"
+#include "tools/radv_debug_nir.h"
+#include "tools/radv_rra.h"
+
 #include "radv_pipeline.h"
 #include "radv_queue.h"
 #include "radv_radeon_winsys.h"
-#include "radv_rra.h"
 #include "radv_shader.h"
 
 #include "vk_acceleration_structure.h"

src/amd/vulkan/radv_device_memory.c

@@ -9,11 +9,12 @@
  */
 
 #include "radv_device_memory.h"
+#include "tools/radv_debug.h"
+#include "tools/radv_rmv.h"
 #include "radv_android.h"
 #include "radv_buffer.h"
 #include "radv_entrypoints.h"
 #include "radv_image.h"
-#include "radv_rmv.h"
 
 #include "vk_debug_utils.h"
 #include "vk_log.h"

src/amd/vulkan/radv_dgc.c

@@ -7,6 +7,7 @@
 #include "radv_dgc.h"
 #include "meta/radv_meta.h"
 #include "nir/radv_meta_nir.h"
+#include "tools/radv_debug.h"
 #include "radv_cs.h"
 #include "radv_entrypoints.h"
 #include "radv_pipeline_rt.h"

src/amd/vulkan/radv_event.c

@@ -11,11 +11,11 @@
 #include "vk_alloc.h"
 #include "vk_log.h"
 
+#include "tools/radv_rmv.h"
 #include "radv_buffer.h"
 #include "radv_device.h"
 #include "radv_entrypoints.h"
 #include "radv_event.h"
-#include "radv_rmv.h"
 
 static void
 radv_destroy_event(struct radv_device *device, const VkAllocationCallbacks *pAllocator, struct radv_event *event)

src/amd/vulkan/radv_formats.c

@@ -6,8 +6,8 @@
  */
 
 #include "radv_formats.h"
+#include "tools/radv_debug.h"
 #include "radv_android.h"
-#include "radv_debug.h"
 #include "radv_entrypoints.h"
 #include "radv_image.h"
 

src/amd/vulkan/radv_image.c

@@ -9,19 +9,19 @@
  */
 
 #include "radv_image.h"
+#include "tools/radv_debug.h"
+#include "tools/radv_rmv.h"
 #include "util/u_atomic.h"
 #include "ac_drm_fourcc.h"
 #include "ac_formats.h"
 #include "radv_android.h"
 #include "radv_buffer.h"
 #include "radv_buffer_view.h"
-#include "radv_debug.h"
 #include "radv_device_memory.h"
 #include "radv_entrypoints.h"
 #include "radv_formats.h"
 #include "radv_image_view.h"
 #include "radv_radeon_winsys.h"
-#include "radv_rmv.h"
 #include "radv_video.h"
 #include "radv_wsi.h"
 #include "vk_debug_utils.h"

src/amd/vulkan/radv_image_view.c

@@ -10,9 +10,9 @@
 
 #include "vk_log.h"
 
+#include "tools/radv_debug.h"
 #include "radv_buffer.h"
 #include "radv_buffer_view.h"
-#include "radv_debug.h"
 #include "radv_entrypoints.h"
 #include "radv_formats.h"
 #include "radv_image.h"

src/amd/vulkan/radv_instance.c

@@ -16,7 +16,7 @@
 #define VG(x) ((void)0)
 #endif
 
-#include "radv_debug.h"
+#include "tools/radv_debug.h"
 #include "radv_entrypoints.h"
 #include "radv_instance.h"
 #include "radv_wsi.h"

src/amd/vulkan/radv_perfcounter.c

@@ -6,12 +6,12 @@
 
 #include <inttypes.h>
 
+#include "tools/radv_sqtt.h"
 #include "ac_perfcounter.h"
 #include "amdgfxregs.h"
 #include "radv_cs.h"
 #include "radv_entrypoints.h"
 #include "radv_perfcounter.h"
-#include "radv_sqtt.h"
 #include "sid.h"
 
 void

src/amd/vulkan/radv_physical_device.c

@@ -20,11 +20,11 @@
 #include "vk_log.h"
 #include "vk_shader_module.h"
 
+#include "tools/radv_debug.h"
 #include "util/disk_cache.h"
 #include "util/hex.h"
 #include "util/u_debug.h"
 #include "radv_android.h"
-#include "radv_debug.h"
 #include "radv_entrypoints.h"
 #include "radv_instance.h"
 #include "radv_physical_device.h"

src/amd/vulkan/radv_pipeline.c

@@ -12,10 +12,9 @@
 #include "meta/radv_meta.h"
 #include "nir/nir.h"
 #include "nir/radv_nir.h"
+#include "tools/radv_rmv.h"
 #include "util/u_atomic.h"
-#include "radv_debug.h"
 #include "radv_pipeline_rt.h"
-#include "radv_rmv.h"
 #include "radv_shader.h"
 #include "radv_shader_args.h"
 #include "vk_pipeline.h"

src/amd/vulkan/radv_pipeline_binary.c

@@ -5,15 +5,14 @@
  */
 
 #include "radv_pipeline_binary.h"
+#include "tools/radv_debug.h"
 #include "util/blob.h"
 #include "util/macros.h"
 #include "util/mesa-blake3.h"
-#include "util/mesa-blake3.h"
 #include "util/u_atomic.h"
 #include "radv_device.h"
-#include "radv_physical_device.h"
-#include "radv_device.h"
 #include "radv_entrypoints.h"
+#include "radv_physical_device.h"
 #include "radv_pipeline_cache.h"
 #include "radv_pipeline_graphics.h"
 #include "radv_pipeline_rt.h"

src/amd/vulkan/radv_pipeline_cache.c

@@ -7,18 +7,20 @@
 #include "radv_pipeline_cache.h"
 #include "util/macros.h"
 #include "util/mesa-blake3.h"
-#include "util/mesa-blake3.h"
 #include "util/u_atomic.h"
 #include "nir.h"
 #include "nir_serialize.h"
-#include "radv_debug.h"
 #include "radv_descriptor_set.h"
+#include "radv_device.h"
+#include "radv_instance.h"
+#include "radv_physical_device.h"
 #include "radv_pipeline.h"
 #include "radv_pipeline_binary.h"
 #include "radv_pipeline_compute.h"
 #include "radv_pipeline_graphics.h"
 #include "radv_pipeline_rt.h"
 #include "radv_shader.h"
+#include "vk_alloc.h"
 #include "vk_pipeline.h"
 
 #include "aco_interface.h"

src/amd/vulkan/radv_pipeline_compute.c

@@ -11,13 +11,12 @@
 #include "meta/radv_meta.h"
 #include "nir/nir.h"
 #include "nir/radv_nir.h"
+#include "tools/radv_rmv.h"
 #include "util/mesa-blake3.h"
 #include "util/os_time.h"
 #include "util/u_atomic.h"
-#include "radv_debug.h"
 #include "radv_pipeline_binary.h"
 #include "radv_pipeline_cache.h"
-#include "radv_rmv.h"
 #include "radv_shader.h"
 #include "radv_shader_args.h"
 #include "vk_pipeline.h"

src/amd/vulkan/radv_pipeline_graphics.c

@@ -13,16 +13,16 @@
 #include "nir/nir_serialize.h"
 #include "nir/nir_xfb_info.h"
 #include "nir/radv_nir.h"
+#include "tools/radv_rmv.h"
 #include "util/mesa-blake3.h"
 #include "util/os_time.h"
 #include "util/u_atomic.h"
-#include "radv_debug.h"
+#include "radv_device.h"
 #include "radv_entrypoints.h"
 #include "radv_formats.h"
 #include "radv_physical_device.h"
 #include "radv_pipeline_binary.h"
 #include "radv_pipeline_cache.h"
-#include "radv_rmv.h"
 #include "radv_shader.h"
 #include "radv_shader_args.h"
 #include "shader_enums.h"

src/amd/vulkan/radv_pipeline_rt.c

@@ -15,8 +15,8 @@
 #include "nir/radv_nir_rt_stage_functions.h"
 #include "nir/radv_nir_rt_stage_monolithic.h"
 #include "nir/radv_nir_rt_traversal_shader.h"
+#include "tools/radv_debug.h"
 #include "ac_nir.h"
-#include "radv_debug.h"
 #include "radv_descriptor_set.h"
 #include "radv_entrypoints.h"
 #include "radv_pipeline_binary.h"
@@ -25,8 +25,8 @@
 #include "radv_pipeline_rt.h"
 
 #include "nir/radv_nir_rt_stage_common.h"
+#include "tools/radv_rmv.h"
 #include "aco_interface.h"
-#include "radv_rmv.h"
 #include "radv_shader.h"
 
 struct rt_handle_hash_entry {

src/amd/vulkan/radv_query.c

@@ -15,6 +15,7 @@
 #include "meta/radv_meta.h"
 #include "nir/nir_builder.h"
 #include "nir/radv_meta_nir.h"
+#include "tools/radv_rmv.h"
 #include "util/u_atomic.h"
 #include "vulkan/vulkan_core.h"
 #include "ac_cmdbuf_video.h"
@@ -22,7 +23,6 @@
 #include "radv_entrypoints.h"
 #include "radv_perfcounter.h"
 #include "radv_query.h"
-#include "radv_rmv.h"
 #include "radv_sdma.h"
 #include "sid.h"
 #include "vk_acceleration_structure.h"

src/amd/vulkan/radv_queue.c

@@ -9,14 +9,14 @@
  */
 
 #include "radv_queue.h"
+#include "tools/radv_debug.h"
+#include "tools/radv_debug_nir.h"
+#include "tools/radv_rmv.h"
 #include "radv_buffer.h"
 #include "radv_cp_reg_shadowing.h"
 #include "radv_cs.h"
-#include "radv_debug.h"
-#include "radv_debug_nir.h"
 #include "radv_device_memory.h"
 #include "radv_image.h"
-#include "radv_rmv.h"
 #include "vk_semaphore.h"
 #include "vk_sync.h"
 

src/amd/vulkan/radv_shader.c

@@ -16,14 +16,14 @@
 #include "nir/radv_meta_nir.h"
 #include "nir/radv_nir.h"
 #include "spirv/nir_spirv.h"
+#include "tools/radv_debug.h"
+#include "tools/radv_debug_nir.h"
 #include "util/memstream.h"
 #include "util/mesa-blake3.h"
 #include "util/streaming-load-memcpy.h"
 #include "util/u_atomic.h"
 #include "ac_shader_util.h"
 #include "radv_cs.h"
-#include "radv_debug.h"
-#include "radv_debug_nir.h"
 #include "radv_entrypoints.h"
 #include "radv_nir_to_llvm.h"
 #include "radv_sdma.h"

src/amd/vulkan/radv_video.c

@@ -13,9 +13,9 @@
 #include "util/vl_zscan_data.h"
 #include "ac_vcn_dec.h"
 
+#include "tools/radv_debug.h"
 #include "radv_buffer.h"
 #include "radv_cs.h"
-#include "radv_debug.h"
 #include "radv_device_memory.h"
 #include "radv_entrypoints.h"
 #include "radv_image.h"

src/amd/vulkan/radv_video_enc.c

@@ -25,9 +25,9 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  **************************************************************************/
+#include "tools/radv_debug.h"
 #include "radv_buffer.h"
 #include "radv_cs.h"
-#include "radv_debug.h"
 #include "radv_device_memory.h"
 #include "radv_entrypoints.h"
 #include "radv_image_view.h"

src/amd/vulkan/radv_wsi.c

@@ -18,7 +18,7 @@
 #include "radv_queue.h"
 #include "radv_shader.h"
 
-#include "radv_debug.h"
+#include "tools/radv_debug.h"
 #include "wsi_common.h"
 
 static VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL

src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c

@@ -11,8 +11,8 @@
 
 #include <stdio.h>
 
+#include "tools/radv_debug.h"
 #include "radv_amdgpu_bo.h"
-#include "radv_debug.h"
 
 #include <inttypes.h>
 #include <pthread.h>

src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c

@@ -11,6 +11,7 @@
 #include <stdlib.h>
 #include "drm-uapi/amdgpu_drm.h"
 
+#include "tools/radv_debug.h"
 #include "util/detect_os.h"
 #include "util/os_time.h"
 #include "util/u_memory.h"
@@ -20,7 +21,6 @@
 #include "radv_amdgpu_bo.h"
 #include "radv_amdgpu_cs.h"
 #include "radv_amdgpu_winsys.h"
-#include "radv_debug.h"
 #include "radv_radeon_winsys.h"
 #include "sid.h"
 #include "vk_drm_syncobj.h"

src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c

@@ -12,15 +12,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "drm-uapi/amdgpu_drm.h"
+#include "tools/radv_debug.h"
+#include "util/hash_table.h"
+#include "util/u_memory.h"
 #include "ac_linux_drm.h"
 #include "ac_surface.h"
 #include "radv_amdgpu_bo.h"
 #include "radv_amdgpu_cs.h"
 #include "radv_amdgpu_winsys_public.h"
-#include "radv_debug.h"
 #include "vk_drm_syncobj.h"
-#include "util/hash_table.h"
-#include "util/u_memory.h"
 
 static void
 radv_amdgpu_winsys_query_info(struct radeon_winsys *rws, struct radeon_info *gpu_info)