From patchwork Thu May 10 10:19:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 10391607 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 1AC2B6053D for ; Thu, 10 May 2018 10:20:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0BEAB2890F for ; Thu, 10 May 2018 10:20:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 00C2B289C6; Thu, 10 May 2018 10:20:28 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 B109F289C5 for ; Thu, 10 May 2018 10:20:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 533876EEEA; Thu, 10 May 2018 10:20:00 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wr0-x242.google.com (mail-wr0-x242.google.com [IPv6:2a00:1450:400c:c0c::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id C63726EED8 for ; Thu, 10 May 2018 10:19:54 +0000 (UTC) Received: by mail-wr0-x242.google.com with SMTP id i14-v6so1456344wre.2 for ; Thu, 10 May 2018 03:19:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=j1Yj8C0MGlgAMDf9t5coiKLnULBGpS4PTvylQzLHfSc=; b=MC9tvrwRtAxMBtmudVDRLI6JexZGG/lTPD5fz6e0y+LlzCgMPL2LoWg09B7O0unY5y oDfQ0EgA7kU1+hiikySGPoi5t0Vg+iIvLz4IcrC9nPhm7m/n66NCauYrqHsyPIj9vk0J GmLq9fNBj3amiWoaCb7Dwpc9EX6wNt/WmG6ruH/ZLu6dy2t8SbrcylG0qOKOo1m2ye07 ozYnESonr6prR1pv5ru57OTgzUFK1IxGKJWj4N3KiEodmiOGAZPutw3UUNVe/TBc0sLx +f7C5kJ7IB6cSWhrOG4uJe2JcCvmePGs5iefLP/CLlXfAxRkl0bzpVdjEAsLJDRFJnOo /plw== 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=j1Yj8C0MGlgAMDf9t5coiKLnULBGpS4PTvylQzLHfSc=; b=LOphV5IMtNq6ia96DspgVTE0cThO6Yx/erdXeRKkNIV74pnxV/8pRUkAoM73lycUgp 5K1LG6Sq5DXhq7vVOQniwpLE5BZT12YWWbBCTiHZAxv8kUgZc4ej14OGGsxkTP9HruZq lv53KFKonbHMOns9k6plTpSdCa89WLWzt8q1XVf9UPrTx/9oUuEFMMfqX7L/Bj+ta59D rPhrwYHaZTVn9ohpf32Zp3gFxKREd6NSnhskr7iimULhSS+SbeDgExsKzNP/sLV04xju U/0/enofp75JOzEz3QGATJPDMIMrsbkQurXjbNqrFiL8OiLgw+w+yDUE8cwlnruBmnpV 7DTw== X-Gm-Message-State: ALKqPwezBrBCoOh1UJTMProhvaY6oxK3XpgP/mUjzstzCRtVWNXLsU4D szze8EY3OPFWEbnLIe3MVI7SdQ== X-Google-Smtp-Source: AB8JxZouEyJmhmrqBYJn1ZyWEcB3CJrZT7POV9je15i7wf/R6fYRCEZyQLS/yVPQ9qC7IsxLOUl6rg== X-Received: by 2002:adf:b190:: with SMTP id q16-v6mr743131wra.221.1525947593463; Thu, 10 May 2018 03:19:53 -0700 (PDT) Received: from localhost.localdomain ([95.146.151.144]) by smtp.gmail.com with ESMTPSA id o53-v6sm1178774wrc.96.2018.05.10.03.19.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 May 2018 03:19:53 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: igt-dev@lists.freedesktop.org Date: Thu, 10 May 2018 11:19:18 +0100 Message-Id: <20180510101924.20814-3-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180510101924.20814-1-tvrtko.ursulin@linux.intel.com> References: <20180510101924.20814-1-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [PATCH i-g-t 3/9] trace.pl: Remove context squashing option 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 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 --- 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 {