From patchwork Mon Jul 9 13:19:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 10514573 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7A80D6032C for ; Mon, 9 Jul 2018 13:20:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 659A02894E for ; Mon, 9 Jul 2018 13:20:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 59AFD28AFA; Mon, 9 Jul 2018 13:20:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EC9D32894E for ; Mon, 9 Jul 2018 13:20:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BB5966E2F9; Mon, 9 Jul 2018 13:20:16 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id DF2DE6E174 for ; Mon, 9 Jul 2018 13:20:14 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id s13-v6so10013624wmc.1 for ; Mon, 09 Jul 2018 06:20:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vDvPAObIzThnSGlKH+8wf7B+HdDLZ9k2xZ7m2LCcuaY=; b=eFfGHXXBGc4mlPTUQRlZqkUqiqRiyJjagwfGw0iTi06sNTSlg2z5SSVSVseXR0UTmD Jug69tFC3pXBufeHWB8jey3yuf9D0n5bFO/g0vSpobS1kZYeddraeTl4DIO87jn53D8E 6scK098+2cf6CrWMgUpNh+S9Mdxr/BKUE7Gq2kkJdoHxBXgT/hf/lNmk6+EYnlbzsW41 SpsmoR8g1sCILW/dcRSKCcW+pgl0jlixpYSJYJDsSP3Q0yT9Qvx+toSqxetdZUBDpezU i94NQJLgnE+WBiwDn4Cmv4OkU7C/VHXzmyySauWOrO5aVcnpvpMV5kvb17p8P/Bzsssb 6KbQ== X-Gm-Message-State: APt69E0pRD7q/VAGkj1c0antzqKbSSrCzIWmnOVm1RjZ7ouDwGP4PSzN TebnoWOwQONrbtAzntnL9xrn5w== X-Google-Smtp-Source: AAOMgpcLswJ9sFcYFLZZO7QuXqdFPKlHMAKpRs0Rg4Ci+/6jj8UnlLgx9ffxiMQAqCT9b3KCAA6v4w== X-Received: by 2002:a1c:e041:: with SMTP id x62-v6mr11436495wmg.155.1531142413395; Mon, 09 Jul 2018 06:20:13 -0700 (PDT) Received: from localhost.localdomain ([95.146.151.144]) by smtp.gmail.com with ESMTPSA id l10-v6sm21585637wrv.23.2018.07.09.06.20.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Jul 2018 06:20:12 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: igt-dev@lists.freedesktop.org Date: Mon, 9 Jul 2018 14:19:57 +0100 Message-Id: <20180709132004.14468-5-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180709132004.14468-1-tvrtko.ursulin@linux.intel.com> References: <20180709132004.14468-1-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [PATCH i-g-t 04/11] trace.pl: Put single context at single vertical slot X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin 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(-) diff --git a/scripts/trace.pl b/scripts/trace.pl index 4d3e06434f05..e2978e5382c2 100755 --- a/scripts/trace.pl +++ b/scripts/trace.pl @@ -768,9 +768,6 @@ print < - - -

Timeline request view: @@ -997,6 +994,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; @@ -1007,7 +1005,7 @@ foreach my $key (sort sortQueue keys %db) { $style = box_style($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++; } @@ -1017,7 +1015,7 @@ foreach my $key (sort sortQueue keys %db) { $style = box_style($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++; } @@ -1033,7 +1031,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++; } @@ -1047,7 +1045,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++; } @@ -1090,29 +1088,18 @@ $first_ts = ts($first_ts); print <