* [igt-dev] [PATCH i-g-t v3 2/9] trace.pl: Scale timeline for better precision
[not found] <0180712105958.12953-3-tvrtko.ursulin@linux.intel.com>
@ 2018-07-13 9:56 ` Tvrtko Ursulin
0 siblings, 0 replies; 3+ messages in thread
From: Tvrtko Ursulin @ 2018-07-13 9:56 UTC (permalink / raw)
To: igt-dev; +Cc: intel-gfx, Tvrtko Ursulin
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
vis library has a limited precision compared to our trace data which
prevents zooming into the timeline and seeing the fine detail.
Scale the HTML view by a thousand to work around it.
v2: Rebase for time axis changes.
v3: Another tweak for time axis changes.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Suggested-by: John Harrison <John.C.Harrison@Intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: John Harrison <John.C.Harrison@Intel.com> # v2
---
scripts/trace.pl | 54 ++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 50 insertions(+), 4 deletions(-)
diff --git a/scripts/trace.pl b/scripts/trace.pl
index 41f10749a153..4b5f4ef77aef 100755
--- a/scripts/trace.pl
+++ b/scripts/trace.pl
@@ -40,6 +40,7 @@ my $trace = 0;
my $avg_delay_stats = 0;
my $gpu_timeline = 0;
my $colour_contexts = 0;
+my $no_timeline_scaling = 0;
my @args;
@@ -281,6 +282,18 @@ sub arg_colour_contexts
return @_;
}
+sub arg_no_timeline_scaling
+{
+ return unless scalar(@_);
+
+ if ($_[0] eq '--no-timeline-scaling') {
+ shift @_;
+ $no_timeline_scaling = 1;
+ }
+
+ return @_;
+}
+
@args = @ARGV;
while (@args) {
my $left = scalar(@args);
@@ -296,6 +309,7 @@ while (@args) {
@args = arg_ignore_ring(@args);
@args = arg_skip_box(@args);
@args = arg_colour_contexts(@args);
+ @args = arg_no_timeline_scaling(@args);
last if $left == scalar(@args);
}
@@ -334,6 +348,8 @@ sub ts
my ($us) = @_;
my ($y, $mo, $d, $h, $m, $s);
+ $us *= 1000 unless $no_timeline_scaling;
+
$s = int($us / 1000000);
$us = $us % 1000000;
@@ -999,11 +1015,28 @@ $first_ts = ts($first_ts);
print <<ENDHTML;
]);
+ENDHTML
+if ($html) {
+ if ($no_timeline_scaling) {
+ say " timeDiv = 1;";
+ } else {
+ say " timeDiv = 1000;";
+ }
+}
+
+print <<ENDHTML;
function majorAxis(date, scale, step) {
- var s = date / 1000;
+ var s = date / 1000 / timeDiv;
var precision;
+ if (timeDiv == 1000) {
+ if (scale == 'second')
+ scale = 'millisecond';
+ else if (scale == 'minute')
+ scale = 'second'
+ }
+
if (scale == 'millisecond')
precision = 6;
else if (scale == 'second')
@@ -1015,14 +1048,27 @@ print <<ENDHTML;
}
function minorAxis(date, scale, step) {
- var ms = date;
+ var ms = date / timeDiv;
+ var orig_scale = scale;
var precision;
var unit;
+ if (timeDiv == 1000) {
+ if (scale == 'second')
+ scale = 'millisecond';
+ else if (scale == 'minute')
+ scale = 'second'
+ }
+
if (scale == 'millisecond') {
- ms %= 1000;
precision = 0;
- unit = 'ms';
+ if (orig_scale == 'millisecond' && step <= 200) {
+ ms = date % 1000;
+ unit = 'us';
+ } else {
+ ms %= 1000;
+ unit = 'ms';
+ }
} else if (scale == 'second') {
ms /= 1000;
precision = 1;
--
2.17.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [igt-dev] [PATCH i-g-t 2/9] trace.pl: Scale timeline for better precision
@ 2018-07-12 10:59 Tvrtko Ursulin
2018-07-13 10:02 ` [igt-dev] [PATCH i-g-t v3 " Tvrtko Ursulin
0 siblings, 1 reply; 3+ messages in thread
From: Tvrtko Ursulin @ 2018-07-12 10:59 UTC (permalink / raw)
To: igt-dev; +Cc: intel-gfx, Tvrtko Ursulin
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
vis library has a limited precision compared to our trace data which
prevents zooming into the timeline and seeing the fine detail.
Scale the HTML view by a thousand to work around it.
v2: Rebase for time axis changes.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Suggested-by: John Harrison <John.C.Harrison@Intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: John Harrison <John.C.Harrison@Intel.com> # v1
---
scripts/trace.pl | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 43 insertions(+), 3 deletions(-)
diff --git a/scripts/trace.pl b/scripts/trace.pl
index 89491125490d..726c90d44547 100755
--- a/scripts/trace.pl
+++ b/scripts/trace.pl
@@ -40,6 +40,7 @@ my $trace = 0;
my $avg_delay_stats = 0;
my $gpu_timeline = 0;
my $colour_contexts = 0;
+my $no_timeline_scaling = 0;
my @args;
@@ -281,6 +282,18 @@ sub arg_colour_contexts
return @_;
}
+sub arg_no_timeline_scaling
+{
+ return unless scalar(@_);
+
+ if ($_[0] eq '--no-timeline-scaling') {
+ shift @_;
+ $no_timeline_scaling = 1;
+ }
+
+ return @_;
+}
+
@args = @ARGV;
while (@args) {
my $left = scalar(@args);
@@ -296,6 +309,7 @@ while (@args) {
@args = arg_ignore_ring(@args);
@args = arg_skip_box(@args);
@args = arg_colour_contexts(@args);
+ @args = arg_no_timeline_scaling(@args);
last if $left == scalar(@args);
}
@@ -334,6 +348,8 @@ sub ts
my ($us) = @_;
my ($y, $mo, $d, $h, $m, $s);
+ $us *= 1000 unless $no_timeline_scaling;
+
$s = int($us / 1000000);
$us = $us % 1000000;
@@ -1001,11 +1017,28 @@ print <<ENDHTML;
]);
var last_major_ms;
+ENDHTML
+
+if ($html) {
+ if ($no_timeline_scaling) {
+ say " timeDiv = 1;";
+ } else {
+ say " timeDiv = 1000;";
+ }
+}
+print <<ENDHTML;
function majorAxis(date, scale, step) {
- var s = date / 1000;
+ var s = date / 1000 / timeDiv;
+
+ last_major_ms = date / timeDiv;
- last_major_ms = date;
+ if (timeDiv == 1000) {
+ if (scale == 'second')
+ scale = 'millisecond';
+ else if (scale == 'minute')
+ scale = 'second'
+ }
if (scale == 'millisecond')
return s.toFixed(6) + "s";
@@ -1016,13 +1049,20 @@ print <<ENDHTML;
}
function minorAxis(date, scale, step) {
- var ms = date;
+ var ms = date / timeDiv;
ms -= last_major_ms;
if (ms < 0)
return '';
+ if (timeDiv > 1) {
+ if (scale == 'second')
+ scale = 'millisecond';
+ else if (scale == 'minute')
+ scale = 'second';
+ }
+
if (scale == 'millisecond')
return "+" + ms.toFixed(3) + "ms";
else if (scale == 'second')
--
2.17.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 3+ messages in thread* [igt-dev] [PATCH i-g-t v3 2/9] trace.pl: Scale timeline for better precision
2018-07-12 10:59 [igt-dev] [PATCH i-g-t " Tvrtko Ursulin
@ 2018-07-13 10:02 ` Tvrtko Ursulin
2018-07-16 18:15 ` John Harrison
0 siblings, 1 reply; 3+ messages in thread
From: Tvrtko Ursulin @ 2018-07-13 10:02 UTC (permalink / raw)
To: igt-dev; +Cc: intel-gfx, Tvrtko Ursulin
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
vis library has a limited precision compared to our trace data which
prevents zooming into the timeline and seeing the fine detail.
Scale the HTML view by a thousand to work around it.
v2: Rebase for time axis changes.
v3: Another tweak for time axis changes.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Suggested-by: John Harrison <John.C.Harrison@Intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: John Harrison <John.C.Harrison@Intel.com> # v2
---
scripts/trace.pl | 54 ++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 50 insertions(+), 4 deletions(-)
diff --git a/scripts/trace.pl b/scripts/trace.pl
index 41f10749a153..4b5f4ef77aef 100755
--- a/scripts/trace.pl
+++ b/scripts/trace.pl
@@ -40,6 +40,7 @@ my $trace = 0;
my $avg_delay_stats = 0;
my $gpu_timeline = 0;
my $colour_contexts = 0;
+my $no_timeline_scaling = 0;
my @args;
@@ -281,6 +282,18 @@ sub arg_colour_contexts
return @_;
}
+sub arg_no_timeline_scaling
+{
+ return unless scalar(@_);
+
+ if ($_[0] eq '--no-timeline-scaling') {
+ shift @_;
+ $no_timeline_scaling = 1;
+ }
+
+ return @_;
+}
+
@args = @ARGV;
while (@args) {
my $left = scalar(@args);
@@ -296,6 +309,7 @@ while (@args) {
@args = arg_ignore_ring(@args);
@args = arg_skip_box(@args);
@args = arg_colour_contexts(@args);
+ @args = arg_no_timeline_scaling(@args);
last if $left == scalar(@args);
}
@@ -334,6 +348,8 @@ sub ts
my ($us) = @_;
my ($y, $mo, $d, $h, $m, $s);
+ $us *= 1000 unless $no_timeline_scaling;
+
$s = int($us / 1000000);
$us = $us % 1000000;
@@ -999,11 +1015,28 @@ $first_ts = ts($first_ts);
print <<ENDHTML;
]);
+ENDHTML
+if ($html) {
+ if ($no_timeline_scaling) {
+ say " timeDiv = 1;";
+ } else {
+ say " timeDiv = 1000;";
+ }
+}
+
+print <<ENDHTML;
function majorAxis(date, scale, step) {
- var s = date / 1000;
+ var s = date / 1000 / timeDiv;
var precision;
+ if (timeDiv == 1000) {
+ if (scale == 'second')
+ scale = 'millisecond';
+ else if (scale == 'minute')
+ scale = 'second'
+ }
+
if (scale == 'millisecond')
precision = 6;
else if (scale == 'second')
@@ -1015,14 +1048,27 @@ print <<ENDHTML;
}
function minorAxis(date, scale, step) {
- var ms = date;
+ var ms = date / timeDiv;
+ var orig_scale = scale;
var precision;
var unit;
+ if (timeDiv == 1000) {
+ if (scale == 'second')
+ scale = 'millisecond';
+ else if (scale == 'minute')
+ scale = 'second'
+ }
+
if (scale == 'millisecond') {
- ms %= 1000;
precision = 0;
- unit = 'ms';
+ if (orig_scale == 'millisecond' && step <= 200) {
+ ms = date % 1000;
+ unit = 'us';
+ } else {
+ ms %= 1000;
+ unit = 'ms';
+ }
} else if (scale == 'second') {
ms /= 1000;
precision = 1;
--
2.17.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [igt-dev] [PATCH i-g-t v3 2/9] trace.pl: Scale timeline for better precision
2018-07-13 10:02 ` [igt-dev] [PATCH i-g-t v3 " Tvrtko Ursulin
@ 2018-07-16 18:15 ` John Harrison
0 siblings, 0 replies; 3+ messages in thread
From: John Harrison @ 2018-07-16 18:15 UTC (permalink / raw)
To: Tvrtko Ursulin, igt-dev; +Cc: intel-gfx, Tvrtko Ursulin
[-- Attachment #1.1: Type: text/plain, Size: 3206 bytes --]
On 7/13/2018 3:02 AM, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> vis library has a limited precision compared to our trace data which
> prevents zooming into the timeline and seeing the fine detail.
>
> Scale the HTML view by a thousand to work around it.
>
> v2: Rebase for time axis changes.
> v3: Another tweak for time axis changes.
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Suggested-by: John Harrison <John.C.Harrison@Intel.com>
> Cc: John Harrison <John.C.Harrison@Intel.com>
> Reviewed-by: John Harrison <John.C.Harrison@Intel.com> # v2
> ---
> scripts/trace.pl | 54 ++++++++++++++++++++++++++++++++++++++++++++----
> 1 file changed, 50 insertions(+), 4 deletions(-)
>
> diff --git a/scripts/trace.pl b/scripts/trace.pl
> index 41f10749a153..4b5f4ef77aef 100755
> --- a/scripts/trace.pl
> +++ b/scripts/trace.pl
> @@ -40,6 +40,7 @@ my $trace = 0;
> my $avg_delay_stats = 0;
> my $gpu_timeline = 0;
> my $colour_contexts = 0;
> +my $no_timeline_scaling = 0;
>
> my @args;
>
> @@ -281,6 +282,18 @@ sub arg_colour_contexts
> return @_;
> }
>
> +sub arg_no_timeline_scaling
> +{
> + return unless scalar(@_);
> +
> + if ($_[0] eq '--no-timeline-scaling') {
> + shift @_;
> + $no_timeline_scaling = 1;
> + }
> +
> + return @_;
> +}
> +
> @args = @ARGV;
> while (@args) {
> my $left = scalar(@args);
> @@ -296,6 +309,7 @@ while (@args) {
> @args = arg_ignore_ring(@args);
> @args = arg_skip_box(@args);
> @args = arg_colour_contexts(@args);
> + @args = arg_no_timeline_scaling(@args);
>
> last if $left == scalar(@args);
> }
> @@ -334,6 +348,8 @@ sub ts
> my ($us) = @_;
> my ($y, $mo, $d, $h, $m, $s);
>
> + $us *= 1000 unless $no_timeline_scaling;
> +
> $s = int($us / 1000000);
> $us = $us % 1000000;
>
> @@ -999,11 +1015,28 @@ $first_ts = ts($first_ts);
>
> print <<ENDHTML;
> ]);
> +ENDHTML
>
> +if ($html) {
> + if ($no_timeline_scaling) {
> + say " timeDiv = 1;";
> + } else {
> + say " timeDiv = 1000;";
> + }
> +}
> +
> +print <<ENDHTML;
> function majorAxis(date, scale, step) {
> - var s = date / 1000;
> + var s = date / 1000 / timeDiv;
> var precision;
>
> + if (timeDiv == 1000) {
> + if (scale == 'second')
> + scale = 'millisecond';
> + else if (scale == 'minute')
> + scale = 'second'
> + }
> +
> if (scale == 'millisecond')
> precision = 6;
> else if (scale == 'second')
> @@ -1015,14 +1048,27 @@ print <<ENDHTML;
> }
>
> function minorAxis(date, scale, step) {
> - var ms = date;
> + var ms = date / timeDiv;
> + var orig_scale = scale;
> var precision;
> var unit;
>
> + if (timeDiv == 1000) {
> + if (scale == 'second')
> + scale = 'millisecond';
> + else if (scale == 'minute')
> + scale = 'second'
> + }
> +
> if (scale == 'millisecond') {
> - ms %= 1000;
> precision = 0;
> - unit = 'ms';
> + if (orig_scale == 'millisecond' && step <= 200) {
> + ms = date % 1000;
> + unit = 'us';
> + } else {
> + ms %= 1000;
> + unit = 'ms';
> + }
> } else if (scale == 'second') {
> ms /= 1000;
> precision = 1;
Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
[-- Attachment #1.2: Type: text/html, Size: 4162 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-07-16 18:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <0180712105958.12953-3-tvrtko.ursulin@linux.intel.com>
2018-07-13 9:56 ` [igt-dev] [PATCH i-g-t v3 2/9] trace.pl: Scale timeline for better precision Tvrtko Ursulin
2018-07-12 10:59 [igt-dev] [PATCH i-g-t " Tvrtko Ursulin
2018-07-13 10:02 ` [igt-dev] [PATCH i-g-t v3 " Tvrtko Ursulin
2018-07-16 18:15 ` John Harrison
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).