[PATCH i-g-t v3 13/13] gputop: Add support to drm-cycles/drm-total-cycles

[Umesh Nerlige Ramappa]

On Fri, May 03, 2024 at 11:46:43PM -0700, Lucas De Marchi wrote:
>Add support for using only GPU timestamps to calculate the utilization.
>It uses drm-cycles and drm-total-cycles read from fdinfo. For any
>2 samples, the utilization is calculated as:
>
>	         u[i+1] - u[i]
>	pct  = -----------------
>	        Gt[i+1] - Gt[i]
>
>with u == drm-cycles and Gt == drm-total-cycles.
>
>Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>


LGTM,

Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa at intel.com>

Thanks,
Umesh
>---
> tools/gputop.c | 41 +++++++++++++++++++++++++++++++++++++----
> 1 file changed, 37 insertions(+), 4 deletions(-)
>
>diff --git a/tools/gputop.c b/tools/gputop.c
>index aa88a8021..11e0db482 100644
>--- a/tools/gputop.c
>+++ b/tools/gputop.c
>@@ -30,6 +30,11 @@
> #include "igt_drm_fdinfo.h"
> #include "drmtest.h"
>
>+enum utilization_type {
>+	UTILIZATION_TYPE_ENGINE_TIME,
>+	UTILIZATION_TYPE_TOTAL_CYCLES,
>+};
>+
> static const char *bars[] = { " ", "▏", "▎", "▍", "▌", "▋", "▊", "▉", "█" };
>
> static void n_spaces(const unsigned int n)
>@@ -171,13 +176,33 @@ print_client(struct igt_drm_client *c, struct igt_drm_client **prevc,
> 	     double t, int lines, int con_w, int con_h,
> 	     unsigned int period_us, int *engine_w)
> {
>+	enum utilization_type utilization_type;
> 	unsigned int i;
> 	uint64_t sz;
> 	int len;
>
>+	if (c->utilization_mask & IGT_DRM_CLIENT_UTILIZATION_TOTAL_CYCLES &&
>+	    c->utilization_mask & IGT_DRM_CLIENT_UTILIZATION_CYCLES)
>+		utilization_type = UTILIZATION_TYPE_TOTAL_CYCLES;
>+	else if (c->utilization_mask & IGT_DRM_CLIENT_UTILIZATION_ENGINE_TIME)
>+		utilization_type = UTILIZATION_TYPE_ENGINE_TIME;
>+	else
>+		return 0;
>+
>+	if (c->samples < 2)
>+		return 0;
>+
> 	/* Filter out idle clients. */
>-	if (!c->total_engine_time || c->samples < 2)
>-		return lines;
>+	switch (utilization_type) {
>+	case UTILIZATION_TYPE_ENGINE_TIME:
>+	       if (!c->total_engine_time)
>+		       return 0;
>+	       break;
>+	case UTILIZATION_TYPE_TOTAL_CYCLES:
>+	       if (!c->total_total_cycles)
>+		       return 0;
>+	       break;
>+	}
>
> 	/* Print header when moving to a different DRM card. */
> 	if (newheader(c, *prevc)) {
>@@ -208,8 +233,16 @@ print_client(struct igt_drm_client *c, struct igt_drm_client **prevc,
> 		if (!c->engines->capacity[i])
> 			continue;
>
>-		pct = (double)c->utilization[i].delta_engine_time / period_us / 1e3 * 100 /
>-		      c->engines->capacity[i];
>+		switch (utilization_type) {
>+		case UTILIZATION_TYPE_ENGINE_TIME:
>+			pct = (double)c->utilization[i].delta_engine_time / period_us / 1e3 * 100 /
>+				c->engines->capacity[i];
>+			break;
>+		case UTILIZATION_TYPE_TOTAL_CYCLES:
>+			pct = (double)c->utilization[i].delta_cycles / c->utilization[i].delta_total_cycles * 100 /
>+				c->engines->capacity[i];
>+			break;
>+		}
>
> 		/*
> 		 * Guard against fluctuations between our scanning period and
>-- 
>2.43.0
>