New intel-gpu-top
cover New intel-gpu-top
From: Tvrtko Ursulin <[email protected]>
I've found a new potential lead vehicle to sell my per-client engine busyness patches and that is a rewrite of intel-gpu-top.
Old one is neglected and dangerous - so how about a new one which looks like this?
intel-gpu-top - load avg 9.47, 3.34, 0.13; 1000/ 950 MHz; 0% RC6; 5202mW; 1206 irqs/s
rcs0 100.00% ( 0.56/ 4.78/ 3.86) |██████████████████████████████████████████████████████████████████| 0.00% wait, 0.00% sema
bcs0 17.72% ( 0.81/ 0.00/ 0.17) |███████████▋ | 0.00% wait, 0.00% sema
vcs0 61.08% ( 0.81/ 0.00/ 0.63) |████████████████████████████████████████▎ | 0.00% wait, 0.00% sema
vecs0 0.00% ( 0.00/ 0.00/ 0.00) | | 0.00% wait, 0.00% semaPID NAME rcs0 bcs0 vcs0 vecs0
9654 neverball |████████████ || || || | 7792 Xorg |████████▊ || || || | 9659 gem_wsim |████ ||████▍ ||███████████████▎ || | 7846 xfwm4 | || || || |
So this series renames the old one to intel_legacy_top and replaces it with a new one which uses PMU and some extra patches as well.
Code is not production quality but an attempt to spark some interest on the topic.
Tvrtko Ursulin (3):
intel-gpu-top: Rename to intel-legacy-top
intel-gpu-top: New version using PMU
intel-gpu-top: Support for client stats
tools/.gitignore | 1 + tools/Makefile.am | 2 + tools/Makefile.sources | 1 + tools/intel_gpu_top.c | 1311 +++++++++++++++++++++++++--------------------- tools/intel_legacy_top.c | 718 +++++++++++++++++++++++++ tools/meson.build | 3 +- 6 files changed, 1446 insertions(+), 590 deletions(-) create mode 100644 tools/intel_legacy_top.c
Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 1/3 intel-gpu-top: Rename to intel-legacy-top
From: Tvrtko Ursulin <[email protected]>
---
tools/.gitignore | 2 +-
tools/Makefile.sources | 2 +-
tools/{intel_gpu_top.c => intel_legacy_top.c} | 0
tools/meson.build | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
rename tools/{intel_gpu_top.c => intel_legacy_top.c} (100%)tools/.gitignore +1 -1
@@ -17,7 +17,7 @@ intel_framebuffer_dump intel_gem_info intel_gpu_frequency intel_gpu_time -intel_gpu_top +intel_legacy_top intel_gtt intel_guc_logger intel_gvtg_test
tools/Makefile.sources +1 -1
@@ -17,7 +17,7 @@ tools_prog_lists = \ intel_gpu_frequency \ intel_firmware_decode \ intel_gpu_time \ - intel_gpu_top \ + intel_legacy_top \ intel_gtt \ intel_guc_logger \ intel_infoframes \
tools/intel_legacy_top.c renamed from tools/intel_gpu_top.c +0 -0
tools/meson.build +1 -1
@@ -23,7 +23,7 @@ tools_progs = [ 'intel_gpu_frequency', 'intel_firmware_decode', 'intel_gpu_time', - 'intel_gpu_top', + 'intel_legacy_top', 'intel_gtt', 'intel_guc_logger', 'intel_infoframes',
Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC i-g-t 1/3] intel-gpu-top: Rename to intel-legacy-top
Quoted 10 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Signed-off-by Tvrtko Ursulin <[email protected]>--- tools/.gitignore | 2 +- tools/Makefile.sources | 2 +- tools/{intel_gpu_top.c => intel_legacy_top.c} | 0 tools/meson.build | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename tools/{intel_gpu_top.c => intel_legacy_top.c} (100%)
If the old tool is to be kept, the name intel_legacy_top doesn't quite capture what it does. A more important topic though is whether it should be kept at all. What are the features in the old tool that your rewrite doesn't have?
Signature · 5 lines
Petri Latvala _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC i-g-t 1/3] intel-gpu-top: Rename to intel-legacy-top
Quoting Petri Latvala (2018-02-15 09:10:45)
Quoted 13 lines · Tvrtko Ursulin
Quoted 10 lines
From: Tvrtko Ursulin <[email protected]>
Signed-off-by Tvrtko Ursulin <[email protected]>--- tools/.gitignore | 2 +- tools/Makefile.sources | 2 +- tools/{intel_gpu_top.c => intel_legacy_top.c} | 0 tools/meson.build | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename tools/{intel_gpu_top.c => intel_legacy_top.c} (100%)
Quoted 1 line
If the old tool is to be kept,
No. The old tool should be removed as it is a machine killer. -Chris
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC i-g-t 1/3] intel-gpu-top: Rename to intel-legacy-top
In reply to Petri LatvalaQuoted 13 lines · Petri Latvala
Quoted 10 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Signed-off-by Tvrtko Ursulin <[email protected]>--- tools/.gitignore | 2 +- tools/Makefile.sources | 2 +- tools/{intel_gpu_top.c => intel_legacy_top.c} | 0 tools/meson.build | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-)rename
tools/{intel_gpu_top.c=>intel_legacy_top.c} (100%)
Quoted 4 lines
If the old tool is to be kept, the name
intel_legacy_topdoesn't quite capture what it does. A more important topic though is whether it should be kept at all. What are the features in the old tool that your rewrite doesn't have?
It's a bit different in target audience and capabilities I think.
The current one exposes what OA is, I assume at least, able to provide today in a safe way. The new tool doesn't do any of that but just provides basic, more end-user friendly, engine busyness and related stats.
It may be that when considering gpu-top work, intel-gpu-top rewrite hasn't even got a place. Or it might have as a minimal, easy to use and simple tool. TBD.
Quoted 5 lines · Chris Wilson
Quoting Petri Latvala (2018-02-15 09:10:45)
Quoted 2 lines
If the old tool is to be kept,
No. The old tool should be removed as it is a machine killer.
And it is not up to date with current hardware so no complaints from me.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC i-g-t 1/3] intel-gpu-top: Rename to intel-legacy-top
Quoting Tvrtko Ursulin (2018-02-15 09:57:45)
Quoted 22 lines · Petri Latvala
Quoted 13 lines · Tvrtko Ursulin
Quoted 10 lines
From: Tvrtko Ursulin <[email protected]>
Signed-off-by Tvrtko Ursulin <[email protected]>--- tools/.gitignore | 2 +- tools/Makefile.sources | 2 +- tools/{intel_gpu_top.c => intel_legacy_top.c} | 0 tools/meson.build | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-)rename
tools/{intel_gpu_top.c=>intel_legacy_top.c} (100%)Quoted 4 lines
If the old tool is to be kept, the name
intel_legacy_topdoesn't quite capture what it does. A more important topic though is whether it should be kept at all. What are the features in the old tool that your rewrite doesn't have?It's a bit different in target audience and capabilities I think.
Quoted 7 lines
The current one exposes what OA is, I assume at least, able to provide today in a safe way. The new tool doesn't do any of that but just provides basic, more end-user friendly, engine busyness and related stats.
It may be that when considering gpu-top work, intel-gpu-top rewrite hasn't even got a place. Or it might have as a minimal, easy to use and simple tool. TBD.
I liken it to classic "top", even when we have graphical system monitors, for a quick assay of what's running, top is unbeatable. I think each tool has its use. There may be future refactoring to a single tool with different interfaces, but for now it looks to be a nice little demonstration vehicle with some practical value. -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 2/3 intel-gpu-top: New version using PMU
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
--- tools/.gitignore | 1 + tools/Makefile.am | 2 + tools/Makefile.sources | 1 + tools/intel_gpu_top.c | 593 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/meson.build | 1 + 5 files changed, 598 insertions(+) create mode 100644 tools/intel_gpu_top.c
tools/.gitignore +1 -0
@@ -17,6 +17,7 @@ intel_framebuffer_dump intel_gem_info intel_gpu_frequency intel_gpu_time +intel_gpu_top intel_legacy_top intel_gtt intel_guc_logger
tools/Makefile.am +2 -0
@@ -30,6 +30,8 @@ intel_aubdump_la_LDFLAGS = -module -avoid-version -no-undefined intel_aubdump_la_SOURCES = aubdump.c intel_aubdump_la_LIBADD = $(top_builddir)/lib/libintel_tools.la -ldl +intel_gpu_top_LDADD = $(top_builddir)/lib/libigt_perf.la -lm + bin_SCRIPTS = intel_aubdump CLEANFILES = $(bin_SCRIPTS)
tools/Makefile.sources +1 -0
@@ -17,6 +17,7 @@ tools_prog_lists = \ intel_gpu_frequency \ intel_firmware_decode \ intel_gpu_time \ + intel_gpu_top \ intel_legacy_top \ intel_gtt \ intel_guc_logger \
tools/intel_gpu_top.c new file +593 -0
593 lines not on this page · raw message
tools/meson.build +1 -0
@@ -23,6 +23,7 @@ tools_progs = [ 'intel_gpu_frequency', 'intel_firmware_decode', 'intel_gpu_time', + 'intel_gpu-top', 'intel_legacy_top', 'intel_gtt', 'intel_guc_logger',
Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 3/3 intel-gpu-top: Support for client stats
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
--- tools/intel_gpu_top.c | 268 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 263 insertions(+), 5 deletions(-)
tools/intel_gpu_top.c +263 -5
@@ -407,8 +407,222 @@ static void pmu_sample(struct engines *engines) } } +enum client_status { +FREE =0 ,/* mbz */ +ALIVE , +PROBE +}; + +struct client { +enum client_status status; +unsigned int id; +unsigned int pid; +char name[128 ]; +unsigned int samples; +unsigned long total; +struct engines *engines; +unsigned long *val; +uint64_t *last; +}; + +#define SYSFS_ENABLE "/sys/class/drm/card0/clients/enable_stats" +#define SYSFS_CLIENTS "/sys/class/drm/card0/clients/" + +#define PERIOD_US (1000e3) + +static struct client *clients; +static unsigned int num_clients; + +#define for_each_client (c, tmp) \ + for (tmp = num_clients, c = clients; tmp > 0; tmp--, c++) + +static uint64_t read_client_busy (unsigned int id,const char *engine) +{ +char buf[256 ]; +ssize_t ret; + + ret =snprintf (buf,sizeof (buf),SYSFS_CLIENTS "/%u/busy/%s" , + id, engine); +assert (ret >0 ); + +return filename_to_u64 (buf,10 ); +} + +static struct client *find_client (enum client_status status,unsigned int id) +{ +struct client *c; +unsigned int tmp; + +for_each_client (c, tmp) { +if ((status ==FREE && c->status ==FREE ) || + (status == c->status && c->id == id)) { +return c; + } + } + +return NULL ; +} + +static void update_client (struct client *c,unsigned int pid,char *name) +{ +uint64_t val[c->engines->num_engines]; +unsigned int i; + +if (c->pid != pid) + c->pid = pid; + +if (strncmp (c->name, name,sizeof (c->name))) +strncpy (c->name, name,sizeof (c->name)); + +for (i =0 ; i < c->engines->num_engines; i++) { +struct engine *engine =engine_ptr (c->engines, i); + + val[i] =read_client_busy (c->id, engine->name); + } + + c->total =0 ; + +for (i =0 ; i < c->engines->num_engines; i++) { +assert (val[i] >= c->last[i]); + c->val[i] = val[i] - c->last[i]; + c->total += c->val[i]; + c->last[i] = val[i]; + } + + c->samples++; + c->status =ALIVE ; +} + +static void +add_client (unsigned int id,unsigned int pid,char *name, +struct engines *engines) +{ +struct client *c; + +assert (!find_client (ALIVE , id)); + + c =find_client (FREE ,0 ); +if (!c) { +unsigned int idx = num_clients; + + num_clients += (num_clients +2 ) /2 ; + clients =realloc (clients, num_clients *sizeof (*c)); +assert (clients); + c = &clients[idx]; +memset (c,0 , (num_clients - idx) *sizeof (*c)); + } + + c->id = id; + c->engines = engines; + c->val =calloc (engines->num_engines,sizeof (c->val)); + c->last =calloc (engines->num_engines,sizeof (c->last)); +assert (c->val && c->last); + +update_client (c, pid, name); + +// c = find_client(c->status, c->id); +} + +static void free_client (struct client *c) +{ +free (c->val); +free (c->last); +memset (c,0 ,sizeof (*c)); +} + +static char *read_client_sysfs (unsigned int id,const char *field) +{ +char buf[256 ]; +ssize_t ret; + + ret =snprintf (buf,sizeof (buf),SYSFS_CLIENTS "/%u/%s" , id, field); +assert (ret >0 ); + + ret =filename_to_buf (buf, buf,sizeof (buf)); +assert (ret ==0 ); + +return strdup (buf); +} + +static void scan (struct engines *engines) +{ +struct dirent *dent; +struct client *c; +char *pid, *name; +unsigned int tmp; +unsigned int id; +DIR *d; + +for_each_client (c, tmp) { +if (c->status ==ALIVE ) + c->status =PROBE ; + } + + d =opendir (SYSFS_CLIENTS ); +assert (!NULL ); + +while ((dent =readdir (d)) !=NULL ) { +if (dent->d_type !=DT_DIR ) +continue ; +if (!isdigit (dent->d_name[0 ])) +continue ; + + id =atoi (dent->d_name); + + name =read_client_sysfs (id,"name" ); +assert (name); + + pid =read_client_sysfs (id,"pid" ); +assert (pid); + + c =find_client (PROBE , id); +if (c) { +update_client (c,atoi (pid), name); +continue ; + } + +add_client (id,atoi (pid), name, engines); + +free (name); +free (pid); + } + +closedir (d); + +for_each_client (c, tmp) { +if (c->status ==PROBE ) +free_client (c); + } +} + +static int cmp (const void *_a,const void *_b) +{ +const struct client *a = _a; +const struct client *b = _b; +long tot_a = a->total; +long tot_b = b->total; + +if (a->status !=ALIVE || a->samples <2 ) + tot_a =-1 ; +if (b->status !=ALIVE || b->samples <2 ) + tot_b =-1 ; + +if (tot_a == tot_b) +return a->pid - b->pid; +else +return -(tot_a - tot_b); +} +static const char *bars[] = {" " ,"▏" ,"▎" ,"▍" ,"▌" ,"▋" ,"▊" ,"▉" ,"█" }; +static void n_spaces (const unsigned int n) +{ +unsigned int i; + +for (i =0 ; i < n; i++) +putchar (' ' ); +} +static void print_percentage_bar (double percent,int max_len) {
@@ -422,8 +636,7 @@ print_percentage_bar(double percent, int max_len)if (i)printf ("%s" , bars[i]); -for (i =0 ; i < (max_len -2 - (bar_len +7 ) /8 ); i++) -putchar (' ' ); +n_spaces (max_len -2 - (bar_len +7 ) /8 );putchar ('|' ); }
@@ -500,16 +713,21 @@ int main(int argc, char **argv) engines->load_exp[i] =exp (-period / load_period[i]);pmu_sample (engines); +scan (engines);for (;;) {double t, freq[2 ], irq, rc6, power;double qd =0 ;int lines =0 ; +struct client *c; +unsigned int len, engine_w;unsigned int j;usleep (period_us);pmu_sample (engines); +scan (engines); + t = (double )(engines->ts.cur - engines->ts.prev) /1e9 ;printf ("\033[H\033[J" );
@@ -561,8 +779,6 @@ int main(int argc, char **argv)for (i =0 ; i < engines->num_engines && lines < con_h; i++) {struct engine *engine =engine_ptr (engines, i); -unsigned int max_w = con_w -1 ; -unsigned int len;double val[2 ];char buf[128 ];
@@ -579,7 +795,7 @@ int main(int argc, char **argv) engine->qd[0 ], engine->qd[1 ], engine->qd[2]); -print_percentage_bar (val[0 ], max_w - len); +print_percentage_bar (val[0 ], con_w -1 - len);printf ("%s\n" , buf);
@@ -587,6 +803,48 @@ int main(int argc, char **argv) }printf ("\n" ); + +printf ("\033[7m" ); + len =printf ("%5s%16s" ,"PID" ,"NAME" ); + engine_w = (con_w - len) / engines->num_engines; +for (i =0 ; i < engines->num_engines && lines < con_h; i++) { +struct engine *engine =engine_ptr (engines, i); +unsigned int pad = (engine_w -strlen (engine->name)) /2 ; + +n_spaces (pad); +printf ("%s" , engine->name); +n_spaces (engine_w - pad -strlen (engine->name)); + len += pad +strlen (engine->name) + + (engine_w - pad -strlen (engine->name)); + } +n_spaces (con_w - len); +printf ("\033[0m\n" ); + lines++; + +qsort (clients, num_clients,sizeof (*c), cmp); + +for_each_client (c, i) { +if (lines > con_h) +break ; + +assert (c->status !=PROBE ); +if (c->status !=ALIVE || c->samples <2 ) +break ; + +printf ("%5u%16s " , c->pid, c->name); + +for (i =0 ; i < engines->num_engines; i++) { +double pct; + + pct = (double )c->val[i] / period_us /1e3 *100 ; + +print_percentage_bar (pct, engine_w); + } + +putchar ('\n' ); + lines++; + } + }return 0 ;
Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for New intel-gpu-top
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: New intel-gpu-top
URL : https://patchwork.freedesktop.org/series/38282/
State : success
== Summary ==
IGT patchset tested on top of latest successful build 1d227a47223d2ff5c6745c0d82e96e70d456d5de lib/kms: Clear unused fields for getproperty ioctl
with latest DRM-Tip kernel build CI_DRM_37745ad7866768dc drm-tip: 2018y-02m-14d-15h-14m-50s UTC integration manifest
No testlist changes.
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:421s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:426s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:377s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:489s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:290s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:483s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:489s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:473s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:459s fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:567s fi-cnl-y3 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:578s fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:426s fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:284s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:512s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:391s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:413s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:463s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:420s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:467s fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:498s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:501s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:591s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:424s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:510s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:525s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:497s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:475s fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:414s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:433s fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:541s fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:398s Blacklisted hosts: fi-glk-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:470s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:457s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_915/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx