From: Tvrtko Ursulin <tursulin@ursulin.net> To: igt-dev@lists.freedesktop.org Cc: Intel-gfx@lists.freedesktop.org Subject: [PATCH i-g-t 5/7] trace.pl: Fix incomplete request handling Date: Tue, 8 May 2018 18:31:13 +0100 [thread overview] Message-ID: <20180508173115.24550-5-tvrtko.ursulin@linux.intel.com> (raw) In-Reply-To: <20180508173115.24550-1-tvrtko.ursulin@linux.intel.com> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Incomplete requests (no notify, no context complete) have to be corrected by looking at the engine timeline, and not the sorted-by-start-time view as was previously used. Per-engine timelines are generated on demand and cached for later use. v2: Find end of current context on the engine timeline instead of just using the next request for adjusting the incomplete start time. v3: Improve scaling with large datasets by only walking each engine timeline once and some caching. (John Harrison) Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: John Harrison <John.C.Harrison@intel.com> --- scripts/trace.pl | 102 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 75 insertions(+), 27 deletions(-) diff --git a/scripts/trace.pl b/scripts/trace.pl index 696c18e8b1cf..0ec33cd37e4a 100755 --- a/scripts/trace.pl +++ b/scripts/trace.pl @@ -498,39 +498,83 @@ foreach my $key (keys %db) { } } -# Fix up incompletes my $key_count = scalar(keys %db); -foreach my $key (keys %db) { - next unless exists $db{$key}->{'incomplete'}; - # End the incomplete batch at the time next one starts - my $ring = $db{$key}->{'ring'}; - my $ctx = $db{$key}->{'ctx'}; - my $seqno = $db{$key}->{'seqno'}; - my $next_key; - my $i = 1; - my $end; - - do { - $next_key = db_key($ring, $ctx, $seqno + $i); - $i++; - } until ((exists $db{$next_key} and not exists $db{$next_key}->{'incomplete'}) - or $i > $key_count); # ugly stop hack +my %engine_timelines; - if (exists $db{$next_key}) { - $end = $db{$next_key}->{'end'}; - } else { - # No info at all, fake it: - $end = $db{$key}->{'start'} + 999; - } +sub sortEngine { + my $as = $db{$a}->{'global'}; + my $bs = $db{$b}->{'global'}; + my $val; - $db{$key}->{'notify'} = $end; - $db{$key}->{'end'} = $end; + $val = $as <=> $bs; + + die if $val == 0; + + return $val; } -# GPU time accounting -my (%running, %runnable, %queued, %batch_avg, %batch_total_avg, %batch_count); -my (%submit_avg, %execute_avg, %ctxsave_avg); +sub get_engine_timeline { + my ($ring) = @_; + my @timeline; + + return $engine_timelines{$ring} if exists $engine_timelines{$ring}; + + @timeline = grep { $db{$_}->{'ring'} == $ring } keys %db; + # FIXME seqno restart + @timeline = sort sortEngine @timeline; + + $engine_timelines{$ring} = \@timeline; + + return \@timeline; +} + +# Fix up incompletes by ending them when the last request of a coalesced group +# ends. (Or first of a different context starts.) +foreach my $gid (sort keys %rings) { + my $ring = $ringmap{$rings{$gid}}; + my $timeline = get_engine_timeline($ring); + my $last_complete = -1; + my $complete; + + foreach my $pos (0..$#{$timeline}) { + my $key = @{$timeline}[$pos]; + my $end; + + next unless exists $db{$key}->{'incomplete'}; + + # Find first following complete request + if ($pos > $last_complete) { + my $next = $pos; + + undef $complete; + + while ($next < $#{$timeline}) { + my $next_key = ${$timeline}[++$next]; + + next if exists $db{$next_key}->{'incomplete'}; + + $last_complete = $next; + $complete = $next_key; + last; + } + } + + if (defined $complete) { + if ($db{$key}->{'ctx'} == $db{$complete}->{'ctx'}) { + $end = $db{$complete}->{'end'}; + } else { + $end = $db{$complete}->{'start'}; + } + } else { + # No next submission, fake it. + $end = $db{$key}->{'start'} + 999; + } + + $db{$key}->{'notify'} = $end; + $db{$key}->{'end'} = $end; + } +} sub sortStart { my $as = $db{$a}->{'start'}; @@ -579,6 +623,10 @@ foreach my $key (@sorted_keys) { @sorted_keys = sort sortStart keys %db if $re_sort; +# GPU time accounting +my (%running, %runnable, %queued, %batch_avg, %batch_total_avg, %batch_count); +my (%submit_avg, %execute_avg, %ctxsave_avg); + my $last_ts = 0; my $first_ts; my ($min_ctx, $max_ctx); -- 2.14.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Tvrtko Ursulin <tursulin@ursulin.net> To: igt-dev@lists.freedesktop.org Cc: Intel-gfx@lists.freedesktop.org, Tvrtko Ursulin <tvrtko.ursulin@intel.com> Subject: [igt-dev] [PATCH i-g-t 5/7] trace.pl: Fix incomplete request handling Date: Tue, 8 May 2018 18:31:13 +0100 [thread overview] Message-ID: <20180508173115.24550-5-tvrtko.ursulin@linux.intel.com> (raw) In-Reply-To: <20180508173115.24550-1-tvrtko.ursulin@linux.intel.com> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Incomplete requests (no notify, no context complete) have to be corrected by looking at the engine timeline, and not the sorted-by-start-time view as was previously used. Per-engine timelines are generated on demand and cached for later use. v2: Find end of current context on the engine timeline instead of just using the next request for adjusting the incomplete start time. v3: Improve scaling with large datasets by only walking each engine timeline once and some caching. (John Harrison) Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: John Harrison <John.C.Harrison@intel.com> --- scripts/trace.pl | 102 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 75 insertions(+), 27 deletions(-) diff --git a/scripts/trace.pl b/scripts/trace.pl index 696c18e8b1cf..0ec33cd37e4a 100755 --- a/scripts/trace.pl +++ b/scripts/trace.pl @@ -498,39 +498,83 @@ foreach my $key (keys %db) { } } -# Fix up incompletes my $key_count = scalar(keys %db); -foreach my $key (keys %db) { - next unless exists $db{$key}->{'incomplete'}; - # End the incomplete batch at the time next one starts - my $ring = $db{$key}->{'ring'}; - my $ctx = $db{$key}->{'ctx'}; - my $seqno = $db{$key}->{'seqno'}; - my $next_key; - my $i = 1; - my $end; - - do { - $next_key = db_key($ring, $ctx, $seqno + $i); - $i++; - } until ((exists $db{$next_key} and not exists $db{$next_key}->{'incomplete'}) - or $i > $key_count); # ugly stop hack +my %engine_timelines; - if (exists $db{$next_key}) { - $end = $db{$next_key}->{'end'}; - } else { - # No info at all, fake it: - $end = $db{$key}->{'start'} + 999; - } +sub sortEngine { + my $as = $db{$a}->{'global'}; + my $bs = $db{$b}->{'global'}; + my $val; - $db{$key}->{'notify'} = $end; - $db{$key}->{'end'} = $end; + $val = $as <=> $bs; + + die if $val == 0; + + return $val; } -# GPU time accounting -my (%running, %runnable, %queued, %batch_avg, %batch_total_avg, %batch_count); -my (%submit_avg, %execute_avg, %ctxsave_avg); +sub get_engine_timeline { + my ($ring) = @_; + my @timeline; + + return $engine_timelines{$ring} if exists $engine_timelines{$ring}; + + @timeline = grep { $db{$_}->{'ring'} == $ring } keys %db; + # FIXME seqno restart + @timeline = sort sortEngine @timeline; + + $engine_timelines{$ring} = \@timeline; + + return \@timeline; +} + +# Fix up incompletes by ending them when the last request of a coalesced group +# ends. (Or first of a different context starts.) +foreach my $gid (sort keys %rings) { + my $ring = $ringmap{$rings{$gid}}; + my $timeline = get_engine_timeline($ring); + my $last_complete = -1; + my $complete; + + foreach my $pos (0..$#{$timeline}) { + my $key = @{$timeline}[$pos]; + my $end; + + next unless exists $db{$key}->{'incomplete'}; + + # Find first following complete request + if ($pos > $last_complete) { + my $next = $pos; + + undef $complete; + + while ($next < $#{$timeline}) { + my $next_key = ${$timeline}[++$next]; + + next if exists $db{$next_key}->{'incomplete'}; + + $last_complete = $next; + $complete = $next_key; + last; + } + } + + if (defined $complete) { + if ($db{$key}->{'ctx'} == $db{$complete}->{'ctx'}) { + $end = $db{$complete}->{'end'}; + } else { + $end = $db{$complete}->{'start'}; + } + } else { + # No next submission, fake it. + $end = $db{$key}->{'start'} + 999; + } + + $db{$key}->{'notify'} = $end; + $db{$key}->{'end'} = $end; + } +} sub sortStart { my $as = $db{$a}->{'start'}; @@ -579,6 +623,10 @@ foreach my $key (@sorted_keys) { @sorted_keys = sort sortStart keys %db if $re_sort; +# GPU time accounting +my (%running, %runnable, %queued, %batch_avg, %batch_total_avg, %batch_count); +my (%submit_avg, %execute_avg, %ctxsave_avg); + my $last_ts = 0; my $first_ts; my ($min_ctx, $max_ctx); -- 2.14.1 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2018-05-08 17:31 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-08 17:31 [PATCH i-g-t 1/7] trace.pl: Add support for colouring context execution Tvrtko Ursulin 2018-05-08 17:31 ` [Intel-gfx] " Tvrtko Ursulin 2018-05-08 17:31 ` [PATCH i-g-t 2/7] trace.pl: Improve readability of graphical timeline representation Tvrtko Ursulin 2018-05-08 17:31 ` [igt-dev] " Tvrtko Ursulin 2018-05-08 17:31 ` [PATCH i-g-t 3/7] trace.pl: Remove context squashing option Tvrtko Ursulin 2018-05-08 17:31 ` [igt-dev] " Tvrtko Ursulin 2018-05-08 17:31 ` [PATCH i-g-t 4/7] trace.pl: Fix engine busy accounting in split mode Tvrtko Ursulin 2018-05-08 17:31 ` [igt-dev] " Tvrtko Ursulin 2018-05-08 17:31 ` Tvrtko Ursulin [this message] 2018-05-08 17:31 ` [igt-dev] [PATCH i-g-t 5/7] trace.pl: Fix incomplete request handling Tvrtko Ursulin 2018-05-08 17:31 ` [PATCH i-g-t 6/7] trace.pl: Basic preemption support Tvrtko Ursulin 2018-05-08 17:31 ` [igt-dev] " Tvrtko Ursulin 2018-05-08 17:31 ` [PATCH i-g-t 7/7] trace.pl: Fix request split mode Tvrtko Ursulin 2018-05-08 17:31 ` [igt-dev] " Tvrtko Ursulin 2018-05-09 15:32 ` [PATCH i-g-t v4 " Tvrtko Ursulin 2018-05-09 15:32 ` [igt-dev] " Tvrtko Ursulin 2018-05-08 19:09 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/7] trace.pl: Add support for colouring context execution Patchwork 2018-05-08 23:01 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork 2018-05-09 15:59 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/7] trace.pl: Add support for colouring context execution (rev2) Patchwork 2018-05-09 19:10 ` [igt-dev] ✓ Fi.CI.IGT: " 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=20180508173115.24550-5-tvrtko.ursulin@linux.intel.com \ --to=tursulin@ursulin.net \ --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.