On 26/07/2023 18:32, Kamil Konieczny wrote:
Hi Tvrtko,
On 2023-07-05 at 17:31:05 +0100, Tvrtko Ursulin wrote:
From: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
Show total and resident memory usage for clients which support it.
For simplicity all memory regions are summed up and shown under a single
heading.
Co-developed-by: Rob Clark <robdclark@xxxxxxxxxxxx>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
---
tools/gputop.c | 34 +++++++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/tools/gputop.c b/tools/gputop.c
index 681f0a6bb748..b5b360cbb063 100644
--- a/tools/gputop.c
+++ b/tools/gputop.c
@@ -28,6 +28,7 @@
#include "igt_drm_clients.h"
#include "igt_drm_fdinfo.h"
+#include "drmtest.h"
static const char *bars[] = { " ", "▏", "▎", "▍", "▌", "▋", "▊", "▉", "█" };
@@ -80,7 +81,11 @@ print_client_header(struct igt_drm_client *c, int lines, int con_w, int con_h,
return lines;
putchar('\n');
- len = printf("%*s ", c->clients->max_pid_len, "PID");
+ if (c->regions->num_regions)
+ len = printf("%*s MEM RSS ",
+ c->clients->max_pid_len, "PID");
+ else
+ len = printf("%*s ", c->clients->max_pid_len, "PID");
if (c->engines->num_engines) {
unsigned int i;
@@ -121,12 +126,28 @@ newheader(const struct igt_drm_client *c, const struct igt_drm_client *pc)
return !pc || c->drm_minor != pc->drm_minor;
}
+static int
+print_size(uint64_t sz)
+{
+ char units[] = {'B', 'K', 'M', 'G'};
+ unsigned u;
------- ^
Better:
unsigned int u;
With that add my r-b tag,
Okay, thanks, re-send will be coming shortly, just some final smoke
tests to do.
Regards,
Tvrtko
Regards,
Kamil
+
+ for (u = 0; u < ARRAY_SIZE(units) - 1; u++) {
+ if (sz < 1024)
+ break;
+ sz /= 1024;
+ }
+
+ return printf("%7"PRIu64"%c ", sz, units[u]);
+}
+
static int
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)
{
unsigned int i;
+ uint64_t sz;
int len;
/* Filter out idle clients. */
@@ -143,6 +164,17 @@ print_client(struct igt_drm_client *c, struct igt_drm_client **prevc,
*prevc = c;
len = printf("%*s ", c->clients->max_pid_len, c->pid_str);
+
+ if (c->regions->num_regions) {
+ for (sz = 0, i = 0; i < c->regions->max_region_id; i++)
+ sz += c->memory[i].total;
+ len += print_size(sz);
+
+ for (sz = 0, i = 0; i < c->regions->max_region_id; i++)
+ sz += c->memory[i].resident;
+ len += print_size(sz);
+ }
+
lines++;
for (i = 0; c->samples > 1 && i <= c->engines->max_engine_id; i++) {
--
2.39.2
