[PATCH i-g-t v2 12/21] lib/igt_drm_fdinfo: Parse drm-total-cycles

[Tvrtko Ursulin]

On 24/04/2024 00:44, Lucas De Marchi wrote:
> Parse drm-total-cycles and annotate what are the possible engine
> utilization types that can be used. Currently there are 2 possible ways
> to calculate utilization:
> 
> 1) via drm-engine, that uses the time and derive the utilization by
>     comparing to the CPU time
> 2) via drm-cycles + drm-total-cycles, that uses the GPU time
> 
> igt_drm_fdinfo just marks the presence of the keys, letting the caller
> decide which method to use.
> 
> It is assumed that if any drm-engine, drm-cycles or drm-total-cycles is
> available, it's available for all engines with non-zero utilization.
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>   lib/igt_drm_fdinfo.c | 9 +++++++++
>   lib/igt_drm_fdinfo.h | 8 ++++++++
>   2 files changed, 17 insertions(+)
> 
> diff --git a/lib/igt_drm_fdinfo.c b/lib/igt_drm_fdinfo.c
> index 723e2e340..7a1485c66 100644
> --- a/lib/igt_drm_fdinfo.c
> +++ b/lib/igt_drm_fdinfo.c
> @@ -218,6 +218,7 @@ __igt_parse_drm_fdinfo(int dir, const char *fd, struct drm_client_fdinfo *info,
>   		       const char **name_map, unsigned int map_entries,
>   		       const char **region_map, unsigned int region_entries)
>   {
> +	bool has_cycles = false, has_total_cycles = false;
>   	bool regions_found[DRM_CLIENT_FDINFO_MAX_REGIONS] = { };
>   	bool engines_found[DRM_CLIENT_FDINFO_MAX_ENGINES] = { };
>   	unsigned int good = 0, num_capacity = 0;
> @@ -264,10 +265,15 @@ __igt_parse_drm_fdinfo(int dir, const char *fd, struct drm_client_fdinfo *info,
>   			idx = parse_engine(l + keylen, info,
>   					   name_map, map_entries, &val);
>   			UPDATE_ENGINE(idx, busy, val);
> +			info->dcut |= DCUT_ENGINE_TIME;
>   		} else if (strstartswith(l, "drm-cycles-", &keylen)) {
>   			idx = parse_engine(l + keylen, info,
>   					   name_map, map_entries, &val);
>   			UPDATE_ENGINE(idx, cycles, val);
> +		} else if (strstartswith(l, "drm-total-cycles-", &keylen)) {
> +			idx = parse_engine(l + keylen, info,
> +					   name_map, map_entries, &val);
> +			UPDATE_ENGINE(idx, total_cycles, val);
>   		} else if (strstartswith(l, "drm-total-", &keylen)) {
>   			idx = parse_region(l + keylen, info,
>   					   region_map, region_entries, &val);
> @@ -294,6 +300,9 @@ __igt_parse_drm_fdinfo(int dir, const char *fd, struct drm_client_fdinfo *info,
>   	if (good < 2 || (!info->num_engines && !info->num_regions))
>   		return 0; /* fdinfo format not as expected */
>   
> +	if (has_cycles && has_total_cycles)
> +		info->dcut |= DCUT_GPU_TOTAL_CYCLES;
> +
>   	return good + info->num_engines + num_capacity + info->num_regions;
>   }
>   
> diff --git a/lib/igt_drm_fdinfo.h b/lib/igt_drm_fdinfo.h
> index 17a47f94a..4fbd7fe08 100644
> --- a/lib/igt_drm_fdinfo.h
> +++ b/lib/igt_drm_fdinfo.h
> @@ -41,6 +41,11 @@ struct drm_client_meminfo {
>   	uint64_t active;
>   };
>   
> +enum drm_client_utilization_type {
> +	DCUT_ENGINE_TIME	= 1U << 0,
> +	DCUT_GPU_TOTAL_CYCLES	= 1U << 1,
> +};

Liking the series so far but of course bike shed moment to maybe 
consider being verbose and call these DRM_CLIENT_FDINFO_...

Regards,

Tvrtko

> +
>   struct drm_client_fdinfo {
>   	char driver[128];
>   	char pdev[128];
> @@ -51,10 +56,13 @@ struct drm_client_fdinfo {
>   	unsigned int capacity[DRM_CLIENT_FDINFO_MAX_ENGINES];
>   	char names[DRM_CLIENT_FDINFO_MAX_ENGINES][256];
>   
> +	enum drm_client_utilization_type dcut;
>   	/* drm-engine-<engine> values */
>   	uint64_t busy[DRM_CLIENT_FDINFO_MAX_ENGINES];
>   	/* drm-cycles-<engine> values */
>   	uint64_t cycles[DRM_CLIENT_FDINFO_MAX_ENGINES];
> +	/* drm-total-cycles-<engine> values */
> +	uint64_t total_cycles[DRM_CLIENT_FDINFO_MAX_ENGINES];
>   
>   	unsigned int num_regions;
>   	unsigned int last_region_index;