From patchwork Tue May 8 17:31:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 10386683 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 5BE26602C2 for ; Tue, 8 May 2018 17:31:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 47ED228F83 for ; Tue, 8 May 2018 17:31:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C7FA28F98; Tue, 8 May 2018 17:31:49 +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 DFBBB28F83 for ; Tue, 8 May 2018 17:31:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 65F776EB0B; Tue, 8 May 2018 17:31:46 +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 840E36EB07 for ; Tue, 8 May 2018 17:31:43 +0000 (UTC) Received: by mail-wr0-x242.google.com with SMTP id i14-v6so29956412wre.2 for ; Tue, 08 May 2018 10:31:43 -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=1Ux28CRFuXPkhgSiopCQTBVRhrb4NUBSyWCOizKySnAhT1sWtyi4C+DP8jKSoE18VD sdv+CwkS1yVx4JHl+Cz3efAtcKjBcvAU5XeWCn+YdJLcr2P7UuWxVVypxKS2PbngLMlV +AmncR4tgT4+QSMeZJQ1tn9f2TisB0520UzJRwp2ExOHyX2RthBCI8Uk/7ItZjkqeq+3 Jv1iJ3aMMDNTwEep5bIHPUHeN/ElJcFqLsh9uvoQj/2xvUrz4tF9sYHXlaB1crVgxG4j PmVxjEJxaZ3w5+6emdxWkDkFsFkwg/9dD/qebcI5HZGMqd4C0RzOdXhnLGiMVry2/kEn 0lUw== 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=JNO2mCEfIOe+Y4RucWWo2mhJwiYNPBiA1dXFVkZjL6qfhI+ULx96J1OArH6y/bI/q9 bhIFEOxKxnd265+jYP0K7/B1RYbNBSQXb1HcC/4qIODH3W2m0X8k1FVItmiweHZ6DaJz 3hK16CaNRGeakOUgg23lCvAhktWXANW2O0tVSJ6D/CBO+x7Pl/4MhbHcTD3KIWoOjLNW CvO1G5XUwua4u1CjNfJ3XffOmQBVfZQAzREnp8dsdaa1fMCIvYvzjmUcsbtWHdfWp0kD FHqTRzoOPP+kAJJcBp+31k7z9dltn6eFBxGla+zIwn07CpTayHiV0ujclwf3qjUNSizb +k9Q== X-Gm-Message-State: ALQs6tAvJy7Yi+b1t4Ht4hX7C7ierveUStmsA9OtKafQyEquDNh7p+w4 tZJ+wVcTtMWK+BYR6T5pr396NzGe X-Google-Smtp-Source: AB8JxZryeBDIz5lBfHR9dHPHBr7rJF00ifyD0fZ58wqZus/TWyX2RuyZssl8GoMyhLEeS3AbVBQTRw== X-Received: by 2002:adf:ca12:: with SMTP id o18-v6mr30243594wrh.272.1525800702234; Tue, 08 May 2018 10:31:42 -0700 (PDT) Received: from localhost.localdomain ([95.146.151.144]) by smtp.gmail.com with ESMTPSA id n4sm15373101wmg.29.2018.05.08.10.31.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 May 2018 10:31:41 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: igt-dev@lists.freedesktop.org Date: Tue, 8 May 2018 18:31:11 +0100 Message-Id: <20180508173115.24550-3-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180508173115.24550-1-tvrtko.ursulin@linux.intel.com> References: <20180508173115.24550-1-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [PATCH i-g-t 3/7] 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 {