radv: add initial trap handler support with RADV_TRAP_HANDLER=1
[mesa.git] / src / amd / vulkan / radv_private.h
index 12f192ed200ccb442158ca177e2219bd034014f8..e8383c910b2e5ce6b1fc42c474fc17a30e1c12c7 100644 (file)
@@ -49,9 +49,9 @@
 #include "util/macros.h"
 #include "util/list.h"
 #include "util/xmlconfig.h"
-#include "main/macros.h"
 #include "vk_alloc.h"
 #include "vk_debug_report.h"
+#include "vk_object.h"
 
 #include "radv_radeon_winsys.h"
 #include "ac_binary.h"
@@ -65,8 +65,6 @@
 #include "radv_extensions.h"
 #include "sid.h"
 
-#include <llvm-c/TargetMachine.h>
-
 /* Pre-declarations needed for WSI entrypoints */
 struct wl_surface;
 struct wl_display;
@@ -97,44 +95,6 @@ typedef uint32_t xcb_window_t;
 #define RADV_SUPPORT_ANDROID_HARDWARE_BUFFER 0
 #endif
 
-
-struct gfx10_format {
-    unsigned img_format:9;
-
-    /* Various formats are only supported with workarounds for vertex fetch,
-     * and some 32_32_32 formats are supported natively, but only for buffers
-     * (possibly with some image support, actually, but no filtering). */
-    bool buffers_only:1;
-};
-
-#include "gfx10_format_table.h"
-
-enum radv_mem_heap {
-       RADV_MEM_HEAP_VRAM,
-       RADV_MEM_HEAP_VRAM_CPU_ACCESS,
-       RADV_MEM_HEAP_GTT,
-       RADV_MEM_HEAP_COUNT
-};
-
-enum radv_mem_type {
-       RADV_MEM_TYPE_VRAM,
-       RADV_MEM_TYPE_GTT_WRITE_COMBINE,
-       RADV_MEM_TYPE_VRAM_CPU_ACCESS,
-       RADV_MEM_TYPE_GTT_CACHED,
-       RADV_MEM_TYPE_COUNT
-};
-
-enum radv_secure_compile_type {
-       RADV_SC_TYPE_INIT_SUCCESS,
-       RADV_SC_TYPE_INIT_FAILURE,
-       RADV_SC_TYPE_COMPILE_PIPELINE,
-       RADV_SC_TYPE_COMPILE_PIPELINE_FINISHED,
-       RADV_SC_TYPE_READ_DISK_CACHE,
-       RADV_SC_TYPE_WRITE_DISK_CACHE,
-       RADV_SC_TYPE_DESTROY_DEVICE,
-       RADV_SC_TYPE_COUNT
-};
-
 #define radv_printflike(a, b) __attribute__((__format__(__printf__, a, b)))
 
 static inline uint32_t
@@ -234,10 +194,24 @@ radv_clear_mask(uint32_t *inout_mask, uint32_t clear_mask)
 struct radv_image_view;
 struct radv_instance;
 
-VkResult __vk_errorf(struct radv_instance *instance, VkResult error, const char *file, int line, const char *format, ...);
-
-#define vk_error(instance, error) __vk_errorf(instance, error, __FILE__, __LINE__, NULL);
-#define vk_errorf(instance, error, format, ...) __vk_errorf(instance, error, __FILE__, __LINE__, format, ## __VA_ARGS__);
+VkResult __vk_errorv(struct radv_instance *instance, const void *object,
+                    VkDebugReportObjectTypeEXT type, VkResult error,
+                    const char *file, int line, const char *format,
+                    va_list args);
+
+VkResult __vk_errorf(struct radv_instance *instance, const void *object,
+                    VkDebugReportObjectTypeEXT type, VkResult error,
+                    const char *file, int line, const char *format, ...)
+       radv_printflike(7, 8);
+
+#define vk_error(instance, error) \
+       __vk_errorf(instance, NULL, \
+                   VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, \
+                   error, __FILE__, __LINE__, NULL);
+#define vk_errorf(instance, error, format, ...) \
+       __vk_errorf(instance, NULL, \
+                   VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, \
+                   error, __FILE__, __LINE__, format, ## __VA_ARGS__);
 
 void __radv_finishme(const char *file, int line, const char *format, ...)
        radv_printflike(3, 4);
@@ -265,7 +239,7 @@ void radv_logi_v(const char *format, va_list va);
                                fprintf(stderr, "%s:%d ASSERT: %s\n", __FILE__, __LINE__, #x); \
                })
 #else
-#define radv_assert(x)
+#define radv_assert(x) do {} while(0)
 #endif
 
 #define stub_return(v)                                 \
@@ -280,18 +254,30 @@ void radv_logi_v(const char *format, va_list va);
                return;                                 \
        } while (0)
 
