radv: add initial trap handler support with RADV_TRAP_HANDLER=1

[mesa.git] / src / amd / vulkan / radv_private.h

diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 0bc96a75a10d90b595288d6c2c90a56e25dad881..e8383c910b2e5ce6b1fc42c474fc17a30e1c12c7 100644 (file)
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -194,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);
@@ -320,6 +334,8 @@ struct radv_instance {
 
        uint32_t                                    apiVersion;
 
+       char *                                      applicationName;
+       uint32_t                                    applicationVersion;
        char *                                      engineName;
        uint32_t                                    engineVersion;
 
@@ -675,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 {
@@ -711,6 +729,13 @@ struct radv_queue {
 
        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 {
@@ -822,12 +847,34 @@ struct radv_device {
        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;
@@ -1407,7 +1454,7 @@ bool radv_cmd_buffer_uses_mec(struct radv_cmd_buffer *cmd_buffer);
 
 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);
@@ -1612,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;
@@ -1625,10 +1671,6 @@ 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;
@@ -1660,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;
 
@@ -1688,7 +1728,6 @@ struct radv_pipeline {
                        /* Used for rbplus */
                        uint32_t col_format;
                        uint32_t cb_target_mask;
-                       bool is_dual_src;
                } graphics;
        };
 
@@ -1719,7 +1758,7 @@ 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 {
@@ -2270,6 +2309,7 @@ typedef enum {
        RADV_SEMAPHORE_NONE,
        RADV_SEMAPHORE_WINSYS,
        RADV_SEMAPHORE_SYNCOBJ,
+       RADV_SEMAPHORE_TIMELINE_SYNCOBJ,
        RADV_SEMAPHORE_TIMELINE,
 } radv_semaphore_kind;
 
@@ -2310,12 +2350,20 @@ struct radv_timeline {
        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;
+       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;
        };
 };
 
@@ -2594,6 +2642,16 @@ static inline uint32_t si_translate_stencil_op(enum VkStencilOp op)
        }
 }
 
+/**
+ * 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 *                      \