From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> To: igt-dev@lists.freedesktop.org, Intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [CI 6/9] lib/igt_drm_clients: Allow passing in the memory region map Date: Mon, 6 Nov 2023 12:35:15 +0000 [thread overview] Message-ID: <20231106123518.588528-6-tvrtko.ursulin@linux.intel.com> (raw) In-Reply-To: <20231106123518.588528-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> Reviewed-by: Kamil Konieczny <kamil.konieczny@linux.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 34fa99235e11..091fe28068dc 100644 --- a/tools/intel_gpu_top.c +++ b/tools/intel_gpu_top.c @@ -2619,8 +2619,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) @@ -2655,7 +2656,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
WARNING: multiple messages have this Message-ID (diff)
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> To: igt-dev@lists.freedesktop.org, Intel-gfx@lists.freedesktop.org Subject: [igt-dev] [CI 6/9] lib/igt_drm_clients: Allow passing in the memory region map Date: Mon, 6 Nov 2023 12:35:15 +0000 [thread overview] Message-ID: <20231106123518.588528-6-tvrtko.ursulin@linux.intel.com> (raw) In-Reply-To: <20231106123518.588528-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> Reviewed-by: Kamil Konieczny <kamil.konieczny@linux.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 34fa99235e11..091fe28068dc 100644 --- a/tools/intel_gpu_top.c +++ b/tools/intel_gpu_top.c @@ -2619,8 +2619,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) @@ -2655,7 +2656,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-11-06 12:35 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-11-06 12:35 [Intel-gfx] [CI 1/9] tests/i915/drm_fdinfo: Check engine info is supported Tvrtko Ursulin 2023-11-06 12:35 ` [igt-dev] " Tvrtko Ursulin 2023-11-06 12:35 ` [Intel-gfx] [CI 2/9] tests/i915/drm_fdinfo: Stress test context close versus fdinfo reads Tvrtko Ursulin 2023-11-06 12:35 ` [igt-dev] " Tvrtko Ursulin 2023-11-06 12:35 ` [Intel-gfx] [CI 3/9] tests/i915/drm_fdinfo: Add some memory info tests Tvrtko Ursulin 2023-11-06 12:35 ` [igt-dev] " Tvrtko Ursulin 2023-11-06 12:35 ` [Intel-gfx] [CI 4/9] lib/igt_drm_fdinfo: Copy over region map name on match Tvrtko Ursulin 2023-11-06 12:35 ` [igt-dev] " Tvrtko Ursulin 2023-11-06 12:35 ` [Intel-gfx] [CI 5/9] lib/igt_drm_clients: Fix client id type confusion Tvrtko Ursulin 2023-11-06 12:35 ` [igt-dev] " Tvrtko Ursulin 2023-11-06 12:35 ` Tvrtko Ursulin [this message] 2023-11-06 12:35 ` [igt-dev] [CI 6/9] lib/igt_drm_clients: Allow passing in the memory region map Tvrtko Ursulin 2023-11-06 12:35 ` [Intel-gfx] [CI 7/9] tools/intel_gpu_top: Fully wrap clients operations Tvrtko Ursulin 2023-11-06 12:35 ` [igt-dev] " Tvrtko Ursulin 2023-11-06 12:35 ` [Intel-gfx] [CI 8/9] tools/intel_gpu_top: Add per client memory info Tvrtko Ursulin 2023-11-06 12:35 ` [igt-dev] " Tvrtko Ursulin 2023-11-06 12:35 ` [Intel-gfx] [CI 9/9] tools/intel_gpu_top: Add ability to show memory region breakdown Tvrtko Ursulin 2023-11-06 12:35 ` [igt-dev] " Tvrtko Ursulin 2023-11-06 14:38 ` [igt-dev] ✗ CI.xeBAT: failure for series starting with [CI,1/9] tests/i915/drm_fdinfo: Check engine info is supported Patchwork 2023-11-06 14:53 ` [igt-dev] ✓ Fi.CI.BAT: success " Patchwork 2023-11-06 20:33 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork 2023-11-06 20:59 ` [Intel-gfx] ✗ Fi.CI.BUILD: " Patchwork
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=20231106123518.588528-6-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.