-void *radv_lookup_entrypoint_unchecked(const char *name);
-void *radv_lookup_entrypoint_checked(const char *name,
-                                    uint32_t core_version,
-                                    const struct radv_instance_extension_table *instance,
-                                    const struct radv_device_extension_table *device);
-void *radv_lookup_physical_device_entrypoint_checked(const char *name,
-                                                     uint32_t core_version,
-                                                     const struct radv_instance_extension_table *instance);
+int radv_get_instance_entrypoint_index(const char *name);
+int radv_get_device_entrypoint_index(const char *name);
+int radv_get_physical_device_entrypoint_index(const char *name);
+
+const char *radv_get_instance_entry_name(int index);
+const char *radv_get_physical_device_entry_name(int index);
+const char *radv_get_device_entry_name(int index);
+
+bool radv_instance_entrypoint_is_enabled(int index, uint32_t core_version,
+                                        const struct radv_instance_extension_table *instance);
+bool radv_physical_device_entrypoint_is_enabled(int index, uint32_t core_version,
+                                               const struct radv_instance_extension_table *instance);
+bool radv_device_entrypoint_is_enabled(int index, uint32_t core_version,
+                                      const struct radv_instance_extension_table *instance,
+                                      const struct radv_device_extension_table *device);
+
+void *radv_lookup_entrypoint(const char *name);
 
 struct radv_physical_device {
        VK_LOADER_DATA                              _loader_data;
 
+       /* Link in radv_instance::physical_devices */
+       struct list_head                            link;
+
        struct radv_instance *                       instance;
 
        struct radeon_winsys *ws;
@@ -310,12 +296,12 @@ struct radv_physical_device {
        /* Whether DCC should be enabled for MSAA textures. */
        bool dcc_msaa_allowed;
 
-       /* Whether to enable the AMD_shader_ballot extension */
-       bool use_shader_ballot;
-
        /* Whether to enable NGG. */
        bool use_ngg;
 
+       /* Whether to enable NGG GS. */
+       bool use_ngg_gs;
+
        /* Whether to enable NGG streamout. */
        bool use_ngg_streamout;
 
@@ -324,8 +310,8 @@ struct radv_physical_device {
        uint8_t cs_wave_size;
        uint8_t ge_wave_size;
 
-       /* Whether to use the experimental compiler backend */
-       bool use_aco;
+       /* Whether to use the LLVM compiler backend */
+       bool use_llvm;
 
        /* This is the drivers on-disk cache used as a fallback as opposed to
         * the pipeline cache defined by apps.
@@ -333,7 +319,8 @@ struct radv_physical_device {
        struct disk_cache *                          disk_cache;
 
        VkPhysicalDeviceMemoryProperties memory_properties;
-       enum radv_mem_type mem_type_indices[RADV_MEM_TYPE_COUNT];
+       enum radeon_bo_domain memory_domains[VK_MAX_MEMORY_TYPES];
+       enum radeon_bo_flag memory_flags[VK_MAX_MEMORY_TYPES];
 
        drmPciBusInfo bus_info;
 
@@ -341,34 +328,38 @@ struct radv_physical_device {
 };
 
 struct radv_instance {
-       VK_LOADER_DATA                              _loader_data;
+       struct vk_object_base                       base;
 
        VkAllocationCallbacks                       alloc;
 
        uint32_t                                    apiVersion;
-       int                                         physicalDeviceCount;
-       struct radv_physical_device                 physicalDevices[RADV_MAX_DRM_DEVICES];
 
+       char *                                      applicationName;
+       uint32_t                                    applicationVersion;
        char *                                      engineName;
        uint32_t                                    engineVersion;
 
        uint64_t debug_flags;
        uint64_t perftest_flags;
-       uint8_t num_sc_threads;
 
        struct vk_debug_report_instance             debug_report_callbacks;
 
        struct radv_instance_extension_table enabled_extensions;
+       struct radv_instance_dispatch_table          dispatch;
+       struct radv_physical_device_dispatch_table   physical_device_dispatch;
+       struct radv_device_dispatch_table            device_dispatch;
+
+       bool                                        physical_devices_enumerated;
+       struct list_head                            physical_devices;
 
        struct driOptionCache dri_options;
        struct driOptionCache available_dri_options;
-};
 
-static inline
-bool radv_device_use_secure_compile(struct radv_instance *instance)
-{
-   return instance->num_sc_threads;
-}
+       /**
+        * Workarounds for game bugs.
+        */
+       bool enable_mrt_output_nan_fixup;
+};
 
 VkResult radv_init_wsi(struct radv_physical_device *physical_device);
 void radv_finish_wsi(struct radv_physical_device *physical_device);
@@ -381,8 +372,10 @@ bool radv_physical_device_extension_supported(struct radv_physical_device *dev,
 struct cache_entry;
 
 struct radv_pipeline_cache {
-       struct radv_device *                          device;
+       struct vk_object_base                        base;
+       struct radv_device *                         device;
        pthread_mutex_t                              mutex;
+       VkPipelineCacheCreateFlags                   flags;
 
        uint32_t                                     total_size;
        uint32_t                                     table_size;
@@ -408,9 +401,15 @@ struct radv_pipeline_key {
        uint32_t is_int10;
        uint8_t log2_ps_iter_samples;
        uint8_t num_samples;
+       bool is_dual_src;
        uint32_t has_multiview_view_index : 1;
        uint32_t optimisations_disabled : 1;
        uint8_t topology;
+
+       /* Non-zero if a required subgroup size is specified via
+        * VK_EXT_subgroup_size_control.
+        */
+       uint8_t compute_subgroup_size;
 };
 
 struct radv_shader_binary;
@@ -643,7 +642,7 @@ struct radv_meta_state {
 
        struct {
                VkPipelineLayout                          p_layout;
-               VkPipeline                                decompress_pipeline;
+               VkPipeline                                decompress_pipeline[NUM_DEPTH_DECOMPRESS_PIPELINES];
                VkPipeline                                resummarize_pipeline;
                VkRenderPass                              pass;
        } depth_decomp[MAX_SAMPLES_LOG2];
@@ -692,6 +691,8 @@ struct radv_meta_state {
 
 #define RADV_MAX_QUEUE_FAMILIES 3
 
+struct radv_deferred_queue_submission;
+
 enum ring_type radv_queue_family_to_ring(int f);
 
 struct radv_queue {
@@ -703,12 +704,15 @@ struct radv_queue {
        int queue_idx;
        VkDeviceQueueCreateFlags flags;
 
-       uint32_t scratch_size;
-       uint32_t compute_scratch_size;
+       uint32_t scratch_size_per_wave;
+       uint32_t scratch_waves;
+       uint32_t compute_scratch_size_per_wave;
+       uint32_t compute_scratch_waves;
        uint32_t esgs_ring_size;
        uint32_t gsvs_ring_size;
        bool has_tess_rings;
        bool has_gds;
+       bool has_gds_oa;
        bool has_sample_positions;
 
        struct radeon_winsys_bo *scratch_bo;
@@ -722,6 +726,16 @@ struct radv_queue {
        struct radeon_cmdbuf *initial_preamble_cs;
        struct radeon_cmdbuf *initial_full_flush_preamble_cs;
        struct radeon_cmdbuf *continue_preamble_cs;
+
+       struct list_head pending_submissions;
+       pthread_mutex_t pending_mutex;
+
+       pthread_mutex_t thread_mutex;
+       pthread_cond_t thread_cond;
+       struct radv_deferred_queue_submission *thread_submission;
+       pthread_t submission_thread;
+       bool thread_exit;
+       bool thread_running;
 };
 
 struct radv_bo_list {
@@ -730,28 +744,27 @@ struct radv_bo_list {
        pthread_mutex_t mutex;
 };
 
-struct radv_secure_compile_process {
-       /* Secure process file descriptors */
-       int fd_secure_input;
-       int fd_secure_output;
+VkResult radv_bo_list_add(struct radv_device *device,
+                         struct radeon_winsys_bo *bo);
+void radv_bo_list_remove(struct radv_device *device,
+                        struct radeon_winsys_bo *bo);
 
-       /* Secure compile process id */
-       pid_t sc_pid;
+#define RADV_BORDER_COLOR_COUNT       4096
+#define RADV_BORDER_COLOR_BUFFER_SIZE (sizeof(VkClearColorValue) * RADV_BORDER_COLOR_COUNT)
 
-       /* Is the secure compile process currently in use by a thread */
-       bool in_use;
-};
+struct radv_device_border_color_data {
+       bool                     used[RADV_BORDER_COLOR_COUNT];
+
+       struct radeon_winsys_bo *bo;
+       VkClearColorValue       *colors_gpu_ptr;
 
-struct radv_secure_compile_state {
-       struct radv_secure_compile_process *secure_compile_processes;
-       uint32_t secure_compile_thread_counter;
-       mtx_t secure_compile_mutex;
+       /* Mutex is required to guarantee vkCreateSampler thread safety
+        * given that we are writing to a buffer and checking color occupation */
+       pthread_mutex_t          mutex;
 };
 
 struct radv_device {
-       VK_LOADER_DATA                              _loader_data;
-
-       VkAllocationCallbacks                       alloc;
+       struct vk_device vk;
 
        struct radv_instance *                       instance;
        struct radeon_winsys *ws;
@@ -807,6 +820,7 @@ struct radv_device {
        uint64_t dmesg_timestamp;
 
        struct radv_device_extension_table enabled_extensions;
+       struct radv_device_dispatch_table dispatch;
 
        /* Whether the app has enabled the robustBufferAccess feature. */
        bool robust_buffer_access;
@@ -819,16 +833,56 @@ struct radv_device {
        /* Whether anisotropy is forced with RADV_TEX_ANISO (-1 is disabled). */
        int force_aniso;
 
-       struct radv_secure_compile_state *sc_state;
+       struct radv_device_border_color_data border_color_data;
+
+       /* Condition variable for legacy timelines, to notify waiters when a
+        * new point gets submitted. */
+       pthread_cond_t timeline_cond;
+
+       /* Thread trace. */
+       struct radeon_cmdbuf *thread_trace_start_cs[2];
+       struct radeon_cmdbuf *thread_trace_stop_cs[2];
+       struct radeon_winsys_bo *thread_trace_bo;
+       void *thread_trace_ptr;
+       uint32_t thread_trace_buffer_size;
+       int thread_trace_start_frame;
+
+       /* Trap handler. */
+       struct radv_shader_variant *trap_handler_shader;
+       struct radeon_winsys_bo *tma_bo; /* Trap Memory Address */
+       uint32_t *tma_ptr;
+
+       /* Overallocation. */
+       bool overallocation_disallowed;
+       uint64_t allocated_memory_size[VK_MAX_MEMORY_HEAPS];
+       mtx_t overallocation_mutex;
+
+       /* Track the number of device loss occurs. */
+       int lost;
 };
 
+VkResult _radv_device_set_lost(struct radv_device *device,
+                              const char *file, int line,
+                              const char *msg, ...)
+       radv_printflike(4, 5);
+
+#define radv_device_set_lost(dev, ...) \
+       _radv_device_set_lost(dev, __FILE__, __LINE__, __VA_ARGS__)
+
+static inline bool
+radv_device_is_lost(const struct radv_device *device)
+{
+       return unlikely(p_atomic_read(&device->lost));
+}
+
 struct radv_device_memory {
+       struct vk_object_base                        base;
        struct radeon_winsys_bo                      *bo;
        /* for dedicated allocations */
        struct radv_image                            *image;
        struct radv_buffer                           *buffer;
-       uint32_t                                     type_index;
-       VkDeviceSize                                 map_size;
+       uint32_t                                     heap_index;
+       uint64_t                                     alloc_size;
        void *                                       map;
        void *                                       user_ptr;
 
@@ -844,8 +898,10 @@ struct radv_descriptor_range {
 };
 
 struct radv_descriptor_set {
+       struct vk_object_base base;
        const struct radv_descriptor_set_layout *layout;
        uint32_t size;
+       uint32_t buffer_count;
 
        struct radeon_winsys_bo *bo;
        uint64_t va;
@@ -868,6 +924,7 @@ struct radv_descriptor_pool_entry {
 };
 
 struct radv_descriptor_pool {
+       struct vk_object_base base;
        struct radeon_winsys_bo *bo;
        uint8_t *mapped_ptr;
        uint64_t current_offset;
@@ -909,12 +966,14 @@ struct radv_descriptor_update_template_entry {
 };
 
 struct radv_descriptor_update_template {
+       struct vk_object_base base;
        uint32_t entry_count;
        VkPipelineBindPoint bind_point;
        struct radv_descriptor_update_template_entry entry[0];
 };
 
 struct radv_buffer {
+       struct vk_object_base                        base;
        VkDeviceSize                                 size;
 
        VkBufferUsageFlags                           usage;
@@ -928,40 +987,62 @@ struct radv_buffer {
 };
 
 enum radv_dynamic_state_bits {
-       RADV_DYNAMIC_VIEWPORT             = 1 << 0,
-       RADV_DYNAMIC_SCISSOR              = 1 << 1,
-       RADV_DYNAMIC_LINE_WIDTH           = 1 << 2,
-       RADV_DYNAMIC_DEPTH_BIAS           = 1 << 3,
-       RADV_DYNAMIC_BLEND_CONSTANTS      = 1 << 4,
-       RADV_DYNAMIC_DEPTH_BOUNDS         = 1 << 5,
-       RADV_DYNAMIC_STENCIL_COMPARE_MASK = 1 << 6,
-       RADV_DYNAMIC_STENCIL_WRITE_MASK   = 1 << 7,
-       RADV_DYNAMIC_STENCIL_REFERENCE    = 1 << 8,
-       RADV_DYNAMIC_DISCARD_RECTANGLE    = 1 << 9,
-       RADV_DYNAMIC_SAMPLE_LOCATIONS     = 1 << 10,
-       RADV_DYNAMIC_ALL                  = (1 << 11) - 1,
+       RADV_DYNAMIC_VIEWPORT                           = 1 << 0,
+       RADV_DYNAMIC_SCISSOR                            = 1 << 1,
+       RADV_DYNAMIC_LINE_WIDTH                         = 1 << 2,
+       RADV_DYNAMIC_DEPTH_BIAS                         = 1 << 3,
+       RADV_DYNAMIC_BLEND_CONSTANTS                    = 1 << 4,
+       RADV_DYNAMIC_DEPTH_BOUNDS                       = 1 << 5,
+       RADV_DYNAMIC_STENCIL_COMPARE_MASK               = 1 << 6,
+       RADV_DYNAMIC_STENCIL_WRITE_MASK                 = 1 << 7,
+       RADV_DYNAMIC_STENCIL_REFERENCE                  = 1 << 8,
+       RADV_DYNAMIC_DISCARD_RECTANGLE                  = 1 << 9,
+       RADV_DYNAMIC_SAMPLE_LOCATIONS                   = 1 << 10,
+       RADV_DYNAMIC_LINE_STIPPLE                       = 1 << 11,
+       RADV_DYNAMIC_CULL_MODE                          = 1 << 12,
+       RADV_DYNAMIC_FRONT_FACE                         = 1 << 13,
+       RADV_DYNAMIC_PRIMITIVE_TOPOLOGY                 = 1 << 14,
+       RADV_DYNAMIC_DEPTH_TEST_ENABLE                  = 1 << 15,
+       RADV_DYNAMIC_DEPTH_WRITE_ENABLE                 = 1 << 16,
+       RADV_DYNAMIC_DEPTH_COMPARE_OP                   = 1 << 17,
+       RADV_DYNAMIC_DEPTH_BOUNDS_TEST_ENABLE           = 1 << 18,
+       RADV_DYNAMIC_STENCIL_TEST_ENABLE                = 1 << 19,
+       RADV_DYNAMIC_STENCIL_OP                         = 1 << 20,
+       RADV_DYNAMIC_VERTEX_INPUT_BINDING_STRIDE        = 1 << 21,
+       RADV_DYNAMIC_ALL                                = (1 << 22) - 1,
 };
 
 enum radv_cmd_dirty_bits {
        /* Keep the dynamic state dirty bits in sync with
         * enum radv_dynamic_state_bits */
-       RADV_CMD_DIRTY_DYNAMIC_VIEWPORT                  = 1 << 0,
-       RADV_CMD_DIRTY_DYNAMIC_SCISSOR                   = 1 << 1,
-       RADV_CMD_DIRTY_DYNAMIC_LINE_WIDTH                = 1 << 2,
-       RADV_CMD_DIRTY_DYNAMIC_DEPTH_BIAS                = 1 << 3,
-       RADV_CMD_DIRTY_DYNAMIC_BLEND_CONSTANTS           = 1 << 4,
-       RADV_CMD_DIRTY_DYNAMIC_DEPTH_BOUNDS              = 1 << 5,
-       RADV_CMD_DIRTY_DYNAMIC_STENCIL_COMPARE_MASK      = 1 << 6,
-       RADV_CMD_DIRTY_DYNAMIC_STENCIL_WRITE_MASK        = 1 << 7,
-       RADV_CMD_DIRTY_DYNAMIC_STENCIL_REFERENCE         = 1 << 8,
-       RADV_CMD_DIRTY_DYNAMIC_DISCARD_RECTANGLE         = 1 << 9,
-       RADV_CMD_DIRTY_DYNAMIC_SAMPLE_LOCATIONS          = 1 << 10,
-       RADV_CMD_DIRTY_DYNAMIC_ALL                       = (1 << 11) - 1,
-       RADV_CMD_DIRTY_PIPELINE                          = 1 << 11,
-       RADV_CMD_DIRTY_INDEX_BUFFER                      = 1 << 12,
-       RADV_CMD_DIRTY_FRAMEBUFFER                       = 1 << 13,
-       RADV_CMD_DIRTY_VERTEX_BUFFER                     = 1 << 14,
-       RADV_CMD_DIRTY_STREAMOUT_BUFFER                  = 1 << 15,
+       RADV_CMD_DIRTY_DYNAMIC_VIEWPORT                         = 1 << 0,
+       RADV_CMD_DIRTY_DYNAMIC_SCISSOR                          = 1 << 1,
+       RADV_CMD_DIRTY_DYNAMIC_LINE_WIDTH                       = 1 << 2,
+       RADV_CMD_DIRTY_DYNAMIC_DEPTH_BIAS                       = 1 << 3,
+       RADV_CMD_DIRTY_DYNAMIC_BLEND_CONSTANTS                  = 1 << 4,
+       RADV_CMD_DIRTY_DYNAMIC_DEPTH_BOUNDS                     = 1 << 5,
+       RADV_CMD_DIRTY_DYNAMIC_STENCIL_COMPARE_MASK             = 1 << 6,
+       RADV_CMD_DIRTY_DYNAMIC_STENCIL_WRITE_MASK               = 1 << 7,
+       RADV_CMD_DIRTY_DYNAMIC_STENCIL_REFERENCE                = 1 << 8,
+       RADV_CMD_DIRTY_DYNAMIC_DISCARD_RECTANGLE                = 1 << 9,
+       RADV_CMD_DIRTY_DYNAMIC_SAMPLE_LOCATIONS                 = 1 << 10,
+       RADV_CMD_DIRTY_DYNAMIC_LINE_STIPPLE                     = 1 << 11,
+       RADV_CMD_DIRTY_DYNAMIC_CULL_MODE                        = 1 << 12,
+       RADV_CMD_DIRTY_DYNAMIC_FRONT_FACE                       = 1 << 13,
+       RADV_CMD_DIRTY_DYNAMIC_PRIMITIVE_TOPOLOGY               = 1 << 14,
+       RADV_CMD_DIRTY_DYNAMIC_DEPTH_TEST_ENABLE                = 1 << 15,
+       RADV_CMD_DIRTY_DYNAMIC_DEPTH_WRITE_ENABLE               = 1 << 16,
+       RADV_CMD_DIRTY_DYNAMIC_DEPTH_COMPARE_OP                 = 1 << 17,
+       RADV_CMD_DIRTY_DYNAMIC_DEPTH_BOUNDS_TEST_ENABLE         = 1 << 18,
+       RADV_CMD_DIRTY_DYNAMIC_STENCIL_TEST_ENABLE              = 1 << 19,
+       RADV_CMD_DIRTY_DYNAMIC_STENCIL_OP                       = 1 << 20,
+       RADV_CMD_DIRTY_DYNAMIC_VERTEX_INPUT_BINDING_STRIDE      = 1 << 21,
+       RADV_CMD_DIRTY_DYNAMIC_ALL                              = (1 << 22) - 1,
+       RADV_CMD_DIRTY_PIPELINE                                 = 1 << 22,
+       RADV_CMD_DIRTY_INDEX_BUFFER                             = 1 << 23,
+       RADV_CMD_DIRTY_FRAMEBUFFER                              = 1 << 24,
+       RADV_CMD_DIRTY_VERTEX_BUFFER                            = 1 << 25,
+       RADV_CMD_DIRTY_STREAMOUT_BUFFER                         = 1 << 26,
 };
 
 enum radv_cmd_flush_bits {
@@ -1002,6 +1083,8 @@ enum radv_cmd_flush_bits {
 struct radv_vertex_binding {
        struct radv_buffer *                          buffer;
        VkDeviceSize                                 offset;
+       VkDeviceSize size;
+       VkDeviceSize stride;
 };
 
 struct radv_streamout_binding {
@@ -1085,6 +1168,22 @@ struct radv_dynamic_state {
                uint32_t                                  back;
        } stencil_write_mask;
 
+       struct {
+               struct {
+                       VkStencilOp fail_op;
+                       VkStencilOp pass_op;
+                       VkStencilOp depth_fail_op;
+                       VkCompareOp compare_op;
+               } front;
+
+               struct {
+                       VkStencilOp fail_op;
+                       VkStencilOp pass_op;
+                       VkStencilOp depth_fail_op;
+                       VkCompareOp compare_op;
+               } back;
+       } stencil_op;
+
        struct {
                uint32_t                                  front;
                uint32_t                                  back;
@@ -1093,6 +1192,21 @@ struct radv_dynamic_state {
        struct radv_discard_rectangle_state               discard_rectangle;
 
        struct radv_sample_locations_state                sample_location;
+
+       struct {
+               uint32_t factor;
+               uint16_t pattern;
+       } line_stipple;
+
+       VkCullModeFlags cull_mode;
+       VkFrontFace front_face;
+       unsigned primitive_topology;
+
+       bool depth_test_enable;
+       bool depth_write_enable;
+       VkCompareOp depth_compare_op;
+       bool depth_bounds_test_enable;
+       bool stencil_test_enable;
 };
 
 extern const struct radv_dynamic_state default_dynamic_state;
@@ -1161,6 +1275,7 @@ struct radv_attachment_state {
        uint32_t                                     cleared_views;
        VkClearValue                                 clear_value;
        VkImageLayout                                current_layout;
+       VkImageLayout                                current_stencil_layout;
        bool                                         current_in_render_loop;
        struct radv_sample_locations_state           sample_location;
 
@@ -1224,6 +1339,7 @@ struct radv_cmd_state {
        unsigned                                     active_occlusion_queries;
        bool                                         perfect_occlusion_queries_enabled;
        unsigned                                     active_pipeline_queries;
+       unsigned                                     active_pipeline_gds_queries;
        float                                        offset_scale;
        uint32_t                                      trace_id;
        uint32_t                                      last_ia_multi_vgt_param;
@@ -1232,6 +1348,10 @@ struct radv_cmd_state {
        uint32_t last_first_instance;
        uint32_t last_vertex_offset;
 
+       uint32_t last_sx_ps_downconvert;
+       uint32_t last_sx_blend_opt_epsilon;
+       uint32_t last_sx_blend_opt_control;
+
        /* Whether CP DMA is busy/idle. */
        bool dma_is_busy;
 
@@ -1239,10 +1359,19 @@ struct radv_cmd_state {
        int predication_type; /* -1: disabled, 0: normal, 1: inverted */
        uint64_t predication_va;
 
+       /* Inheritance info. */
+       VkQueryPipelineStatisticFlags inherited_pipeline_statistics;
+
        bool context_roll_without_scissor_emitted;
+
+       /* SQTT related state. */
+       uint32_t current_event_type;
+       uint32_t num_events;
+       uint32_t num_layout_transitions;
 };
 
 struct radv_cmd_pool {
+       struct vk_object_base                        base;
        VkAllocationCallbacks                        alloc;
        struct list_head                             cmd_buffers;
        struct list_head                             free_cmd_buffers;
@@ -1266,7 +1395,7 @@ enum radv_cmd_buffer_status {
 };
 
 struct radv_cmd_buffer {
-       VK_LOADER_DATA                               _loader_data;
+       struct vk_object_base                         base;
 
        struct radv_device *                          device;
 
@@ -1286,16 +1415,19 @@ struct radv_cmd_buffer {
        VkShaderStageFlags push_constant_stages;
        struct radv_descriptor_set meta_push_descriptors;
 
-       struct radv_descriptor_state descriptors[VK_PIPELINE_BIND_POINT_RANGE_SIZE];
+       struct radv_descriptor_state descriptors[MAX_BIND_POINTS];
 
        struct radv_cmd_buffer_upload upload;
 
-       uint32_t scratch_size_needed;
-       uint32_t compute_scratch_size_needed;
+       uint32_t scratch_size_per_wave_needed;
+       uint32_t scratch_waves_wanted;
+       uint32_t compute_scratch_size_per_wave_needed;
+       uint32_t compute_scratch_waves_wanted;
        uint32_t esgs_ring_size_needed;
        uint32_t gsvs_ring_size_needed;
        bool tess_rings_needed;
-       bool gds_needed; /* for GFX10 streamout */
+       bool gds_needed; /* for GFX10 streamout and NGG GS queries */
+       bool gds_oa_needed; /* for GFX10 streamout */
        bool sample_positions_needed;
 
        VkResult record_result;
@@ -1320,9 +1452,9 @@ struct radv_image_view;
 
 bool radv_cmd_buffer_uses_mec(struct radv_cmd_buffer *cmd_buffer);
 
-void si_emit_graphics(struct radv_physical_device *physical_device,
+void si_emit_graphics(struct radv_device *device,
                      struct radeon_cmdbuf *cs);
-void si_emit_compute(struct radv_physical_device *physical_device,
+void si_emit_compute(struct radv_device *device,
                      struct radeon_cmdbuf *cs);
 
 void cik_create_gfx_config(struct radv_device *device);
@@ -1335,7 +1467,8 @@ void si_write_scissors(struct radeon_cmdbuf *cs, int first,
 uint32_t si_get_ia_multi_vgt_param(struct radv_cmd_buffer *cmd_buffer,
                                   bool instanced_draw, bool indirect_draw,
                                   bool count_from_stream_output,
-                                  uint32_t draw_vertex_count);
+                                  uint32_t draw_vertex_count,
+                                  unsigned topology);
 void si_cs_emit_write_event_eop(struct radeon_cmdbuf *cs,
                                enum chip_class chip_class,
                                bool is_mec,
@@ -1385,11 +1518,11 @@ void radv_cmd_buffer_resolve_subpass(struct radv_cmd_buffer *cmd_buffer);
 void radv_cmd_buffer_resolve_subpass_cs(struct radv_cmd_buffer *cmd_buffer);
 void radv_depth_stencil_resolve_subpass_cs(struct radv_cmd_buffer *cmd_buffer,
                                           VkImageAspectFlags aspects,
-                                          VkResolveModeFlagBitsKHR resolve_mode);
+                                          VkResolveModeFlagBits resolve_mode);
 void radv_cmd_buffer_resolve_subpass_fs(struct radv_cmd_buffer *cmd_buffer);
 void radv_depth_stencil_resolve_subpass_fs(struct radv_cmd_buffer *cmd_buffer,
                                           VkImageAspectFlags aspects,
-                                          VkResolveModeFlagBitsKHR resolve_mode);
+                                          VkResolveModeFlagBits resolve_mode);
 void radv_emit_default_sample_locations(struct radeon_cmdbuf *cs, int nr_samples);
 unsigned radv_get_default_max_sample_dist(int log_samples);
 void radv_device_init_msaa(struct radv_device *device);
@@ -1419,6 +1552,9 @@ void radv_cmd_buffer_trace_emit(struct radv_cmd_buffer *cmd_buffer);
 bool radv_get_memory_fd(struct radv_device *device,
                        struct radv_device_memory *memory,
                        int *pFD);
+void radv_free_memory(struct radv_device *device,
+                     const VkAllocationCallbacks* pAllocator,
+                     struct radv_device_memory *mem);
 
 static inline void
 radv_emit_shader_pointer_head(struct radeon_cmdbuf *cs,
@@ -1477,20 +1613,18 @@ void radv_unaligned_dispatch(
        uint32_t                                    z);
 
 struct radv_event {
+       struct vk_object_base base;
        struct radeon_winsys_bo *bo;
        uint64_t *map;
 };
 
 struct radv_shader_module;
 
-#define RADV_HASH_SHADER_IS_GEOM_COPY_SHADER (1 << 0)
-#define RADV_HASH_SHADER_SISCHED             (1 << 1)
-#define RADV_HASH_SHADER_UNSAFE_MATH         (1 << 2)
-#define RADV_HASH_SHADER_NO_NGG              (1 << 3)
-#define RADV_HASH_SHADER_CS_WAVE32           (1 << 4)
-#define RADV_HASH_SHADER_PS_WAVE32           (1 << 5)
-#define RADV_HASH_SHADER_GE_WAVE32           (1 << 6)
-#define RADV_HASH_SHADER_ACO                 (1 << 7)
+#define RADV_HASH_SHADER_NO_NGG              (1 << 0)
+#define RADV_HASH_SHADER_CS_WAVE32           (1 << 1)
+#define RADV_HASH_SHADER_PS_WAVE32           (1 << 2)
+#define RADV_HASH_SHADER_GE_WAVE32           (1 << 3)
+#define RADV_HASH_SHADER_LLVM                (1 << 4)
 
 void
 radv_hash_shaders(unsigned char *hash,
@@ -1525,7 +1659,6 @@ unsigned radv_format_meta_fs_key(VkFormat format);
 
 struct radv_multisample_state {
        uint32_t db_eqaa;
-       uint32_t pa_sc_line_cntl;
        uint32_t pa_sc_mode_cntl_0;
        uint32_t pa_sc_mode_cntl_1;
        uint32_t pa_sc_aa_config;
@@ -1538,15 +1671,10 @@ struct radv_prim_vertex_count {
        uint8_t incr;
 };
 
-struct radv_vertex_elements_info {
-       uint32_t format_size[MAX_VERTEX_ATTRIBS];
-};
-
 struct radv_ia_multi_vgt_param_helpers {
        uint32_t base;
        bool partial_es_wave;
        uint8_t primgroup_size;
-       bool wd_switch_on_eop;
        bool ia_switch_on_eoi;
        bool partial_vs_wave;
 };
@@ -1559,6 +1687,7 @@ struct radv_binning_state {
 #define SI_GS_PER_ES 128
 
 struct radv_pipeline {
+       struct vk_object_base                         base;
        struct radv_device *                          device;
        struct radv_dynamic_state                     dynamic_state;
 
@@ -1573,8 +1702,6 @@ struct radv_pipeline {
        uint32_t                                  ctx_cs_hash;
        struct radeon_cmdbuf                      ctx_cs;
 
-       struct radv_vertex_elements_info             vertex_elements;
-
        uint32_t                                     binding_stride[MAX_VBS];
        uint8_t                                      num_vertex_bindings;
 
@@ -1590,10 +1717,13 @@ struct radv_pipeline {
                        uint32_t vtx_base_sgpr;
                        struct radv_ia_multi_vgt_param_helpers ia_multi_vgt_param;
                        uint8_t vtx_emit_num;
-                       struct radv_prim_vertex_count prim_vertex_count;
                        bool can_use_guardband;
                        uint32_t needed_dynamic_state;
                        bool disable_out_of_order_rast_for_occlusion;
+                       unsigned tess_patch_control_points;
+                       unsigned pa_su_sc_mode_cntl;
+                       unsigned db_depth_control;
+                       bool uses_dynamic_stride;
 
                        /* Used for rbplus */
                        uint32_t col_format;
@@ -1620,13 +1750,15 @@ static inline bool radv_pipeline_has_tess(const struct radv_pipeline *pipeline)
 
 bool radv_pipeline_has_ngg(const struct radv_pipeline *pipeline);
 
+bool radv_pipeline_has_ngg_passthrough(const struct radv_pipeline *pipeline);
+
 bool radv_pipeline_has_gs_copy_shader(const struct radv_pipeline *pipeline);
 
 struct radv_userdata_info *radv_lookup_user_sgpr(struct radv_pipeline *pipeline,
                                                 gl_shader_stage stage,
                                                 int idx);
 
-struct radv_shader_variant *radv_get_shader(struct radv_pipeline *pipeline,
+struct radv_shader_variant *radv_get_shader(const struct radv_pipeline *pipeline,
                                            gl_shader_stage stage);
 
 struct radv_graphics_pipeline_create_info {
@@ -1635,9 +1767,9 @@ struct radv_graphics_pipeline_create_info {
        bool db_stencil_clear;
        bool db_depth_disable_expclear;
        bool db_stencil_disable_expclear;
-       bool db_flush_depth_inplace;
-       bool db_flush_stencil_inplace;
-       bool db_resummarize;
+       bool depth_compress_disable;
+       bool stencil_compress_disable;
+       bool resummarize_enable;
        uint32_t custom_blend_mode;
 };
 
@@ -1649,6 +1781,15 @@ radv_graphics_pipeline_create(VkDevice device,
                              const VkAllocationCallbacks *alloc,
                              VkPipeline *pPipeline);
 
+struct radv_binning_settings {
+       unsigned context_states_per_bin; /* allowed range: [1, 6] */
+       unsigned persistent_states_per_bin; /* allowed range: [1, 32] */
+       unsigned fpovs_per_batch; /* allowed range: [0, 255], 0 = unlimited */
+};
+
+struct radv_binning_settings
+radv_get_binning_settings(const struct radv_physical_device *pdev);
+
 struct vk_format_description;
 uint32_t radv_translate_buffer_dataformat(const struct vk_format_description *desc,
                                          int first_non_void);
@@ -1683,6 +1824,7 @@ struct radv_image_plane {
 };
 
 struct radv_image {
+       struct vk_object_base base;
        VkImageType type;
        /* The original VkFormat provided by the client.  This may not match any
         * of the actual surface formats.
@@ -1704,13 +1846,9 @@ struct radv_image {
        /* Set when bound */
        struct radeon_winsys_bo *bo;
        VkDeviceSize offset;
-       uint64_t dcc_offset;
-       uint64_t htile_offset;
        bool tc_compatible_htile;
        bool tc_compatible_cmask;
 
-       uint64_t cmask_offset;
-       uint64_t fmask_offset;
        uint64_t clear_value_offset;
        uint64_t fce_pred_offset;
        uint64_t dcc_pred_offset;
@@ -1730,13 +1868,6 @@ struct radv_image {
        struct radv_image_plane planes[0];
 };
 
-/* Whether the image has a htile that is known consistent with the contents of
- * the image. */
-bool radv_layout_has_htile(const struct radv_image *image,
-                           VkImageLayout layout,
-                           bool in_render_loop,
-                           unsigned queue_mask);
-
 /* Whether the image has a htile  that is known consistent with the contents of
  * the image and is allowed to be in compressed form.
  *
@@ -1765,7 +1896,7 @@ bool radv_layout_dcc_compressed(const struct radv_device *device,
 static inline bool
 radv_image_has_cmask(const struct radv_image *image)
 {
-       return image->cmask_offset;
+       return image->planes[0].surface.cmask_offset;
 }
 
 /**
@@ -1774,7 +1905,7 @@ radv_image_has_cmask(const struct radv_image *image)
 static inline bool
 radv_image_has_fmask(const struct radv_image *image)
 {
-       return image->fmask_offset;
+       return image->planes[0].surface.fmask_offset;
 }
 
 /**
@@ -1928,6 +2059,7 @@ union radv_descriptor {
 };
 
 struct radv_image_view {
+       struct vk_object_base base;
        struct radv_image *image; /**< VkImageViewCreateInfo::image */
        struct radeon_winsys_bo *bo;
 
@@ -2006,6 +2138,7 @@ void radv_image_view_init(struct radv_image_view *view,
 VkFormat radv_get_aspect_format(struct radv_image *image, VkImageAspectFlags mask);
 
 struct radv_sampler_ycbcr_conversion {
+       struct vk_object_base base;
        VkFormat format;
        VkSamplerYcbcrModelConversion ycbcr_model;
        VkSamplerYcbcrRange ycbcr_range;
@@ -2015,6 +2148,7 @@ struct radv_sampler_ycbcr_conversion {
 };
 
 struct radv_buffer_view {
+       struct vk_object_base base;
        struct radeon_winsys_bo *bo;
        VkFormat vk_format;
        uint64_t range; /**< VkBufferViewCreateInfo::range */
@@ -2068,11 +2202,14 @@ radv_image_extent_compare(const struct radv_image *image,
 }
 
 struct radv_sampler {
+       struct vk_object_base base;
        uint32_t state[4];
        struct radv_sampler_ycbcr_conversion *ycbcr_sampler;
+       uint32_t border_color_slot;
 };
 
 struct radv_framebuffer {
+       struct vk_object_base                        base;
        uint32_t                                     width;
        uint32_t                                     height;
        uint32_t                                     layers;
@@ -2093,6 +2230,7 @@ void radv_subpass_barrier(struct radv_cmd_buffer *cmd_buffer,
 struct radv_subpass_attachment {
        uint32_t         attachment;
        VkImageLayout    layout;
+       VkImageLayout    stencil_layout;
        bool             in_render_loop;
 };
 
@@ -2107,8 +2245,8 @@ struct radv_subpass {
        struct radv_subpass_attachment *             resolve_attachments;
        struct radv_subpass_attachment *             depth_stencil_attachment;
        struct radv_subpass_attachment *             ds_resolve_attachment;
-       VkResolveModeFlagBitsKHR                     depth_resolve_mode;
-       VkResolveModeFlagBitsKHR                     stencil_resolve_mode;
+       VkResolveModeFlagBits                        depth_resolve_mode;
+       VkResolveModeFlagBits                        stencil_resolve_mode;
 
        /** Subpass has at least one color resolve attachment */
        bool                                         has_color_resolve;
@@ -2119,6 +2257,9 @@ struct radv_subpass {
        struct radv_subpass_barrier                  start_barrier;
 
        uint32_t                                     view_mask;
+
+       VkSampleCountFlagBits                        color_sample_count;
+       VkSampleCountFlagBits                        depth_sample_count;
        VkSampleCountFlagBits                        max_sample_count;
 };
 
@@ -2132,6 +2273,8 @@ struct radv_render_pass_attachment {
        VkAttachmentLoadOp                           stencil_load_op;
        VkImageLayout                                initial_layout;
        VkImageLayout                                final_layout;
+       VkImageLayout                                stencil_initial_layout;
+       VkImageLayout                                stencil_final_layout;
 
        /* The subpass id in which the attachment will be used first/last. */
        uint32_t                                     first_subpass_idx;
@@ -2139,6 +2282,7 @@ struct radv_render_pass_attachment {
 };
 
 struct radv_render_pass {
+       struct vk_object_base                        base;
        uint32_t                                     attachment_count;
        uint32_t                                     subpass_count;
        struct radv_subpass_attachment *             subpass_attachments;
@@ -2151,6 +2295,7 @@ VkResult radv_device_init_meta(struct radv_device *device);
 void radv_device_finish_meta(struct radv_device *device);
 
 struct radv_query_pool {
+       struct vk_object_base base;
        struct radeon_winsys_bo *bo;
        uint32_t stride;
        uint32_t availability_offset;
@@ -2160,13 +2305,77 @@ struct radv_query_pool {
        uint32_t pipeline_stats_mask;
 };
 
-struct radv_semaphore {
-       /* use a winsys sem for non-exportable */
-       struct radeon_winsys_sem *sem;
+typedef enum {
+       RADV_SEMAPHORE_NONE,
+       RADV_SEMAPHORE_WINSYS,
+       RADV_SEMAPHORE_SYNCOBJ,
+       RADV_SEMAPHORE_TIMELINE_SYNCOBJ,
+       RADV_SEMAPHORE_TIMELINE,
+} radv_semaphore_kind;
+
+struct radv_deferred_queue_submission;
+
+struct radv_timeline_waiter {
+       struct list_head list;
+       struct radv_deferred_queue_submission *submission;
+       uint64_t value;
+};
+
+struct radv_timeline_point {
+       struct list_head list;
+
+       uint64_t value;
+       uint32_t syncobj;
+
+       /* Separate from the list to accomodate CPU wait being async, as well
+        * as prevent point deletion during submission. */
+       unsigned wait_count;
+};
+
+struct radv_timeline {
+       /* Using a pthread mutex to be compatible with condition variables. */
+       pthread_mutex_t mutex;
+
+       uint64_t highest_signaled;
+       uint64_t highest_submitted;
+
+       struct list_head points;
+
+       /* Keep free points on hand so we do not have to recreate syncobjs all
+        * the time. */
+       struct list_head free_points;
+
+       /* Submissions that are deferred waiting for a specific value to be
+        * submitted. */
+       struct list_head waiters;
+};
+
+struct radv_timeline_syncobj {
+       /* Keep syncobj first, so common-code can just handle this as
+        * non-timeline syncobj. */
        uint32_t syncobj;
-       uint32_t temp_syncobj;
+       uint64_t max_point; /* max submitted point. */
+};
+
+struct radv_semaphore_part {
+       radv_semaphore_kind kind;
+       union {
+               uint32_t syncobj;
+               struct radeon_winsys_sem *ws_sem;
+               struct radv_timeline timeline;
+               struct radv_timeline_syncobj timeline_syncobj;
+       };
 };
 
+struct radv_semaphore {
+       struct vk_object_base base;
+       struct radv_semaphore_part permanent;
+       struct radv_semaphore_part temporary;
+};
+
+bool radv_queue_internal_submit(struct radv_queue *queue,
+                               struct radeon_cmdbuf *cs);
+
 void radv_set_descriptor_set(struct radv_cmd_buffer *cmd_buffer,
                             VkPipelineBindPoint bind_point,
                             struct radv_descriptor_set *set,
@@ -2203,30 +2412,42 @@ void radv_initialize_fmask(struct radv_cmd_buffer *cmd_buffer,
                           struct radv_image *image,
                           const VkImageSubresourceRange *range);
 
-struct radv_fence {
-       struct radeon_winsys_fence *fence;
-       struct wsi_fence *fence_wsi;
+typedef enum {
+       RADV_FENCE_NONE,
+       RADV_FENCE_WINSYS,
+       RADV_FENCE_SYNCOBJ,
+       RADV_FENCE_WSI,
+} radv_fence_kind;
 
-       uint32_t syncobj;
-       uint32_t temp_syncobj;
+struct radv_fence_part {
+       radv_fence_kind kind;
+
+       union {
+               /* AMDGPU winsys fence. */
+               struct radeon_winsys_fence *fence;
+
+               /* DRM syncobj handle for syncobj-based fences. */
+               uint32_t syncobj;
+
+               /* WSI fence. */
+               struct wsi_fence *fence_wsi;
+       };
 };
 
-/* radv_nir_to_llvm.c */
-struct radv_shader_info;
-struct radv_nir_compiler_options;
+struct radv_fence {
+       struct vk_object_base base;
+       struct radv_fence_part permanent;
+       struct radv_fence_part temporary;
+};
 
-void radv_compile_gs_copy_shader(struct ac_llvm_compiler *ac_llvm,
-                                struct nir_shader *geom_shader,
-                                struct radv_shader_binary **rbinary,
-                                struct radv_shader_info *info,
-                                const struct radv_nir_compiler_options *option);
+/* radv_nir_to_llvm.c */
+struct radv_shader_args;
 
-void radv_compile_nir_shader(struct ac_llvm_compiler *ac_llvm,
-                            struct radv_shader_binary **rbinary,
-                            struct radv_shader_info *info,
-                            struct nir_shader *const *nir,
-                            int nir_count,
-                            const struct radv_nir_compiler_options *options);
+void llvm_compile_shader(struct radv_device *device,
+                        unsigned shader_count,
+                        struct nir_shader *const *shaders,
+                        struct radv_shader_binary **binary,
+                        struct radv_shader_args *args);
 
 unsigned radv_nir_get_max_workgroup_size(enum chip_class chip_class,
                                         gl_shader_stage stage,
@@ -2239,10 +2460,101 @@ struct radv_shader_variant_key;
 void radv_nir_shader_info_pass(const struct nir_shader *nir,
                               const struct radv_pipeline_layout *layout,
                               const struct radv_shader_variant_key *key,
-                              struct radv_shader_info *info);
+                              struct radv_shader_info *info,
+                              bool use_llvm);
 
 void radv_nir_shader_info_init(struct radv_shader_info *info);
 
+/* radv_sqtt.c */
+struct radv_thread_trace_info {
+       uint32_t cur_offset;
+       uint32_t trace_status;
+       union {
+               uint32_t gfx9_write_counter;
+               uint32_t gfx10_dropped_cntr;
+       };
+};
+
+struct radv_thread_trace_se {
+       struct radv_thread_trace_info info;
+       void *data_ptr;
+       uint32_t shader_engine;
+       uint32_t compute_unit;
+};
+
+struct radv_thread_trace {
+       uint32_t num_traces;
+       struct radv_thread_trace_se traces[4];
+};
+
+bool radv_thread_trace_init(struct radv_device *device);
+void radv_thread_trace_finish(struct radv_device *device);
+bool radv_begin_thread_trace(struct radv_queue *queue);
+bool radv_end_thread_trace(struct radv_queue *queue);
+bool radv_get_thread_trace(struct radv_queue *queue,
+                          struct radv_thread_trace *thread_trace);
+void radv_emit_thread_trace_userdata(struct radeon_cmdbuf *cs,
+                                    const void *data, uint32_t num_dwords);
+
+/* radv_rgp.c */
+int radv_dump_thread_trace(struct radv_device *device,
+                          const struct radv_thread_trace *trace);
+
+/* radv_sqtt_layer_.c */
+struct radv_barrier_data {
+       union {
+               struct {
+                       uint16_t depth_stencil_expand : 1;
+                       uint16_t htile_hiz_range_expand : 1;
+                       uint16_t depth_stencil_resummarize : 1;
+                       uint16_t dcc_decompress : 1;
+                       uint16_t fmask_decompress : 1;
+                       uint16_t fast_clear_eliminate : 1;
+                       uint16_t fmask_color_expand : 1;
+                       uint16_t init_mask_ram : 1;
+                       uint16_t reserved : 8;
+               };
+               uint16_t all;
+       } layout_transitions;
+};
+
+/**
+ * Value for the reason field of an RGP barrier start marker originating from
+ * the Vulkan client (does not include PAL-defined values). (Table 15)
+ */
+enum rgp_barrier_reason {
+       RGP_BARRIER_UNKNOWN_REASON = 0xFFFFFFFF,
+
+       /* External app-generated barrier reasons, i.e. API synchronization
+        * commands Range of valid values: [0x00000001 ... 0x7FFFFFFF].
+        */
+       RGP_BARRIER_EXTERNAL_CMD_PIPELINE_BARRIER = 0x00000001,
+       RGP_BARRIER_EXTERNAL_RENDER_PASS_SYNC     = 0x00000002,
+       RGP_BARRIER_EXTERNAL_CMD_WAIT_EVENTS      = 0x00000003,
+
+       /* Internal barrier reasons, i.e. implicit synchronization inserted by
+        * the Vulkan driver Range of valid values: [0xC0000000 ... 0xFFFFFFFE].
+        */
+       RGP_BARRIER_INTERNAL_BASE                             = 0xC0000000,
+       RGP_BARRIER_INTERNAL_PRE_RESET_QUERY_POOL_SYNC        = RGP_BARRIER_INTERNAL_BASE + 0,
+       RGP_BARRIER_INTERNAL_POST_RESET_QUERY_POOL_SYNC       = RGP_BARRIER_INTERNAL_BASE + 1,
+       RGP_BARRIER_INTERNAL_GPU_EVENT_RECYCLE_STALL          = RGP_BARRIER_INTERNAL_BASE + 2,
+       RGP_BARRIER_INTERNAL_PRE_COPY_QUERY_POOL_RESULTS_SYNC = RGP_BARRIER_INTERNAL_BASE + 3
+};
+
+void radv_describe_begin_cmd_buffer(struct radv_cmd_buffer *cmd_buffer);
+void radv_describe_end_cmd_buffer(struct radv_cmd_buffer *cmd_buffer);
+void radv_describe_draw(struct radv_cmd_buffer *cmd_buffer);
+void radv_describe_dispatch(struct radv_cmd_buffer *cmd_buffer, int x, int y, int z);
+void radv_describe_begin_render_pass_clear(struct radv_cmd_buffer *cmd_buffer,
+                                          VkImageAspectFlagBits aspects);
+void radv_describe_end_render_pass_clear(struct radv_cmd_buffer *cmd_buffer);
+void radv_describe_barrier_start(struct radv_cmd_buffer *cmd_buffer,
+                                enum rgp_barrier_reason reason);
+void radv_describe_barrier_end(struct radv_cmd_buffer *cmd_buffer);
+void radv_describe_layout_transition(struct radv_cmd_buffer *cmd_buffer,
+                                    const struct radv_barrier_data *barrier);
+
 struct radeon_winsys_sem;
 
 uint64_t radv_get_current_time(void);
@@ -2271,6 +2583,75 @@ si_conv_gl_prim_to_vertices(unsigned gl_prim)
        }
 }
 
+void radv_cmd_buffer_begin_render_pass(struct radv_cmd_buffer *cmd_buffer,
+                                      const VkRenderPassBeginInfo *pRenderPassBegin);
+void radv_cmd_buffer_end_render_pass(struct radv_cmd_buffer *cmd_buffer);
+
+static inline uint32_t si_translate_prim(unsigned topology)
+{
+       switch (topology) {
+       case VK_PRIMITIVE_TOPOLOGY_POINT_LIST:
+               return V_008958_DI_PT_POINTLIST;
+       case VK_PRIMITIVE_TOPOLOGY_LINE_LIST:
+               return V_008958_DI_PT_LINELIST;
+       case VK_PRIMITIVE_TOPOLOGY_LINE_STRIP:
+               return V_008958_DI_PT_LINESTRIP;
+       case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST:
+               return V_008958_DI_PT_TRILIST;
+       case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP:
+               return V_008958_DI_PT_TRISTRIP;
+       case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN:
+               return V_008958_DI_PT_TRIFAN;
+       case VK_PRIMITIVE_TOPOLOGY_LINE_LIST_WITH_ADJACENCY:
+               return V_008958_DI_PT_LINELIST_ADJ;
+       case VK_PRIMITIVE_TOPOLOGY_LINE_STRIP_WITH_ADJACENCY:
+               return V_008958_DI_PT_LINESTRIP_ADJ;
+       case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST_WITH_ADJACENCY:
+               return V_008958_DI_PT_TRILIST_ADJ;
+       case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP_WITH_ADJACENCY:
+               return V_008958_DI_PT_TRISTRIP_ADJ;
+       case VK_PRIMITIVE_TOPOLOGY_PATCH_LIST:
+               return V_008958_DI_PT_PATCH;
+       default:
+               assert(0);
+               return 0;
+       }
+}
+
+static inline uint32_t si_translate_stencil_op(enum VkStencilOp op)
+{
+       switch (op) {
+       case VK_STENCIL_OP_KEEP:
+               return V_02842C_STENCIL_KEEP;
+       case VK_STENCIL_OP_ZERO:
+               return V_02842C_STENCIL_ZERO;
+       case VK_STENCIL_OP_REPLACE:
+               return V_02842C_STENCIL_REPLACE_TEST;
+       case VK_STENCIL_OP_INCREMENT_AND_CLAMP:
+               return V_02842C_STENCIL_ADD_CLAMP;
+       case VK_STENCIL_OP_DECREMENT_AND_CLAMP:
+               return V_02842C_STENCIL_SUB_CLAMP;
+       case VK_STENCIL_OP_INVERT:
+               return V_02842C_STENCIL_INVERT;
+       case VK_STENCIL_OP_INCREMENT_AND_WRAP:
+               return V_02842C_STENCIL_ADD_WRAP;
+       case VK_STENCIL_OP_DECREMENT_AND_WRAP:
+               return V_02842C_STENCIL_SUB_WRAP;
+       default:
+               return 0;
+       }
+}
+
+/**
+ * Helper used for debugging compiler issues by enabling/disabling LLVM for a
+ * specific shader stage (developers only).
+ */
+static inline bool
+radv_use_llvm_for_stage(struct radv_device *device, UNUSED gl_shader_stage stage)
+{
+       return device->physical_device->use_llvm;
+}
+
 #define RADV_DEFINE_HANDLE_CASTS(__radv_type, __VkType)                \
                                                                \
        static inline struct __radv_type *                      \