intel-gpu-overlay: Update for renamed tracepoints
PATCH 1/1 intel-gpu-overlay: Update for renamed tracepoints
From: Tvrtko Ursulin <[email protected]>
Request tracepoints have been renames so update the tool to be able to find them.
Also support falling back to the old name for compatibility.
---
Compile tested only so also looking for someone to smoke test it if possible. Otherwise I'll do it in due time once back to a test machine with display.
I was also 50-50 whether it is worth supporting the old names, but it was easy enough so I did it.
--- overlay/gpu-perf.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
overlay/gpu-perf.c +13 -4
@@ -72,7 +72,7 @@ enum { };struct tracepoint { -const char *name; +const char *name, *altname;int event_id;struct {
@@ -90,9 +90,12 @@ struct tracepoint {int global_seqno_field;int plane_field; } tracepoints[TP_NB] = { - [TP_GEM_REQUEST_ADD] = { .name = "i915/i915_gem_request_add", }, - [TP_GEM_REQUEST_WAIT_BEGIN] = { .name = "i915/i915_gem_request_wait_begin", }, - [TP_GEM_REQUEST_WAIT_END] = { .name = "i915/i915_gem_request_wait_end", }, + [TP_GEM_REQUEST_ADD] = { .name = "i915/i915_request_add", + .altname = "i915/i915_gem_request_add" }, + [TP_GEM_REQUEST_WAIT_BEGIN] = { .name = "i915/i915_request_wait_begin", + .altname = "i915/i915_gem_request_wait_begin" }, + [TP_GEM_REQUEST_WAIT_END] = { .name = "i915/i915_request_wait_end", + .altname = "i915/i915_gem_request_wait_end" }, [TP_FLIP_COMPLETE] = { .name = "i915/flip_complete", }, [TP_GEM_RING_SYNC_TO] = { .name = "i915/gem_ring_sync_to", }, [TP_GEM_RING_SWITCH_CONTEXT] = { .name = "i915/gem_ring_switch_context", },
@@ -142,6 +145,12 @@ tracepoint_id(int tp_id) ctx.ctx.tp = tp; ctx.ctx.fp =fopen (buf,"r" ); +if (ctx.ctx.fp ==NULL ) { +snprintf (buf,sizeof (buf),"%s/tracing/events/%s/format" , + debugfs_path, tp->altname); + ctx.ctx.fp =fopen (buf,"r" ); + } +if (ctx.ctx.fp ==NULL )return 0 ;
Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[igt-dev] ✓ Fi.CI.BAT: success for intel-gpu-overlay: Update for renamed tracepoints
== Series Details ==
== Series Details ==
Series: intel-gpu-overlay: Update for renamed tracepoints
URL : https://patchwork.freedesktop.org/series/39376/
State : success
== Summary ==
IGT patchset tested on top of latest successful build 23f7da18a92059610792299cfdb03d2c922a9948 lib/igt_pm: Restore runtime pm state on test exit
with latest DRM-Tip kernel build CI_DRM_38724a3784737699 drm-tip: 2018y-03m-05d-14h-32m-57s UTC integration manifest
No testlist changes.
---- Known issues:
Test gem_mmap_gtt:
Subgroup basic-small-bo-tiledx:
pass -> FAIL (fi-gdg-551) fdo#102575
Test prime_vgem:
Subgroup basic-fence-flip:
fail -> PASS (fi-ilk-650) fdo#104008fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:417s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:422s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:371s 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:279s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:482s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:483s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:471s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:459s fi-cfl-8700k total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:398s fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:565s fi-cfl-u total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:496s fi-cnl-y3 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:576s fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:417s fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:288s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:510s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:387s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:417s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:453s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:411s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:453s fi-kbl-7560u total:108 pass:104 dwarn:0 dfail:0 fail:0 skip:3 fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:447s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:491s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:583s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:425s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:502s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:517s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:491s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:477s fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:412s 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:517s fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:399s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1059/issues.html
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✓ Fi.CI.IGT: success for intel-gpu-overlay: Update for renamed tracepoints
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: intel-gpu-overlay: Update for renamed tracepoints
URL : https://patchwork.freedesktop.org/series/39376/
State : success
== Summary ==
---- Possible new issues:
Test kms_vblank:
Subgroup pipe-a-ts-continuation-modeset:
skip -> PASS (shard-snb)---- Known issues:
Test gem_eio:
Subgroup in-flight-external:
pass -> INCOMPLETE (shard-apl) fdo#104945
Test kms_chv_cursor_fail:
Subgroup pipe-b-256x256-right-edge:
dmesg-warn -> PASS (shard-snb) fdo#105185
Test kms_cursor_legacy:
Subgroup flip-vs-cursor-atomic:
skip -> PASS (shard-snb) fdo#102670
Test kms_flip:
Subgroup 2x-plain-flip-ts-check-interruptible:
pass -> FAIL (shard-hsw) fdo#100368
Subgroup dpms-vs-vblank-race:
fail -> PASS (shard-hsw) fdo#103060
Test kms_rotation_crc:
Subgroup sprite-rotation-180:
pass -> FAIL (shard-snb) fdo#103925
Test kms_setmode:
Subgroup basic:
fail -> PASS (shard-hsw) fdo#99912fdo#104945 https://bugs.freedesktop.org/show_bug.cgi?id=104945
fdo#105185 https://bugs.freedesktop.org/show_bug.cgi?id=105185
fdo#102670 https://bugs.freedesktop.org/show_bug.cgi?id=102670
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103925 https://bugs.freedesktop.org/show_bug.cgi?id=103925
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
shard-apl total:3449 pass:1813 dwarn:1 dfail:0 fail:7 skip:1626 time:12117s shard-hsw total:3468 pass:1774 dwarn:1 dfail:0 fail:1 skip:1691 time:11796s shard-snb total:3468 pass:1364 dwarn:1 dfail:0 fail:2 skip:2101 time:7126s
Blacklisted hosts:
shard-kbl total:3299 pass:1865 dwarn:1 dfail:0 fail:8 skip:1422 time:8506s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1059/shards.html
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Quoting Tvrtko Ursulin (2018-03-05 12:41:58)
Quoted 5 lines
From: Tvrtko Ursulin <[email protected]>
Request tracepoints have been renames so update the tool to be able to find them.
Quoted 7 lines
Also support falling back to the old name for compatibility.
Signed-off-by Tvrtko Ursulin <[email protected]>---
Compile tested only so also looking for someone to smoke test it if possible. Otherwise I'll do it in due time once back to a test machine with display.
I use it on remote boxes with ssh -X.
Quoted 2 lines
I was also 50-50 whether it is worth supporting the old names, but it was easy enough so I did it.
Yeah, but a slippery slope? If we just rule this is a dev tool and using it on anything other than drm-tip requires you to fix it up, do we create more or less hassle for ourselves?
-Chris
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Quoted 8 lines · Chris Wilson
Quoting Tvrtko Ursulin (2018-03-05 12:41:58)
Quoted 7 lines
From: Tvrtko Ursulin <[email protected]>
Request tracepoints have been renames so update the tool to be able to find them.
Also support falling back to the old name for compatibility.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Tvrtko Ursulin <[email protected]>---
Compile tested only so also looking for someone to smoke test it if possible. Otherwise I'll do it in due time once back to a test machine with display.I use it on remote boxes with ssh -X.
Ha.. never crossed my mind.
Quoted 6 lines
Quoted 2 lines
I was also 50-50 whether it is worth supporting the old names, but it was easy enough so I did it.
Yeah, but a slippery slope? If we just rule this is a dev tool and using it on anything other than drm-tip requires you to fix it up, do we create more or less hassle for ourselves?
You're probably right. Will drop the backwards compatibility.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/1 intel-gpu-overlay: Update for renamed tracepoints
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Request tracepoints have been renames so update the tool to be able to find them.
v2: Only support new names.
--- overlay/gpu-perf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
overlay/gpu-perf.c +3 -3
@@ -90,9 +90,9 @@ struct tracepoint {int global_seqno_field;int plane_field; } tracepoints[TP_NB] = { - [TP_GEM_REQUEST_ADD] = { .name = "i915/i915_gem_request_add", }, - [TP_GEM_REQUEST_WAIT_BEGIN] = { .name = "i915/i915_gem_request_wait_begin", }, - [TP_GEM_REQUEST_WAIT_END] = { .name = "i915/i915_gem_request_wait_end", }, + [TP_GEM_REQUEST_ADD] = { .name = "i915/i915_request_add", }, + [TP_GEM_REQUEST_WAIT_BEGIN] = { .name = "i915/i915_request_wait_begin", }, + [TP_GEM_REQUEST_WAIT_END] = { .name = "i915/i915_request_wait_end", }, [TP_FLIP_COMPLETE] = { .name = "i915/flip_complete", }, [TP_GEM_RING_SYNC_TO] = { .name = "i915/gem_ring_sync_to", }, [TP_GEM_RING_SWITCH_CONTEXT] = { .name = "i915/gem_ring_switch_context", },
Signature · 6 lines
2.14.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
Quoting Tvrtko Ursulin (2018-03-15 10:01:22)
Quoted 8 lines
From: Tvrtko Ursulin <[email protected]>
Request tracepoints have been renames so update the tool to be able to find them.
v2: Only support new names.
Signed-off-by Tvrtko Ursulin <[email protected]>
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[igt-dev] ✗ Fi.CI.BAT: warning for intel-gpu-overlay: Update for renamed tracepoints (rev2)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: intel-gpu-overlay: Update for renamed tracepoints (rev2)
URL : https://patchwork.freedesktop.org/series/39376/
State : warning
== Summary ==
IGT patchset tested on top of latest successful build 5c146fcff2d51ea426efc538599013e887fe456b tests/kms_pipe_crc_basic: Remove legacy crc tests
with latest DRM-Tip kernel build CI_DRM_393395626f201526 drm-tip: 2018y-03m-15d-11h-01m-14s UTC integration manifest
No testlist changes.
---- Possible new issues:
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
pass -> DMESG-WARN (fi-snb-2600)---- Known issues:
Test gem_mmap_gtt:
Subgroup basic-small-bo-tiledx:
fail -> PASS (fi-gdg-551) fdo#102575
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
pass -> DMESG-WARN (fi-cnl-y3) fdo#103191fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fi-bdw-5557u total:285 pass:264 dwarn:0 dfail:0 fail:0 skip:21 time:430s fi-bdw-gvtdvm total:285 pass:261 dwarn:0 dfail:0 fail:0 skip:24 time:440s fi-blb-e6850 total:285 pass:220 dwarn:1 dfail:0 fail:0 skip:64 time:381s fi-bsw-n3050 total:285 pass:239 dwarn:0 dfail:0 fail:0 skip:46 time:540s fi-bwr-2160 total:285 pass:180 dwarn:0 dfail:0 fail:0 skip:105 time:296s fi-bxt-j4205 total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:515s fi-byt-j1900 total:285 pass:250 dwarn:0 dfail:0 fail:0 skip:35 time:517s fi-byt-n2820 total:285 pass:246 dwarn:0 dfail:0 fail:0 skip:39 time:501s fi-cfl-8700k total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:411s fi-cfl-s2 total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:575s fi-cfl-u total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:511s fi-cnl-drrs total:285 pass:254 dwarn:3 dfail:0 fail:0 skip:28 time:524s fi-cnl-y3 total:285 pass:258 dwarn:1 dfail:0 fail:0 skip:26 time:594s fi-elk-e7500 total:285 pass:226 dwarn:0 dfail:0 fail:0 skip:59 time:427s fi-gdg-551 total:285 pass:177 dwarn:0 dfail:0 fail:0 skip:108 time:319s fi-glk-1 total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:539s fi-hsw-4770 total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:401s fi-ilk-650 total:285 pass:225 dwarn:0 dfail:0 fail:0 skip:60 time:419s fi-ivb-3520m total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:477s fi-ivb-3770 total:285 pass:252 dwarn:0 dfail:0 fail:0 skip:33 time:429s fi-kbl-7500u total:285 pass:260 dwarn:1 dfail:0 fail:0 skip:24 time:474s fi-kbl-7567u total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:463s fi-kbl-r total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:515s fi-pnv-d510 total:285 pass:219 dwarn:1 dfail:0 fail:0 skip:65 time:654s fi-skl-6260u total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:440s fi-skl-6600u total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:532s fi-skl-6700hq total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:541s fi-skl-6700k2 total:285 pass:261 dwarn:0 dfail:0 fail:0 skip:24 time:503s fi-skl-6770hq total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:492s fi-skl-guc total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:429s fi-skl-gvtdvm total:285 pass:262 dwarn:0 dfail:0 fail:0 skip:23 time:447s fi-snb-2520m total:285 pass:245 dwarn:0 dfail:0 fail:0 skip:40 time:584s fi-snb-2600 total:285 pass:244 dwarn:1 dfail:0 fail:0 skip:40 time:400s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1131/issues.html
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev