From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: igt-dev@lists.freedesktop.org, Intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH i-g-t 09/12] lib/igt_drm_clients: Allow passing in the memory region map
Date: Fri, 29 Sep 2023 13:25:14 +0100 [thread overview]
Message-ID: <20230929122517.349348-10-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <20230929122517.349348-1-tvrtko.ursulin@linux.intel.com>
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Same concept as with the engine map, allowing callers to pass in fixed
map of names to indices, simplifying their implementation and avoiding
auto-detection while parsing.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
lib/igt_drm_clients.c | 5 +++--
lib/igt_drm_clients.h | 3 ++-
tools/gputop.c | 4 ++--
tools/intel_gpu_top.c | 8 +++++---
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/lib/igt_drm_clients.c b/lib/igt_drm_clients.c
index da51d7335b2b..025d60c51503 100644
--- a/lib/igt_drm_clients.c
+++ b/lib/igt_drm_clients.c
@@ -445,7 +445,8 @@ struct igt_drm_clients *
igt_drm_clients_scan(struct igt_drm_clients *clients,
bool (*filter_client)(const struct igt_drm_clients *,
const struct drm_client_fdinfo *),
- const char **name_map, unsigned int map_entries)
+ const char **name_map, unsigned int map_entries,
+ const char **region_map, unsigned int region_entries)
{
struct dirent *proc_dent;
struct igt_drm_client *c;
@@ -524,7 +525,7 @@ igt_drm_clients_scan(struct igt_drm_clients *clients,
if (!__igt_parse_drm_fdinfo(dirfd(fdinfo_dir),
fdinfo_dent->d_name, &info,
name_map, map_entries,
- NULL, 0))
+ region_map, region_entries))
continue;
if (filter_client && !filter_client(clients, &info))
diff --git a/lib/igt_drm_clients.h b/lib/igt_drm_clients.h
index cd37f8508b20..52888aedc25a 100644
--- a/lib/igt_drm_clients.h
+++ b/lib/igt_drm_clients.h
@@ -93,7 +93,8 @@ struct igt_drm_clients *
igt_drm_clients_scan(struct igt_drm_clients *clients,
bool (*filter_client)(const struct igt_drm_clients *,
const struct drm_client_fdinfo *),
- const char **name_map, unsigned int map_entries);
+ const char **name_map, unsigned int map_entries,
+ const char **region_map, unsigned int region_entries);
struct igt_drm_clients *
igt_drm_clients_sort(struct igt_drm_clients *clients,
diff --git a/tools/gputop.c b/tools/gputop.c
index ea95e0333dd2..71e28f43ee4c 100644
--- a/tools/gputop.c
+++ b/tools/gputop.c
@@ -253,7 +253,7 @@ int main(int argc, char **argv)
if (!clients)
exit(1);
- igt_drm_clients_scan(clients, NULL, NULL, 0);
+ igt_drm_clients_scan(clients, NULL, NULL, 0, NULL, 0);
for (;;) {
struct igt_drm_client *c, *prevc = NULL;
@@ -270,7 +270,7 @@ int main(int argc, char **argv)
}
}
- igt_drm_clients_scan(clients, NULL, NULL, 0);
+ igt_drm_clients_scan(clients, NULL, NULL, 0, NULL, 0);
igt_drm_clients_sort(clients, client_cmp);
printf("\033[H\033[J");
diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c
index 35c125f22c48..5d44ba45335e 100644
--- a/tools/intel_gpu_top.c
+++ b/tools/intel_gpu_top.c
@@ -2615,8 +2615,9 @@ int main(int argc, char **argv)
}
pmu_sample(engines);
- igt_drm_clients_scan(clients, client_match, engine_map,
- ARRAY_SIZE(engine_map));
+ igt_drm_clients_scan(clients, client_match,
+ engine_map, ARRAY_SIZE(engine_map),
+ NULL, 0);
gettime(&ts);
if (output_mode == JSON)
@@ -2651,7 +2652,8 @@ int main(int argc, char **argv)
display_clients(igt_drm_clients_scan(clients,
client_match,
engine_map,
- ARRAY_SIZE(engine_map)));
+ ARRAY_SIZE(engine_map),
+ NULL, 0));
scan_us = elapsed_us(&ts, period_us);
if (stop_top)
--
2.39.2
next prev parent reply other threads:[~2023-09-29 12:25 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-29 12:25 [Intel-gfx] [PATCH i-g-t 00/12] fdinfo tests, intel_gpu_top memory support, etc Tvrtko Ursulin
2023-09-29 12:25 ` [Intel-gfx] [PATCH i-g-t 01/12] tests/i915/drm_fdinfo: Check engine info is supported Tvrtko Ursulin
2023-09-29 12:25 ` [Intel-gfx] [PATCH i-g-t 02/12] tests/i915/drm_fdinfo: Stress test context close versus fdinfo reads Tvrtko Ursulin
2023-09-29 12:25 ` [Intel-gfx] [PATCH i-g-t 03/12] tests/i915/drm_fdinfo: Add some memory info tests Tvrtko Ursulin
2023-09-29 12:25 ` [Intel-gfx] [PATCH i-g-t 04/12] tools/intel_gpu_top: Fix clients header width when no clients Tvrtko Ursulin
2023-09-29 12:25 ` [Intel-gfx] [PATCH i-g-t 05/12] tools/intel_gpu_top: Fix client layout on first sample period Tvrtko Ursulin
2023-09-29 12:25 ` [Intel-gfx] [PATCH i-g-t 06/12] tools/intel_gpu_top: Optimise interactive display a bit Tvrtko Ursulin
2023-09-29 12:25 ` [Intel-gfx] [PATCH i-g-t 07/12] lib/igt_drm_fdinfo: Copy over region map name on match Tvrtko Ursulin
2023-09-29 12:25 ` [Intel-gfx] [PATCH i-g-t 08/12] lib/igt_drm_clients: Fix client id type confusion Tvrtko Ursulin
2023-09-29 12:25 ` Tvrtko Ursulin [this message]
2023-09-29 12:25 ` [Intel-gfx] [PATCH i-g-t 10/12] tools/intel_gpu_top: Fully wrap clients operations Tvrtko Ursulin
2023-09-29 12:25 ` [Intel-gfx] [PATCH i-g-t 11/12] tools/intel_gpu_top: Add per client memory info Tvrtko Ursulin
2023-09-29 12:25 ` [Intel-gfx] [PATCH i-g-t 12/12] tools/intel_gpu_top: Add ability to show memory region breakdown Tvrtko Ursulin
-- strict thread matches above, loose matches on Subject: below --
2023-09-22 13:44 [Intel-gfx] [PATCH i-g-t 00/12] fdinfo tests, intel_gpu_top memory support, etc Tvrtko Ursulin
2023-09-22 13:44 ` [Intel-gfx] [PATCH i-g-t 09/12] lib/igt_drm_clients: Allow passing in the memory region map Tvrtko Ursulin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230929122517.349348-10-tvrtko.ursulin@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=Intel-gfx@lists.freedesktop.org \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox