From cb368f43e830d9cd119cb95d483d7289177b8764 Mon Sep 17 00:00:00 2001 From: Michael Cheng Date: Thu, 7 May 2026 15:04:43 -0700 Subject: [PATCH] intel/ds: Drop trailing 1s from compute dispatch event names Shorten compute* event names by omitting trailing dimensions that are 1. For example, compute(128,1,1) becomes compute(128) and compute_indirect(64,1,1) becomes compute_indirect(64). This makes traces easier to read and reduces trace storage slightly. Signed-off-by: Michael Cheng --- src/intel/ds/intel_driver_ds.cc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/intel/ds/intel_driver_ds.cc b/src/intel/ds/intel_driver_ds.cc index 40cf53dad2e..d4b18facc34 100644 --- a/src/intel/ds/intel_driver_ds.cc +++ b/src/intel/ds/intel_driver_ds.cc @@ -526,12 +526,17 @@ CREATE_DUAL_EVENT_CALLBACK(draw_mesh_indirect, INTEL_DS_QUEUE_STAGE_DRAW_MESH) CREATE_DUAL_EVENT_CALLBACK(draw_mesh_indirect_count, INTEL_DS_QUEUE_STAGE_DRAW_MESH) CREATE_DUAL_EVENT_CALLBACK(xfb, INTEL_DS_QUEUE_STAGE_CMD_BUFFER) CREATE_DUAL_EVENT_CALLBACK(compute, INTEL_DS_QUEUE_STAGE_COMPUTE, - "compute(%u,%u,%u)", + payload->group_z != 1 ? "compute(%u,%u,%u)" : + payload->group_y != 1 ? "compute(%u,%u)" : + "compute(%u)", payload->group_x, payload->group_y, payload->group_z) CREATE_DUAL_EVENT_CALLBACK(compute_indirect, INTEL_DS_QUEUE_STAGE_COMPUTE, - ((p_atomic_read_relaxed(&device->trace_context.enabled_traces) & - U_TRACE_TYPE_INDIRECTS) && indirect) ? - "compute_indirect(%u,%u,%u)" : "compute_indirect", + ((p_atomic_read_relaxed(&device->trace_context.enabled_traces) & + U_TRACE_TYPE_INDIRECTS) && indirect) ? + (indirect[2] != 1 ? "compute_indirect(%u,%u,%u)" : + indirect[1] != 1 ? "compute_indirect(%u,%u)" : + "compute_indirect(%u)") : + "compute_indirect", indirect ? indirect[0] : 0, indirect ? indirect[1] : 0, indirect ? indirect[2] : 0)