From 37c8133cbd5d4d5d5050ec3dfd4ae3349134d23e Mon Sep 17 00:00:00 2001 From: Tvrtko Ursulin Date: Thu, 3 May 2018 12:55:27 +0100 Subject: trace.pl: Improve readability of graphical timeline representation We add stripes for different stages of request execution so it is easier to follow one context in the multi-colour mode. Vertical stripe pattern indicates pipeline "blockages" - requests waiting for dependencies before they are runnable. Diagonal stripes indicate runnable requests waiting for GPU time. Horizontal strips are requests executing on the GPU. Also use this new multi-coloured mode from media-bench.pl. v2: John Harrison: * Mention media-bench.pl in the commit. * Fix HTML for single colour mode. v3: * Rebase. * Apply stripes to legacy colouring as well. v4: John Harrison: * Use per context colours for ctxsave and incomplete boxes. * Clearer timeline legend. Signed-off-by: Tvrtko Ursulin Cc: John Harrison Reviewed-by: John Harrison --- scripts/media-bench.pl | 2 +- scripts/trace.pl | 112 +++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 90 insertions(+), 24 deletions(-) (limited to 'scripts') diff --git a/scripts/media-bench.pl b/scripts/media-bench.pl index c5628c7f..375844d9 100755 --- a/scripts/media-bench.pl +++ b/scripts/media-bench.pl @@ -207,7 +207,7 @@ sub trace_workload show_cmd($cmd); system($cmd); - $cmd = "perf script | $tracepl --html -x ctxsave -s "; + $cmd = "perf script | $tracepl --html -x ctxsave -s -c "; $cmd .= join ' ', map("-i $_", @skip_engine); $cmd .= " > ${file}.html"; show_cmd($cmd); diff --git a/scripts/trace.pl b/scripts/trace.pl index 3ad5effa..b9188123 100755 --- a/scripts/trace.pl +++ b/scripts/trace.pl @@ -707,9 +707,14 @@ foreach my $key (keys %reqwait) { say sprintf('GPU: %.2f%% idle, %.2f%% busy', $flat_busy{'gpu-idle'}, $flat_busy{'gpu-busy'}) unless $html; -my $queued_colour = $colour_contexts ? 'multi-colour light' : 'blue'; -my $runnable_colour = $colour_contexts ? 'multi-colour dark' : 'grey'; -my $execute_colour = $colour_contexts ? 'multi-colour' : 'pink'; +my $timeline_text = $colour_contexts ? + 'Per context coloured shading like:' : 'Box shading like:'; + +my $queued_style = box_style($min_ctx, 'queue'); +my $ready_style = box_style($min_ctx, 'ready'); +my $execute_style = box_style($min_ctx, 'execute'); +my $ctxsave_style = box_style($min_ctx, 'ctxsave'); +my $incomplete_style = box_style($min_ctx, 'incomplete'); print < @@ -728,9 +733,28 @@ print <

-$execute_colour = requests executing on the GPU
-$runnable_colour = runnable requests waiting for a slot on GPU
-$queued_colour = requests waiting on fences and dependencies before they are runnable
+Timeline request view: + + + + + + + + + + + + +
$timeline_text
QUEUED
READY
EXECUTE
CTXSAVE
(INCOMPLETE)
+

+ +QUEUED = requests executing on the GPU
+READY = runnable requests waiting for a slot on GPU
+EXECUTE = requests waiting on fences and dependencies before they are runnable
+CTXSAVE = GPU saving the context image
+

Boxes are in format 'ctx-id/seqno'. @@ -850,17 +874,31 @@ sub sortQueue { sub ctx_colour { - my ($ctx, $stage) = (@_); + my ($ctx, $stage, $lfac) = (@_); my ($s, $l); my $val; unless ($colour_contexts) { if ($stage eq 'queue') { - return 'lightblue;'; + $val = 210; + $s = 65; + $l = 52; } elsif ($stage eq 'ready') { - return 'lightgrey;'; + $val = 0; + $s = 0; + $l = 47; } elsif ($stage eq 'execute') { - return 'pink;'; + $val = 346; + $s = 68; + $l = 65; + } elsif ($stage eq 'ctxsave') { + $val = 26; + $s = 90; + $l = 52; + } elsif ($stage eq 'incomplete') { + $val = 0; + $s = 85; + $l = 50; } } else { if ($stage eq 'queue') { @@ -872,12 +910,45 @@ sub ctx_colour } elsif ($stage eq 'execute') { $s = 80; $l = 65; + } elsif ($stage eq 'ctxsave') { + $s = 75; + $l = 70; + } elsif ($stage eq 'incomplete') { + $s = 80; + $l = 25; } + + $val = int(360 / ($max_ctx - $min_ctx + 1)) * ($ctx - $min_ctx); } - $val = int(360 / ($max_ctx - $min_ctx + 1)) * ($ctx - $min_ctx); + $l = int($l * $lfac); - return "hsl($val, $s%, $l%);"; + return "hsl($val, $s%, $l%)"; +} + +sub box_style +{ + my ($ctx, $stage) = @_; + my $deg; + + if ($stage eq 'queue') { + $deg = 90; + } elsif ($stage eq 'ready') { + $deg = 45; + } elsif ($stage eq 'execute') { + $deg = 0; + } elsif ($stage eq 'ctxsave') { + $deg = 105; + } elsif ($stage eq 'incomplete') { + $deg = 0; + } + + return 'color: black; background: repeating-linear-gradient(' . + $deg . 'deg, ' . + ctx_colour($ctx, $stage, 1.0) . ', ' . + ctx_colour($ctx, $stage, 1.0) . ' 10px, ' . + ctx_colour($ctx, $stage, 0.90) . ' 10px, ' . + ctx_colour($ctx, $stage, 0.90) . ' 20px);'; } my $i = 0; @@ -895,8 +966,7 @@ foreach my $key (sort sortQueue keys %db) { # submit to execute unless (exists $skip_box{'queue'}) { $skey = 2 * $max_seqno * $ctx + 2 * $seqno; - $style = 'color: black; background-color: ' . - ctx_colour($ctx, 'queue'); + $style = box_style($ctx, 'queue'); $content = "$name
$db{$key}->{'submit-delay'}us ($db{$key}->{'execute-delay'}us)"; $startend = 'start: ' . $queue . ', end: ' . $submit; print "\t{id: $i, key: $skey, $type group: $group, subgroup: $subgroup, subgroupOrder: $subgroup, content: '$content', $startend, style: \'$style\'},\n"; @@ -906,8 +976,7 @@ foreach my $key (sort sortQueue keys %db) { # execute to start unless (exists $skip_box{'ready'}) { $skey = 2 * $max_seqno * $ctx + 2 * $seqno + 1; - $style = 'color: black; background-color: ' . - ctx_colour($ctx, 'ready'); + $style = box_style($ctx, 'ready'); $content = "$name
$db{$key}->{'execute-delay'}us"; $startend = 'start: ' . $submit . ', end: ' . $start; print "\t{id: $i, key: $skey, $type group: $group, subgroup: $subgroup, subgroupOrder: $subgroup, content: '$content', $startend, style: \'$style\'},\n"; @@ -917,12 +986,9 @@ foreach my $key (sort sortQueue keys %db) { # start to user interrupt unless (exists $skip_box{'execute'}) { $skey = -2 * $max_seqno * $ctx - 2 * $seqno - 1; - if (exists $db{$key}->{'incomplete'}) { - $style = 'color: white; background-color: red;'; - } else { - $style = 'color: black; background-color: ' . - ctx_colour($ctx, 'execute'); - } + $style = box_style($ctx, + exists $db{$key}->{'incomplete'} ? + 'incomplete' : 'execute'); $content = "$name $db{$key}->{'port'}"; $content .= ' ??? ' if exists $db{$key}->{'incomplete'}; $content .= ' ++ ' if exists $db{$key}->{'no-end'}; @@ -936,7 +1002,7 @@ foreach my $key (sort sortQueue keys %db) { # user interrupt to context complete unless (exists $skip_box{'ctxsave'}) { $skey = -2 * $max_seqno * $ctx - 2 * $seqno; - $style = 'color: black; background-color: orange;'; + $style = box_style($ctx, 'ctxsave'); my $ctxsave = $db{$key}->{'end'} - $db{$key}->{'notify'}; $content = "$name
${ctxsave}us"; $content .= ' ??? ' if exists $db{$key}->{'incomplete'}; -- cgit v1.2.3