scripts/trace.pl: Remove some old code
PATCH 1/1 scripts/trace.pl: Remove some old code
From: Tvrtko Ursulin <[email protected]>
Remove some inactive code which was only uised to support the old execlists implementation. It is hidden behind a toggle which is not user accesible anyway.
--- scripts/trace.pl | 31 ------------------------------- 1 file changed, 31 deletions(-)
scripts/trace.pl +0 -31
@@ -354,8 +354,6 @@ sub ts # trace using a hash of requests and some auxilliary data structures. my $prev_freq = 0; my $prev_freq_ts = 0; -my $oldkernelwa = 0; -my ($no_queue, $no_in); while (<>) { my @fields; my @tmp;
@@ -440,10 +438,6 @@ while (<>) { $key = db_key($tp{'ring'}, $tp{'ctx'}, $tp{'seqno'}); die if exists $db{$key}; - if (not exists $queue{$key} and $oldkernelwa) { - $no_queue++; - next; - } die unless exists $queue{$key}; die unless exists $submit{$key};
@@ -467,10 +461,6 @@ while (<>) { $tp{'ctx'} = sanitize_ctx($tp{'ctx'}, $tp{'ring'}); $key = db_key($tp{'ring'}, $tp{'ctx'}, $tp{'seqno'}); - if (not exists $db{$key} and $oldkernelwa) { - $no_in++; - next; - } die unless exists $db{$key}; die unless exists $db{$key}->{'start'}; die if exists $db{$key}->{'end'};
@@ -574,27 +564,6 @@ foreach my $key (sort {$db{$a}->{'start'} <=> $db{$b}->{'start'}} keys %db) { $first_ts = $db{$key}->{'queue'} if not defined $first_ts or $db{$key}->{'queue'} < $first_ts; $last_ts = $end if $end > $last_ts; - # Adjust batch start with legacy execlists. - # Port == 2 mean batch was merged udring queuing and hasn't actually - # been submitted to the gpu until the batch with port < 2 is found. - if ($correct_durations and $oldkernelwa and $db{$key}->{'port'} == 2) { - my $ctx = $db{$key}->{'ctx'}; - my $seqno = $db{$key}->{'seqno'}; - my $next_key; - my $i = 1; - - do { - $next_key = db_key($ring, $ctx, $seqno + $i); - $i++; - } until ((exists $db{$next_key} and $db{$next_key}->{'port'} < 2) or $i > scalar(keys(%db))); # ugly stop hack - - if (exists $db{$next_key}) { - $db{$key}->{'start'} = $db{$next_key}->{'start'}; - $db{$key}->{'end'} = $db{$next_key}->{'end'}; - die if $db{$key}->{'start'} > $db{$key}->{'end'}; - } - } - $running{$ring} += $end - $db{$key}->{'start'} unless exists $db{$key}->{'no-end'}; $runnable{$ring} += $db{$key}->{'execute-delay'}; $queued{$ring} += $db{$key}->{'start'} - $db{$key}->{'execute-delay'} - $db{$key}->{'queue'};
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 scripts/trace.pl: Remove some old code
== Series Details ==
== Series Details ==
Series: scripts/trace.pl: Remove some old code
URL : https://patchwork.freedesktop.org/series/35526/
State : success
== Summary ==
IGT patchset tested on top of latest successful build cfb711c046c22c3881d2334f0b43ec4eb0b9a5fc scripts/trace.pl: Auto-detect tracepoint field order
with latest DRM-Tip kernel build CI_DRM_3542dcb649c7cee0 drm-tip: 2017y-12m-18d-16h-15m-16s UTC integration manifest
No testlist changes.
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
pass -> INCOMPLETE (fi-snb-2520m) fdo#103713fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:439s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:443s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:386s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:500s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:276s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:495s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:496s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:482s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:466s fi-elk-e7500 total:224 pass:163 dwarn:15 dfail:0 fail:0 skip:45 fi-gdg-551 total:288 pass:178 dwarn:1 dfail:0 fail:1 skip:108 time:266s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:532s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:407s fi-hsw-4770r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:415s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:403s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:478s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:435s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:482s fi-kbl-7560u total:288 pass:268 dwarn:1 dfail:0 fail:0 skip:19 time:524s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:470s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:525s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:579s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:434s fi-skl-6600u total:288 pass:260 dwarn:1 dfail:0 fail:0 skip:27 time:535s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:554s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:509s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:505s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:450s fi-snb-2520m total:245 pass:211 dwarn:0 dfail:0 fail:0 skip:33 fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:416s Blacklisted hosts: fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:593s fi-glk-dsi total:22 pass:16 dwarn:5 dfail:0 fail:0 skip:0
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_694/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: warning for scripts/trace.pl: Remove some old code
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: scripts/trace.pl: Remove some old code
URL : https://patchwork.freedesktop.org/series/35526/
State : warning
== Summary ==
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-offscren-pri-shrfb-draw-render:
fail -> PASS (shard-snb) fdo#101623 +1
Test drv_suspend:
Subgroup debugfs-reader:
skip -> PASS (shard-hsw)
Test kms_fbcon_fbt:
Subgroup fbc-suspend:
pass -> SKIP (shard-snb)
Test drv_selftest:
Subgroup live_hangcheck:
incomplete -> PASS (shard-snb) fdo#104313fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
fdo#104313 https://bugs.freedesktop.org/show_bug.cgi?id=104313
shard-hsw total:2712 pass:1537 dwarn:1 dfail:0 fail:10 skip:1164 time:9412s shard-snb total:2712 pass:1308 dwarn:1 dfail:0 fail:11 skip:1392 time:7964s Blacklisted hosts: shard-apl total:2690 pass:1663 dwarn:1 dfail:0 fail:23 skip:1001 time:13311s shard-kbl total:2691 pass:1782 dwarn:3 dfail:1 fail:25 skip:879 time:10261s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_694/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx