diff mbox series

[i-g-t,05/27] trace.pl: Virtual engine preemption support

Message ID	20190520144739.13111-6-tvrtko.ursulin@linux.intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <intel-gfx-bounces@lists.freedesktop.org> From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> To: igt-dev@lists.freedesktop.org Date: Mon, 20 May 2019 15:47:17 +0100 Message-Id: <20190520144739.13111-6-tvrtko.ursulin@linux.intel.com> In-Reply-To: <20190520144739.13111-1-tvrtko.ursulin@linux.intel.com> References: <20190520144739.13111-1-tvrtko.ursulin@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t 05/27] trace.pl: Virtual engine preemption support Precedence: list Cc: Intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
Series	Media scalability tooling \| expand [i-g-t,00/27] Media scalability tooling [i-g-t,01/27] scripts/trace.pl: Fix after intel_engine_notify removal [i-g-t,02/27] trace.pl: Ignore signaling on non i915 fences [i-g-t,03/27] headers: bump [i-g-t,04/27] trace.pl: Virtual engine support [i-g-t,05/27] trace.pl: Virtual engine preemption support [i-g-t,06/27] wsim/media-bench: i915 balancing [i-g-t,07/27] gem_wsim: Use IGT uapi headers [i-g-t,08/27] gem_wsim: Factor out common error handling [i-g-t,09/27] gem_wsim: More wsim_err [i-g-t,10/27] gem_wsim: Submit fence support [i-g-t,11/27] gem_wsim: Extract str to engine lookup [i-g-t,12/27] gem_wsim: Engine map support [i-g-t,13/27] gem_wsim: Save some lines by changing to implicit NULL checking [i-g-t,14/27] gem_wsim: Compact int command parsing with a macro [i-g-t,15/27] gem_wsim: Engine map load balance command [i-g-t,16/27] gem_wsim: Engine bond command [i-g-t,17/27] gem_wsim: Some more example workloads [i-g-t,18/27] gem_wsim: Infinite batch support [i-g-t,19/27] gem_wsim: Command line switch for specifying low slice count workloads [i-g-t,20/27] gem_wsim: Per context SSEU control [i-g-t,21/27] gem_wsim: Allow RCS virtual engine with SSEU control [i-g-t,22/27] tests/i915_query: Engine discovery tests [i-g-t,23/27] gem_wsim: Consolidate engine assignments into helpers [i-g-t,24/27] gem_wsim: Discover engines [i-g-t,25/27] gem_wsim: Support Icelake parts [i-g-t,26/27] gem_wsim: Fix prng usage [i-g-t,27/27] gem_wsim: Allow random seed control

Commit Message

Tvrtko Ursulin May 20, 2019, 2:47 p.m. UTC

From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Use the 'completed?' tracepoint field to detect more robustly when a
request has been preempted and remove it from the engine database if so.

Otherwise the script can hit a scenario where the same global seqno will
be mentioned multiple times (on an engine seqno) which aborts processing.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 scripts/trace.pl | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff mbox series

Patch

diff --git a/scripts/trace.pl b/scripts/trace.pl
index 1f4953b02ef6..77587f24197a 100755
--- a/scripts/trace.pl
+++ b/scripts/trace.pl
@@ -488,16 +488,21 @@  while (<>) {
 		$ringmap{$rings{$ring}} = $ring;
 		$db{$key} = \%req;
 	} elsif ($tp_name eq 'i915:i915_request_out:') {
-		my $nkey;
+		if ($tp{'completed?'}) {
+			my $nkey;
 
-		die unless exists $db{$key};
-		die unless exists $db{$key}->{'start'};
-		die if exists $db{$key}->{'end'};
+			die unless exists $db{$key};
+			die unless exists $db{$key}->{'start'};
+			die if exists $db{$key}->{'end'};
 
-		$nkey = notify_key($ctx, $seqno);
+			$nkey = notify_key($ctx, $seqno);
 
-		$db{$key}->{'end'} = $time;
-		$db{$key}->{'notify'} = $notify{$nkey} if exists $notify{$nkey};
+			$db{$key}->{'end'} = $time;
+			$db{$key}->{'notify'} = $notify{$nkey}
+						if exists $notify{$nkey};
+		} else {
+			delete $db{$key};
+		}
 	} elsif ($tp_name eq 'dma_fence:dma_fence_signaled:') {
 		my $nkey;