From 3d1c6b1a62024450c7aff7908cc62efaed6f1e29 Mon Sep 17 00:00:00 2001 From: Tvrtko Ursulin Date: Mon, 9 Jul 2018 13:06:11 +0100 Subject: trace.pl: Put single context at single vertical slot Turn off timeline stacking in favour of putting all the boxes belonging to a single context at the same vertical slot. Also remove the custom sorting function in favour of correctly assigning the subgroup id's and order which greatly speeds up the library operations. And finally remove the 'Toggle stacking' button which never worked. Signed-off-by: Tvrtko Ursulin Cc: John Harrison Reviewed-by: John Harrison --- scripts/trace.pl | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) (limited to 'scripts') diff --git a/scripts/trace.pl b/scripts/trace.pl index fa38e041..c9d01896 100755 --- a/scripts/trace.pl +++ b/scripts/trace.pl @@ -740,9 +740,6 @@ print < - - -

$execute_colour = requests executing on the GPU
$runnable_colour = runnable requests waiting for a slot on GPU
@@ -903,6 +900,7 @@ foreach my $key (sort sortQueue keys %db) { my $submit = $queue + $db{$key}->{'submit-delay'}; my ($content, $style); my $group = $engine_start_id + $rings{$db{$key}->{'ring'}}; + my $subgroup = $ctx - $min_ctx; my $type = ' type: \'range\','; my $startend; my $skey; @@ -914,7 +912,7 @@ foreach my $key (sort sortQueue keys %db) { ctx_colour($ctx, 'queue'); $content = "$name
$db{$key}->{'submit-delay'}us ($db{$key}->{'execute-delay'}us)"; $startend = 'start: \'' . ts($queue) . '\', end: \'' . ts($submit) . '\''; - print "\t{id: $i, key: $skey, $type group: $group, subgroup: 1, subgroupOrder: 1, content: '$content', $startend, style: \'$style\'},\n"; + print "\t{id: $i, key: $skey, $type group: $group, subgroup: $subgroup, subgroupOrder: $subgroup, content: '$content', $startend, style: \'$style\'},\n"; $i++; } @@ -925,7 +923,7 @@ foreach my $key (sort sortQueue keys %db) { ctx_colour($ctx, 'ready'); $content = "$name
$db{$key}->{'execute-delay'}us"; $startend = 'start: \'' . ts($submit) . '\', end: \'' . ts($start) . '\''; - print "\t{id: $i, key: $skey, $type group: $group, subgroup: 1, subgroupOrder: 2, content: '$content', $startend, style: \'$style\'},\n"; + print "\t{id: $i, key: $skey, $type group: $group, subgroup: $subgroup, subgroupOrder: $subgroup, content: '$content', $startend, style: \'$style\'},\n"; $i++; } @@ -944,7 +942,7 @@ foreach my $key (sort sortQueue keys %db) { $content .= ' + ' if exists $db{$key}->{'no-notify'}; $content .= "
$db{$key}->{'duration'}us ($db{$key}->{'context-complete-delay'}us)"; $startend = 'start: \'' . ts($start) . '\', end: \'' . ts($notify) . '\''; - print "\t{id: $i, key: $skey, $type group: $group, subgroup: 2, subgroupOrder: 3, content: '$content', $startend, style: \'$style\'},\n"; + print "\t{id: $i, key: $skey, $type group: $group, subgroup: $subgroup, subgroupOrder: $subgroup, content: '$content', $startend, style: \'$style\'},\n"; $i++; } @@ -958,7 +956,7 @@ foreach my $key (sort sortQueue keys %db) { $content .= ' ++ ' if exists $db{$key}->{'no-end'}; $content .= ' + ' if exists $db{$key}->{'no-notify'}; $startend = 'start: \'' . ts($notify) . '\', end: \'' . ts($end) . '\''; - print "\t{id: $i, key: $skey, $type group: $group, subgroup: 2, subgroupOrder: 4, content: '$content', $startend, style: \'$style\'},\n"; + print "\t{id: $i, key: $skey, $type group: $group, subgroup: $subgroup, subgroupOrder: $subgroup, content: '$content', $startend, style: \'$style\'},\n"; $i++; } @@ -1001,29 +999,18 @@ $first_ts = ts($first_ts); print <