intel/utrace: make blorp tracepoints more readable

With the operation name and some formats.

Signed-off-by: Lionel Landwerlin <[email protected]>
Reviewed-by: Ivan Briano <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17467>

Author: llandwerlin-intel

src/gallium/drivers/iris/iris_blorp.c

@@ -478,12 +478,13 @@ blorp_measure_end(struct blorp_batch *blorp_batch,
    struct iris_batch *batch = blorp_batch->driver_batch;
 
    trace_intel_end_blorp(&batch->trace,
+                         params->op,
                          params->x1 - params->x0,
                          params->y1 - params->y0,
-                         params->hiz_op,
-                         params->fast_clear_op,
-                         params->shader_type,
-                         params->shader_pipeline);
+                         params->num_samples,
+                         params->shader_pipeline,
+                         params->dst.view.format,
+                         params->src.view.format);
 }
 
 void

src/intel/ds/intel_tracepoints.py

@@ -72,12 +72,14 @@ def begin_end_tp(name, tp_args=[], tp_struct=None, tp_print=None, end_pipelined=
                           Arg(type='uint8_t', var='resume', c_format='%hhu'),])
 
     begin_end_tp('blorp',
-                 tp_args=[Arg(type='uint32_t', name='width', var='width', c_format='%u'),
+                 tp_args=[Arg(type='enum blorp_op', name='op', var='op', c_format='%s', to_prim_type='blorp_op_to_name({})'),
+                          Arg(type='uint32_t', name='width', var='width', c_format='%u'),
                           Arg(type='uint32_t', name='height', var='height', c_format='%u'),
-                          Arg(type='enum isl_aux_op', name='hiz_op', var='hiz_op', c_format='%s', to_prim_type='isl_aux_op_to_name({})'),
-                          Arg(type='enum isl_aux_op', name='fast_clear_op', var='fast_clear_op', c_format='%s', to_prim_type='isl_aux_op_to_name({})'),
-                          Arg(type='enum blorp_shader_type', name='blorp_type', var='shader_type', c_format='%s', to_prim_type='blorp_shader_type_to_name({})'),
-                          Arg(type='enum blorp_shader_pipeline', name='blorp_pipe', var='shader_pipe', c_format='%s', to_prim_type='blorp_shader_pipeline_to_name({})'),])
+                          Arg(type='uint32_t', name='samples', var='samples', c_format='%u'),
+                          Arg(type='enum blorp_shader_pipeline', name='blorp_pipe', var='shader_pipe', c_format='%s', to_prim_type='blorp_shader_pipeline_to_name({})'),
+                          Arg(type='enum isl_format', name='dst_fmt', var='dst_fmt', c_format='%s', to_prim_type='isl_format_get_short_name({})'),
+                          Arg(type='enum isl_format', name='src_fmt', var='src_fmt', c_format='%s', to_prim_type='isl_format_get_short_name({})'),
+                          ])
 
     begin_end_tp('draw',
                  tp_args=[Arg(type='uint32_t', var='count', c_format='%u')])

src/intel/isl/isl.h

@@ -1841,6 +1841,12 @@ isl_format_get_name(enum isl_format fmt)
    return isl_format_names + isl_format_name_offsets[fmt];
 }
 
+static inline const char * ATTRIBUTE_CONST
+isl_format_get_short_name(enum isl_format fmt)
+{
+   return isl_format_get_name(fmt) + 11 /* ISL_FORMAT_ */;
+}
+
 enum isl_format isl_format_for_pipe_format(enum pipe_format pf);
 
 bool isl_format_supports_rendering(const struct intel_device_info *devinfo,

src/intel/vulkan/genX_blorp_exec.c

@@ -51,12 +51,13 @@ static void blorp_measure_end(struct blorp_batch *_batch,
 {
    struct anv_cmd_buffer *cmd_buffer = _batch->driver_batch;
    trace_intel_end_blorp(&cmd_buffer->trace,
+                         params->op,
                          params->x1 - params->x0,
                          params->y1 - params->y0,
-                         params->hiz_op,
-                         params->fast_clear_op,
-                         params->shader_type,
-                         params->shader_pipeline);
+                         params->num_samples,
+                         params->shader_pipeline,
+                         params->dst.view.format,
+                         params->src.view.format);
 }
 
 static void *

src/intel/vulkan_hasvk/genX_blorp_exec.c

@@ -51,12 +51,13 @@ static void blorp_measure_end(struct blorp_batch *_batch,
 {
    struct anv_cmd_buffer *cmd_buffer = _batch->driver_batch;
    trace_intel_end_blorp(&cmd_buffer->trace,
+                         params->op,
                          params->x1 - params->x0,
                          params->y1 - params->y0,
-                         params->hiz_op,
-                         params->fast_clear_op,
-                         params->shader_type,
-                         params->shader_pipeline);
+                         params->num_samples,
+                         params->shader_pipeline,
+                         params->dst.view.format,
+                         params->src.view.format);
 }
 
 static void *