From c9b60cfa4f602beec2eda2bf3bc201073362fdf3 Mon Sep 17 00:00:00 2001 From: Konstantin Seurer Date: Tue, 5 May 2026 18:13:07 +0200 Subject: [PATCH] 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 Part-of: --- docs/drivers/amd/hang-debugging.rst | 2 +- src/amd/vulkan/layers/radv_rra_layer.c | 2 +- src/amd/vulkan/layers/radv_sqtt_layer.c | 3 +- src/amd/vulkan/meson.build | 28 +++++++++---------- src/amd/vulkan/meta/radv_meta.c | 2 +- src/amd/vulkan/meta/radv_meta.h | 2 +- src/amd/vulkan/meta/radv_meta_buffer.c | 2 +- src/amd/vulkan/nir/radv_nir_lower_printf.c | 2 +- src/amd/vulkan/nir/radv_nir_rt_common.c | 1 + .../vulkan/nir/radv_nir_rt_traversal_shader.c | 2 +- src/amd/vulkan/radv_buffer.c | 2 +- src/amd/vulkan/radv_cmd_buffer.c | 6 ++-- src/amd/vulkan/radv_cp_dma.c | 4 +-- src/amd/vulkan/radv_cp_reg_shadowing.c | 1 + src/amd/vulkan/radv_cs.c | 2 ++ src/amd/vulkan/radv_descriptor_pool.c | 2 +- src/amd/vulkan/radv_device.c | 9 +++--- src/amd/vulkan/radv_device.h | 5 ++-- src/amd/vulkan/radv_device_memory.c | 3 +- src/amd/vulkan/radv_dgc.c | 1 + src/amd/vulkan/radv_event.c | 2 +- src/amd/vulkan/radv_formats.c | 2 +- src/amd/vulkan/radv_image.c | 4 +-- src/amd/vulkan/radv_image_view.c | 2 +- src/amd/vulkan/radv_instance.c | 2 +- src/amd/vulkan/radv_perfcounter.c | 2 +- src/amd/vulkan/radv_physical_device.c | 2 +- src/amd/vulkan/radv_pipeline.c | 3 +- src/amd/vulkan/radv_pipeline_binary.c | 5 ++-- src/amd/vulkan/radv_pipeline_cache.c | 6 ++-- src/amd/vulkan/radv_pipeline_compute.c | 3 +- src/amd/vulkan/radv_pipeline_graphics.c | 4 +-- src/amd/vulkan/radv_pipeline_rt.c | 4 +-- src/amd/vulkan/radv_query.c | 2 +- src/amd/vulkan/radv_queue.c | 6 ++-- src/amd/vulkan/radv_shader.c | 4 +-- src/amd/vulkan/radv_video.c | 2 +- src/amd/vulkan/radv_video_enc.c | 2 +- src/amd/vulkan/radv_wsi.c | 2 +- src/amd/vulkan/{ => tools}/radv_check_va.py | 0 src/amd/vulkan/{ => tools}/radv_debug.c | 0 src/amd/vulkan/{ => tools}/radv_debug.h | 0 src/amd/vulkan/{ => tools}/radv_debug_nir.c | 0 src/amd/vulkan/{ => tools}/radv_debug_nir.h | 0 src/amd/vulkan/{ => tools}/radv_rmv.c | 0 src/amd/vulkan/{ => tools}/radv_rmv.h | 0 src/amd/vulkan/{ => tools}/radv_rra.c | 0 src/amd/vulkan/{ => tools}/radv_rra.h | 0 src/amd/vulkan/{ => tools}/radv_rra_gfx10_3.c | 0 src/amd/vulkan/{ => tools}/radv_rra_gfx12.c | 0 src/amd/vulkan/{ => tools}/radv_spm.c | 0 src/amd/vulkan/{ => tools}/radv_spm.h | 0 src/amd/vulkan/{ => tools}/radv_sqtt.c | 0 src/amd/vulkan/{ => tools}/radv_sqtt.h | 0 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c | 2 +- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 2 +- .../vulkan/winsys/amdgpu/radv_amdgpu_winsys.c | 6 ++-- 57 files changed, 78 insertions(+), 72 deletions(-) rename src/amd/vulkan/{ => tools}/radv_check_va.py (100%) rename src/amd/vulkan/{ => tools}/radv_debug.c (100%) rename src/amd/vulkan/{ => tools}/radv_debug.h (100%) rename src/amd/vulkan/{ => tools}/radv_debug_nir.c (100%) rename src/amd/vulkan/{ => tools}/radv_debug_nir.h (100%) rename src/amd/vulkan/{ => tools}/radv_rmv.c (100%) rename src/amd/vulkan/{ => tools}/radv_rmv.h (100%) rename src/amd/vulkan/{ => tools}/radv_rra.c (100%) rename src/amd/vulkan/{ => tools}/radv_rra.h (100%) rename src/amd/vulkan/{ => tools}/radv_rra_gfx10_3.c (100%) rename src/amd/vulkan/{ => tools}/radv_rra_gfx12.c (100%) rename src/amd/vulkan/{ => tools}/radv_spm.c (100%) rename src/amd/vulkan/{ => tools}/radv_spm.h (100%) rename src/amd/vulkan/{ => tools}/radv_sqtt.c (100%) rename src/amd/vulkan/{ => tools}/radv_sqtt.h (100%) diff --git a/docs/drivers/amd/hang-debugging.rst b/docs/drivers/amd/hang-debugging.rst index 1edc09290af..f8d55b90e60 100644 --- a/docs/drivers/amd/hang-debugging.rst +++ b/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 `__ + `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. diff --git a/src/amd/vulkan/layers/radv_rra_layer.c b/src/amd/vulkan/layers/radv_rra_layer.c index df0573cd3e0..cb38b49a208 100644 --- a/src/amd/vulkan/layers/radv_rra_layer.c +++ b/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 diff --git a/src/amd/vulkan/layers/radv_sqtt_layer.c b/src/amd/vulkan/layers/radv_sqtt_layer.c index 4807306c912..6f24f662744 100644 --- a/src/amd/vulkan/layers/radv_sqtt_layer.c +++ b/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" diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index 7a4b6956b6a..d52628b5dcc 100644 --- a/src/amd/vulkan/meson.build +++ b/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', diff --git a/src/amd/vulkan/meta/radv_meta.c b/src/amd/vulkan/meta/radv_meta.c index c8500b8ff3a..d6eff158f80 100644 --- a/src/amd/vulkan/meta/radv_meta.c +++ b/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" diff --git a/src/amd/vulkan/meta/radv_meta.h b/src/amd/vulkan/meta/radv_meta.h index 57099b7d317..c839d614608 100644 --- a/src/amd/vulkan/meta/radv_meta.h +++ b/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" { diff --git a/src/amd/vulkan/meta/radv_meta_buffer.c b/src/amd/vulkan/meta/radv_meta_buffer.c index 5559d99544a..ecfaad5fcb3 100644 --- a/src/amd/vulkan/meta/radv_meta_buffer.c +++ b/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" diff --git a/src/amd/vulkan/nir/radv_nir_lower_printf.c b/src/amd/vulkan/nir/radv_nir_lower_printf.c index 880889fdad5..3a5c5c1b9bd 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_printf.c +++ b/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" diff --git a/src/amd/vulkan/nir/radv_nir_rt_common.c b/src/amd/vulkan/nir/radv_nir_rt_common.c index 214e6fc3f5b..4facea1aa80 100644 --- a/src/amd/vulkan/nir/radv_nir_rt_common.c +++ b/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" diff --git a/src/amd/vulkan/nir/radv_nir_rt_traversal_shader.c b/src/amd/vulkan/nir/radv_nir_rt_traversal_shader.c index eec81d5e2fa..2bc63601812 100644 --- a/src/amd/vulkan/nir/radv_nir_rt_traversal_shader.c +++ b/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 diff --git a/src/amd/vulkan/radv_buffer.c b/src/amd/vulkan/radv_buffer.c index acdb7c0dbcb..095141a638b 100644 --- a/src/amd/vulkan/radv_buffer.c +++ b/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" diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 7e245008386..127f9df403f 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/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" diff --git a/src/amd/vulkan/radv_cp_dma.c b/src/amd/vulkan/radv_cp_dma.c index 6addecd6470..400128348c7 100644 --- a/src/amd/vulkan/radv_cp_dma.c +++ b/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. diff --git a/src/amd/vulkan/radv_cp_reg_shadowing.c b/src/amd/vulkan/radv_cp_reg_shadowing.c index 9ce46ba39e1..d44f6bc9ece 100644 --- a/src/amd/vulkan/radv_cp_reg_shadowing.c +++ b/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" diff --git a/src/amd/vulkan/radv_cs.c b/src/amd/vulkan/radv_cs.c index 898f2e98125..bd0caaee092 100644 --- a/src/amd/vulkan/radv_cs.c +++ b/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" diff --git a/src/amd/vulkan/radv_descriptor_pool.c b/src/amd/vulkan/radv_descriptor_pool.c index aa3d97a07d8..4bc171a0418 100644 --- a/src/amd/vulkan/radv_descriptor_pool.c +++ b/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" diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index c91237823f3..8f8b4496368 100644 --- a/src/amd/vulkan/radv_device.c +++ b/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" diff --git a/src/amd/vulkan/radv_device.h b/src/amd/vulkan/radv_device.h index 9d6451e3071..388251cfe2f 100644 --- a/src/amd/vulkan/radv_device.h +++ b/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" diff --git a/src/amd/vulkan/radv_device_memory.c b/src/amd/vulkan/radv_device_memory.c index 03e99f4ff3e..dc137cfa890 100644 --- a/src/amd/vulkan/radv_device_memory.c +++ b/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" diff --git a/src/amd/vulkan/radv_dgc.c b/src/amd/vulkan/radv_dgc.c index 33bcb88dc7d..e43a0309762 100644 --- a/src/amd/vulkan/radv_dgc.c +++ b/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" diff --git a/src/amd/vulkan/radv_event.c b/src/amd/vulkan/radv_event.c index 6076b9cac53..f77e9f23e8c 100644 --- a/src/amd/vulkan/radv_event.c +++ b/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) diff --git a/src/amd/vulkan/radv_formats.c b/src/amd/vulkan/radv_formats.c index 8a07a4c7c9b..eb55196132b 100644 --- a/src/amd/vulkan/radv_formats.c +++ b/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" diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 5f3ed0322c2..fc203053fc8 100644 --- a/src/amd/vulkan/radv_image.c +++ b/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" diff --git a/src/amd/vulkan/radv_image_view.c b/src/amd/vulkan/radv_image_view.c index c404e1adfb3..d544a4b3fa3 100644 --- a/src/amd/vulkan/radv_image_view.c +++ b/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" diff --git a/src/amd/vulkan/radv_instance.c b/src/amd/vulkan/radv_instance.c index 5df296ebb39..9c033e89a96 100644 --- a/src/amd/vulkan/radv_instance.c +++ b/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" diff --git a/src/amd/vulkan/radv_perfcounter.c b/src/amd/vulkan/radv_perfcounter.c index b08ed45f9aa..0cd95bc025a 100644 --- a/src/amd/vulkan/radv_perfcounter.c +++ b/src/amd/vulkan/radv_perfcounter.c @@ -6,12 +6,12 @@ #include +#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 diff --git a/src/amd/vulkan/radv_physical_device.c b/src/amd/vulkan/radv_physical_device.c index 03fbd84a1c6..c36dd1f3cba 100644 --- a/src/amd/vulkan/radv_physical_device.c +++ b/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" diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index d28ec0a0490..12a66e16f8e 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/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" diff --git a/src/amd/vulkan/radv_pipeline_binary.c b/src/amd/vulkan/radv_pipeline_binary.c index 69f2dde9486..8c0d691d9c8 100644 --- a/src/amd/vulkan/radv_pipeline_binary.c +++ b/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" diff --git a/src/amd/vulkan/radv_pipeline_cache.c b/src/amd/vulkan/radv_pipeline_cache.c index 3dd828a0465..55afaebb49a 100644 --- a/src/amd/vulkan/radv_pipeline_cache.c +++ b/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" diff --git a/src/amd/vulkan/radv_pipeline_compute.c b/src/amd/vulkan/radv_pipeline_compute.c index 334f54f214d..12bfcc0c291 100644 --- a/src/amd/vulkan/radv_pipeline_compute.c +++ b/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" diff --git a/src/amd/vulkan/radv_pipeline_graphics.c b/src/amd/vulkan/radv_pipeline_graphics.c index 04ca57eb8ea..f3110fb257d 100644 --- a/src/amd/vulkan/radv_pipeline_graphics.c +++ b/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" diff --git a/src/amd/vulkan/radv_pipeline_rt.c b/src/amd/vulkan/radv_pipeline_rt.c index 19de4234a0a..4a656cb20cf 100644 --- a/src/amd/vulkan/radv_pipeline_rt.c +++ b/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 { diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c index 01bd374e0b0..4a6423211e5 100644 --- a/src/amd/vulkan/radv_query.c +++ b/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" diff --git a/src/amd/vulkan/radv_queue.c b/src/amd/vulkan/radv_queue.c index 4c19d40d401..fa13be07b78 100644 --- a/src/amd/vulkan/radv_queue.c +++ b/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" diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index c9fdb7140bf..0f2223ab000 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/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" diff --git a/src/amd/vulkan/radv_video.c b/src/amd/vulkan/radv_video.c index 78266f38c36..92ed4a6bde5 100644 --- a/src/amd/vulkan/radv_video.c +++ b/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" diff --git a/src/amd/vulkan/radv_video_enc.c b/src/amd/vulkan/radv_video_enc.c index fc57d457bf1..c638aef1b80 100644 --- a/src/amd/vulkan/radv_video_enc.c +++ b/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" diff --git a/src/amd/vulkan/radv_wsi.c b/src/amd/vulkan/radv_wsi.c index 79280063bf4..d5ab1a70a3d 100644 --- a/src/amd/vulkan/radv_wsi.c +++ b/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 diff --git a/src/amd/vulkan/radv_check_va.py b/src/amd/vulkan/tools/radv_check_va.py similarity index 100% rename from src/amd/vulkan/radv_check_va.py rename to src/amd/vulkan/tools/radv_check_va.py diff --git a/src/amd/vulkan/radv_debug.c b/src/amd/vulkan/tools/radv_debug.c similarity index 100% rename from src/amd/vulkan/radv_debug.c rename to src/amd/vulkan/tools/radv_debug.c diff --git a/src/amd/vulkan/radv_debug.h b/src/amd/vulkan/tools/radv_debug.h similarity index 100% rename from src/amd/vulkan/radv_debug.h rename to src/amd/vulkan/tools/radv_debug.h diff --git a/src/amd/vulkan/radv_debug_nir.c b/src/amd/vulkan/tools/radv_debug_nir.c similarity index 100% rename from src/amd/vulkan/radv_debug_nir.c rename to src/amd/vulkan/tools/radv_debug_nir.c diff --git a/src/amd/vulkan/radv_debug_nir.h b/src/amd/vulkan/tools/radv_debug_nir.h similarity index 100% rename from src/amd/vulkan/radv_debug_nir.h rename to src/amd/vulkan/tools/radv_debug_nir.h diff --git a/src/amd/vulkan/radv_rmv.c b/src/amd/vulkan/tools/radv_rmv.c similarity index 100% rename from src/amd/vulkan/radv_rmv.c rename to src/amd/vulkan/tools/radv_rmv.c diff --git a/src/amd/vulkan/radv_rmv.h b/src/amd/vulkan/tools/radv_rmv.h similarity index 100% rename from src/amd/vulkan/radv_rmv.h rename to src/amd/vulkan/tools/radv_rmv.h diff --git a/src/amd/vulkan/radv_rra.c b/src/amd/vulkan/tools/radv_rra.c similarity index 100% rename from src/amd/vulkan/radv_rra.c rename to src/amd/vulkan/tools/radv_rra.c diff --git a/src/amd/vulkan/radv_rra.h b/src/amd/vulkan/tools/radv_rra.h similarity index 100% rename from src/amd/vulkan/radv_rra.h rename to src/amd/vulkan/tools/radv_rra.h diff --git a/src/amd/vulkan/radv_rra_gfx10_3.c b/src/amd/vulkan/tools/radv_rra_gfx10_3.c similarity index 100% rename from src/amd/vulkan/radv_rra_gfx10_3.c rename to src/amd/vulkan/tools/radv_rra_gfx10_3.c diff --git a/src/amd/vulkan/radv_rra_gfx12.c b/src/amd/vulkan/tools/radv_rra_gfx12.c similarity index 100% rename from src/amd/vulkan/radv_rra_gfx12.c rename to src/amd/vulkan/tools/radv_rra_gfx12.c diff --git a/src/amd/vulkan/radv_spm.c b/src/amd/vulkan/tools/radv_spm.c similarity index 100% rename from src/amd/vulkan/radv_spm.c rename to src/amd/vulkan/tools/radv_spm.c diff --git a/src/amd/vulkan/radv_spm.h b/src/amd/vulkan/tools/radv_spm.h similarity index 100% rename from src/amd/vulkan/radv_spm.h rename to src/amd/vulkan/tools/radv_spm.h diff --git a/src/amd/vulkan/radv_sqtt.c b/src/amd/vulkan/tools/radv_sqtt.c similarity index 100% rename from src/amd/vulkan/radv_sqtt.c rename to src/amd/vulkan/tools/radv_sqtt.c diff --git a/src/amd/vulkan/radv_sqtt.h b/src/amd/vulkan/tools/radv_sqtt.h similarity index 100% rename from src/amd/vulkan/radv_sqtt.h rename to src/amd/vulkan/tools/radv_sqtt.h diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c index 1d7175df04b..754d7889827 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c @@ -11,8 +11,8 @@ #include +#include "tools/radv_debug.h" #include "radv_amdgpu_bo.h" -#include "radv_debug.h" #include #include diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c index 7c3de6517e3..3cd93257cbb 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c @@ -11,6 +11,7 @@ #include #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" diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c index e857e4a896c..d89eb6876c4 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c @@ -12,15 +12,15 @@ #include #include #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)