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 10/12] tools/intel_gpu_top: Fully wrap clients operations Date: Fri, 22 Sep 2023 14:44:35 +0100 [thread overview] Message-ID: <20230922134437.234888-11-tvrtko.ursulin@linux.intel.com> (raw) In-Reply-To: <20230922134437.234888-1-tvrtko.ursulin@linux.intel.com> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Wrap all operations on clients via the Intel specific wrappers in order to simplify upcoming work. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> --- tools/intel_gpu_top.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c index eb0ef00abeaf..27503ac03ebd 100644 --- a/tools/intel_gpu_top.c +++ b/tools/intel_gpu_top.c @@ -132,6 +132,7 @@ struct engines { struct intel_clients { const char *pci_slot; struct igt_drm_client_engines classes; + struct igt_drm_clients *clients; }; static struct termios termios_orig; @@ -2436,19 +2437,22 @@ intel_init_clients(struct intel_clients *iclients, iclients->classes.capacity[i] = engines->class[i].num_engines; iclients->classes.names[i] = strdup(engines->class[i].name); } + + iclients->clients = igt_drm_clients_init(iclients); } static void intel_free_clients(struct intel_clients *iclients) { + if (iclients->clients) + igt_drm_clients_free(iclients->clients); + free((void *)iclients->pci_slot); free(iclients->classes.capacity); free(iclients->classes.names); } -int main(int argc, char **argv) +static void intel_scan_clients(struct intel_clients *iclients) { - unsigned int period_us = DEFAULT_PERIOD_MS * 1000; - struct igt_drm_clients *clients = NULL; static const char *engine_map[] = { "render", "copy", @@ -2456,6 +2460,15 @@ int main(int argc, char **argv) "video-enhance", "compute", }; + + igt_drm_clients_scan(iclients->clients, client_match, + engine_map, ARRAY_SIZE(engine_map), + NULL, 0); +} + +int main(int argc, char **argv) +{ + unsigned int period_us = DEFAULT_PERIOD_MS * 1000; bool physical_engines = false; struct intel_clients iclients; int con_w = -1, con_h = -1; @@ -2613,15 +2626,11 @@ int main(int argc, char **argv) init_engine_classes(engines); - if (has_drm_fdinfo(&card)) { + if (has_drm_fdinfo(&card)) intel_init_clients(&iclients, &card, engines); - clients = igt_drm_clients_init(&iclients); - } pmu_sample(engines); - igt_drm_clients_scan(clients, client_match, - engine_map, ARRAY_SIZE(engine_map), - NULL, 0); + intel_scan_clients(&iclients); gettime(&ts); if (output_mode == JSON) @@ -2652,12 +2661,8 @@ int main(int argc, char **argv) pmu_sample(engines); t = (double)(engines->ts.cur - engines->ts.prev) / 1e9; - disp_clients = - display_clients(igt_drm_clients_scan(clients, - client_match, - engine_map, - ARRAY_SIZE(engine_map), - NULL, 0)); + intel_scan_clients(&iclients); + disp_clients = display_clients(iclients.clients); scan_us = elapsed_us(&ts, period_us); if (stop_top) @@ -2708,7 +2713,7 @@ int main(int argc, char **argv) pops->close_struct(); } - if (disp_clients != clients) + if (disp_clients != iclients.clients) free_display_clients(disp_clients); if (stop_top) @@ -2723,10 +2728,7 @@ int main(int argc, char **argv) if (output_mode == JSON) printf("]\n"); - if (clients) { - igt_drm_clients_free(clients); - intel_free_clients(&iclients); - } + intel_free_clients(&iclients); free(codename); err_pmu: -- 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 Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Subject: [igt-dev] [PATCH i-g-t 10/12] tools/intel_gpu_top: Fully wrap clients operations Date: Fri, 22 Sep 2023 14:44:35 +0100 [thread overview] Message-ID: <20230922134437.234888-11-tvrtko.ursulin@linux.intel.com> (raw) In-Reply-To: <20230922134437.234888-1-tvrtko.ursulin@linux.intel.com> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Wrap all operations on clients via the Intel specific wrappers in order to simplify upcoming work. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> --- tools/intel_gpu_top.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c index eb0ef00abeaf..27503ac03ebd 100644 --- a/tools/intel_gpu_top.c +++ b/tools/intel_gpu_top.c @@ -132,6 +132,7 @@ struct engines { struct intel_clients { const char *pci_slot; struct igt_drm_client_engines classes; + struct igt_drm_clients *clients; }; static struct termios termios_orig; @@ -2436,19 +2437,22 @@ intel_init_clients(struct intel_clients *iclients, iclients->classes.capacity[i] = engines->class[i].num_engines; iclients->classes.names[i] = strdup(engines->class[i].name); } + + iclients->clients = igt_drm_clients_init(iclients); } static void intel_free_clients(struct intel_clients *iclients) { + if (iclients->clients) + igt_drm_clients_free(iclients->clients); + free((void *)iclients->pci_slot); free(iclients->classes.capacity); free(iclients->classes.names); } -int main(int argc, char **argv) +static void intel_scan_clients(struct intel_clients *iclients) { - unsigned int period_us = DEFAULT_PERIOD_MS * 1000; - struct igt_drm_clients *clients = NULL; static const char *engine_map[] = { "render", "copy", @@ -2456,6 +2460,15 @@ int main(int argc, char **argv) "video-enhance", "compute", }; + + igt_drm_clients_scan(iclients->clients, client_match, + engine_map, ARRAY_SIZE(engine_map), + NULL, 0); +} + +int main(int argc, char **argv) +{ + unsigned int period_us = DEFAULT_PERIOD_MS * 1000; bool physical_engines = false; struct intel_clients iclients; int con_w = -1, con_h = -1; @@ -2613,15 +2626,11 @@ int main(int argc, char **argv) init_engine_classes(engines); - if (has_drm_fdinfo(&card)) { + if (has_drm_fdinfo(&card)) intel_init_clients(&iclients, &card, engines); - clients = igt_drm_clients_init(&iclients); - } pmu_sample(engines); - igt_drm_clients_scan(clients, client_match, - engine_map, ARRAY_SIZE(engine_map), - NULL, 0); + intel_scan_clients(&iclients); gettime(&ts); if (output_mode == JSON) @@ -2652,12 +2661,8 @@ int main(int argc, char **argv) pmu_sample(engines); t = (double)(engines->ts.cur - engines->ts.prev) / 1e9; - disp_clients = - display_clients(igt_drm_clients_scan(clients, - client_match, - engine_map, - ARRAY_SIZE(engine_map), - NULL, 0)); + intel_scan_clients(&iclients); + disp_clients = display_clients(iclients.clients); scan_us = elapsed_us(&ts, period_us); if (stop_top) @@ -2708,7 +2713,7 @@ int main(int argc, char **argv) pops->close_struct(); } - if (disp_clients != clients) + if (disp_clients != iclients.clients) free_display_clients(disp_clients); if (stop_top) @@ -2723,10 +2728,7 @@ int main(int argc, char **argv) if (output_mode == JSON) printf("]\n"); - if (clients) { - igt_drm_clients_free(clients); - intel_free_clients(&iclients); - } + intel_free_clients(&iclients); free(codename); err_pmu: -- 2.39.2
next prev parent reply other threads:[~2023-09-22 13:46 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 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 ` [igt-dev] " Tvrtko Ursulin 2023-09-22 13:44 ` [Intel-gfx] [PATCH i-g-t 01/12] tests/i915/drm_fdinfo: Stress test context close versus fdinfo reads Tvrtko Ursulin 2023-09-22 13:44 ` [igt-dev] " Tvrtko Ursulin 2023-09-22 13:44 ` [Intel-gfx] [PATCH i-g-t 02/12] tests/i915/drm_fdinfo: Add some memory info tests Tvrtko Ursulin 2023-09-22 13:44 ` [igt-dev] " Tvrtko Ursulin 2023-09-27 13:20 ` [Intel-gfx] [PATCH i-g-t v2 " Tvrtko Ursulin 2023-09-27 13:20 ` [igt-dev] " Tvrtko Ursulin 2023-09-22 13:44 ` [Intel-gfx] [PATCH i-g-t 03/12] tools/intel_gpu_top: Restore user friendly error message Tvrtko Ursulin 2023-09-22 13:44 ` [igt-dev] " Tvrtko Ursulin 2023-09-27 20:13 ` [Intel-gfx] " Umesh Nerlige Ramappa 2023-09-27 20:13 ` [igt-dev] " Umesh Nerlige Ramappa 2023-09-28 8:16 ` [Intel-gfx] " Tvrtko Ursulin 2023-09-28 8:16 ` [igt-dev] " Tvrtko Ursulin 2023-09-28 21:31 ` [Intel-gfx] " Umesh Nerlige Ramappa 2023-09-28 21:31 ` [igt-dev] " Umesh Nerlige Ramappa 2023-09-29 11:11 ` [Intel-gfx] " Tvrtko Ursulin 2023-09-29 11:11 ` [igt-dev] " Tvrtko Ursulin 2023-09-22 13:44 ` [Intel-gfx] [PATCH i-g-t 04/12] tools/intel_gpu_top: Fix clients header width when no clients Tvrtko Ursulin 2023-09-22 13:44 ` [igt-dev] " Tvrtko Ursulin 2023-09-22 13:44 ` [Intel-gfx] [PATCH i-g-t 05/12] tools/intel_gpu_top: Fix client layout on first sample period Tvrtko Ursulin 2023-09-22 13:44 ` [igt-dev] " Tvrtko Ursulin 2023-09-22 13:44 ` [Intel-gfx] [PATCH i-g-t 06/12] tools/intel_gpu_top: Optimise interactive display a bit Tvrtko Ursulin 2023-09-22 13:44 ` [igt-dev] " Tvrtko Ursulin 2023-09-22 13:44 ` [Intel-gfx] [PATCH i-g-t 07/12] lib/igt_drm_fdinfo: Copy over region map name on match Tvrtko Ursulin 2023-09-22 13:44 ` [igt-dev] " Tvrtko Ursulin 2023-09-22 13:44 ` [Intel-gfx] [PATCH i-g-t 08/12] lib/igt_drm_clients: Fix client id type confusion Tvrtko Ursulin 2023-09-22 13:44 ` [igt-dev] " 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 2023-09-22 13:44 ` [igt-dev] " Tvrtko Ursulin 2023-09-22 13:44 ` Tvrtko Ursulin [this message] 2023-09-22 13:44 ` [igt-dev] [PATCH i-g-t 10/12] tools/intel_gpu_top: Fully wrap clients operations Tvrtko Ursulin 2023-09-22 13:44 ` [Intel-gfx] [PATCH i-g-t 11/12] tools/intel_gpu_top: Add per client memory info Tvrtko Ursulin 2023-09-22 13:44 ` [igt-dev] " Tvrtko Ursulin 2023-09-22 13:44 ` [Intel-gfx] [PATCH i-g-t 12/12] tools/intel_gpu_top: Add ability to show memory region breakdown Tvrtko Ursulin 2023-09-22 13:44 ` [igt-dev] " Tvrtko Ursulin 2023-09-22 15:03 ` [igt-dev] ✓ Fi.CI.BAT: success for fdinfo tests, intel_gpu_top memory support, etc Patchwork 2023-09-22 15:56 ` [igt-dev] ✓ CI.xeBAT: " Patchwork 2023-09-23 15:28 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork 2023-09-27 14:15 ` [igt-dev] ✓ CI.xeBAT: success for fdinfo tests, intel_gpu_top memory support, etc (rev2) Patchwork 2023-09-27 14:23 ` [igt-dev] ✗ Fi.CI.BAT: failure " Patchwork 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 10/12] tools/intel_gpu_top: Fully wrap clients operations 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=20230922134437.234888-11-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.