From: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
Timeline id allocation order is not tied with engine ids any more.
Remove the option which assumed that was the case in attempt to provide
more readable timeline.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
---
scripts/media-bench.pl | 2 +-
scripts/trace.pl | 18 ------------------
2 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/scripts/media-bench.pl b/scripts/media-bench.pl
index c07555b0dc74..375844d9cdf6 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 -c --squash-ctx-id ";
+ $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 7f181a3fa2f5..fae94d5044ef 100755
--- a/scripts/trace.pl
+++ b/scripts/trace.pl
@@ -38,7 +38,6 @@ my %skip_box;
my $html = 0;
my $trace = 0;
my $avg_delay_stats = 0;
-my $squash_context_id = 0;
my $gpu_timeline = 0;
my $colour_contexts = 0;
@@ -108,8 +107,6 @@ Usage:
--html Generate HTML output.
--trace cmd Trace the following command.
--avg-delay-stats Print average delay stats.
- --squash-ctx-id Squash context id by substracting engine
- id from ctx id.
--gpu-timeline Draw overall GPU busy timeline.
--colour-contexts / -c Use different colours for different
context execution boxes.
@@ -145,18 +142,6 @@ sub arg_avg_delay_stats
return @_;
}
-sub arg_squash_ctx_id
-{
- return unless scalar(@_);
-
- if ($_[0] eq '--squash-ctx-id') {
- shift @_;
- $squash_context_id = 1;
- }
-
- return @_;
-}
-
sub arg_gpu_timeline
{
return unless scalar(@_);
@@ -303,7 +288,6 @@ while (@args) {
@args = arg_help(@args);
@args = arg_html(@args);
@args = arg_avg_delay_stats(@args);
- @args = arg_squash_ctx_id(@args);
@args = arg_gpu_timeline(@args);
@args = arg_trace(@args);
@args = arg_max_items(@args);
@@ -338,8 +322,6 @@ sub sanitize_ctx
{
my ($ctx, $ring) = @_;
- $ctx = $ctx - $ring if $squash_context_id;
-
if (exists $ctxdb{$ctx}) {
return $ctx . '.' . $ctxdb{$ctx};
} else {
--
2.14.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
