lib/igt_drm_clients: Record drm-cycles

Record drm-cycles and delta between 2 sample updates, just like done
with engine time. This also duplicates the utilization_mask so it's
available to the next layer.

Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Link: https://lore.kernel.org/r/20240504064643.25863-11-lucas.demarchi@intel.com
Link: https://lore.kernel.org/r/20240521161525.159720-3-lucas.demarchi@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

2 files changed, 32 insertions, 8 deletions

diff --git a/lib/igt_drm_clients.c b/lib/igt_drm_clients.c
index 91d71a7bd..fbbb763f7 100644
--- a/lib/igt_drm_clients.c
+++ b/lib/igt_drm_clients.c
@@ -105,18 +105,32 @@ igt_drm_client_update(struct igt_drm_client *c, unsigned int pid, char *name,
 
 	c->agg_delta_engine_time = 0;
 	c->total_engine_time = 0;
+	c->agg_delta_cycles = 0;
+	c->total_cycles = 0;
 
 	for (i = 0; i <= c->engines->max_engine_id; i++) {
 		assert(i < ARRAY_SIZE(info->engine_time));
+		assert(i < ARRAY_SIZE(info->cycles));
+
+		if (info->utilization_mask & DRM_FDINFO_UTILIZATION_ENGINE_TIME &&
+		    info->engine_time[i] >= c->utilization[i].last_engine_time) {
+			c->utilization_mask |= IGT_DRM_CLIENT_UTILIZATION_ENGINE_TIME;
+			c->total_engine_time += info->engine_time[i];
+			c->utilization[i].delta_engine_time =
+				info->engine_time[i] - c->utilization[i].last_engine_time;
+			c->agg_delta_engine_time += c->utilization[i].delta_engine_time;
+			c->utilization[i].last_engine_time = info->engine_time[i];
+		}
 
-		if (info->engine_time[i] < c->utilization[i].last_engine_time)
-			continue; /* It will catch up soon. */
-
-		c->total_engine_time += info->engine_time[i];
-		c->utilization[i].delta_engine_time =
-			info->engine_time[i] - c->utilization[i].last_engine_time;
-		c->agg_delta_engine_time += c->utilization[i].delta_engine_time;
-		c->utilization[i].last_engine_time = info->engine_time[i];
+		if (info->utilization_mask & DRM_FDINFO_UTILIZATION_CYCLES &&
+		    info->cycles[i] >= c->utilization[i].last_cycles) {
+			c->utilization_mask |= IGT_DRM_CLIENT_UTILIZATION_CYCLES;
+			c->total_cycles += info->cycles[i];
+			c->utilization[i].delta_cycles =
+				info->cycles[i] - c->utilization[i].last_cycles;
+			c->agg_delta_cycles += c->utilization[i].delta_cycles;
+			c->utilization[i].last_cycles = info->cycles[i];
+		}
 	}
 
 	/* Memory regions */
diff --git a/lib/igt_drm_clients.h b/lib/igt_drm_clients.h
index d44daa6dc..514c09e71 100644
--- a/lib/igt_drm_clients.h
+++ b/lib/igt_drm_clients.h
@@ -33,6 +33,11 @@ enum igt_drm_client_status {
 	IGT_DRM_CLIENT_PROBE
 };
 
+enum igt_drm_client_utilization_type {
+	IGT_DRM_CLIENT_UTILIZATION_ENGINE_TIME	= 1U << 0,
+	IGT_DRM_CLIENT_UTILIZATION_CYCLES	= 1U << 1,
+};
+
 struct igt_drm_client_engines {
 	unsigned int num_engines; /* Number of discovered active engines. */
 	unsigned int max_engine_id; /* Largest engine index discovered.
@@ -64,11 +69,16 @@ struct igt_drm_client {
 	char print_name[24]; /* Name without any non-printable characters. */
 	unsigned int samples; /* Count of times scanning updated this client. */
 
+	uint32_t utilization_mask; /* mask of enum igt_drm_client_utilization_type */
 	unsigned long total_engine_time; /* Aggregate of @utilization.agg_delta_engine_time, i.e. engine time on all engines since client start. */
 	unsigned long agg_delta_engine_time; /* Aggregate of @utilization.delta_engine_time, i.e. engine time on all engines since previous scan. */
+	unsigned long total_cycles; /* Aggregate of @utilization.agg_delta_cycles, i.e. engine time on all engines since client start. */
+	unsigned long agg_delta_cycles; /* Aggregate of @utilization.delta_cycles, i.e. engine time on all engines since previous scan. */
 	struct igt_drm_client_utilization {
 		unsigned long delta_engine_time; /* Engine time data, relative to previous scan. */
+		unsigned long delta_cycles; /* Engine cycles data, relative to previous scan. */
 		uint64_t last_engine_time; /* Engine time data as parsed from fdinfo. */
+		uint64_t last_cycles; /* Engine cycles data as parsed from fdinfo. */
 	} *utilization; /* Array of engine utilization */
 
 	struct drm_client_meminfo *memory; /* Array of region memory utilisation as parsed from fdinfo. */