From patchwork Tue Mar 6 12:43:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 10261573 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 496A260596 for ; Tue, 6 Mar 2018 12:43:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38F0528A57 for ; Tue, 6 Mar 2018 12:43:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2DAB328E43; Tue, 6 Mar 2018 12:43:31 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, 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 CAFFB28A57 for ; Tue, 6 Mar 2018 12:43:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 79F136E6B0; Tue, 6 Mar 2018 12:43:29 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 942866E6A1 for ; Tue, 6 Mar 2018 12:43:27 +0000 (UTC) Received: by mail-wr0-x241.google.com with SMTP id u49so20768959wrc.10 for ; Tue, 06 Mar 2018 04:43:27 -0800 (PST) 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=r+BIDlTvWlGS8xkBir/Mybu+sRuaBhRP6VDOFxjPthQ=; b=p0Vjvqn4gNKAhyldgKwMqHFGJpIXhhzq5s21ggsbTB72aH1o2JrOIskPx1Yrzjz1YK lDeb7Vzrfr7daOJyR/9ijFu2InVmFRCq5Uptmyd6TQx/aJ3Ir/UZVadRX142a7rNXc9F i00fPeWyQ7XBeHpXwJ3V3QMjgjYr51zUvAmjjY/C4Y7MYIRWg0xmRagGBlQ0aIHDTk+g LmKwqfo00eyTFKMiheFMEHq104CUF7pyTVIPYG4c8CSNTsNN/eIw6LQ+Khsd4s7kWjvG RWuOygD2uiNJ7fBqCHihq19iDr0KRveXItAooL8cA0OrP9+q9Nrkx+fEvvPE5HBf/gmw 8z+A== 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=r+BIDlTvWlGS8xkBir/Mybu+sRuaBhRP6VDOFxjPthQ=; b=n8p87pPIfk08RuhTghZVJwcluACONJdFALiJRSMw5Tdx/BDoLlSDeZpD5Ui8cGej1q s3RhANP+yMbBHaaj+C2ZKjHfgNmKPmOJR2hydUVxE7jDIE2/U+LfM9NGs7uq/WbdC+E5 qVCkIMsVe8At+CStVd2i8qQdJhU0Pjv5qEQeHKCUHivX8n59sboJ/8PtUuZnpc7hgdnI UeaQUc4/9VeCNdaECluJt2qrJXaHpbiLM474jOfGDMkUCaZChQUCU01lB0d8GByP/Ls8 siW2sumoLiOfiHKiZxp6Rljy3PQ+U/pI/IJZSG55HRIqTRvOaeXHQaiYiH2UUUSpVPWX mf3w== X-Gm-Message-State: APf1xPDVQjB0xOclkF9jTCd2hk/mILolSSaGU/d2ONVaL0PBCV+C/F7f TZE5zpdw7VmrireoW78V5kVABr0P X-Google-Smtp-Source: AG47ELuQy7oY3RUqE0x6aS4+eWwZ91e5YP0EvU81419dWb0S4kP+7WdIROhWoqrwHZ4Ltg0dQYy7nQ== X-Received: by 10.223.150.148 with SMTP id u20mr14660371wrb.276.1520340206229; Tue, 06 Mar 2018 04:43:26 -0800 (PST) Received: from localhost.localdomain ([95.146.144.186]) by smtp.gmail.com with ESMTPSA id v8sm3646560wmh.25.2018.03.06.04.43.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Mar 2018 04:43:25 -0800 (PST) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: igt-dev@lists.freedesktop.org Date: Tue, 6 Mar 2018 12:43:05 +0000 Message-Id: <20180306124315.30208-2-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180306124315.30208-1-tvrtko.ursulin@linux.intel.com> References: <20180306124315.30208-1-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [PATCH i-g-t 01/11] trace.pl: Catch-up with tracepoint renames 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 i915 renamed the request related tracepoints so catch up with that. Signed-off-by: Tvrtko Ursulin --- scripts/trace.pl | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/scripts/trace.pl b/scripts/trace.pl index cb93900dd620..d6686833b3e9 100755 --- a/scripts/trace.pl +++ b/scripts/trace.pl @@ -62,13 +62,13 @@ Notes: The above will invoke perf record, or alternatively it can be done directly: perf record -a -c 1 -e i915:intel_gpu_freq_change, \ - i915:i915_gem_request_add, \ - i915:i915_gem_request_submit, \ - i915:i915_gem_request_in, \ - i915:i915_gem_request_out, \ + i915:i915_request_add, \ + i915:i915_request_submit, \ + i915:i915_request_in, \ + i915:i915_request_out, \ i915:intel_engine_notify, \ - i915:i915_gem_request_wait_begin, \ - i915:i915_gem_request_wait_end \ + i915:i915_request_wait_begin, \ + i915:i915_request_wait_end \ [command-to-be-profiled] Then create the log file with: @@ -169,13 +169,13 @@ sub arg_gpu_timeline sub arg_trace { my @events = ( 'i915:intel_gpu_freq_change', - 'i915:i915_gem_request_add', - 'i915:i915_gem_request_submit', - 'i915:i915_gem_request_in', - 'i915:i915_gem_request_out', + 'i915:i915_request_add', + 'i915:i915_request_submit', + 'i915:i915_request_in', + 'i915:i915_request_out', 'i915:intel_engine_notify', - 'i915:i915_gem_request_wait_begin', - 'i915:i915_gem_request_wait_end' ); + 'i915:i915_request_wait_begin', + 'i915:i915_request_wait_end' ); return unless scalar(@_); @@ -394,7 +394,7 @@ while (<>) { } } - if ($tp_name eq 'i915:i915_gem_request_wait_begin:') { + if ($tp_name eq 'i915:i915_request_wait_begin:') { my %rw; next if exists $reqwait{$key}; @@ -405,11 +405,11 @@ while (<>) { $rw{'ctx'} = $ctx; $rw{'start'} = $time; $reqwait{$key} = \%rw; - } elsif ($tp_name eq 'i915:i915_gem_request_wait_end:') { + } elsif ($tp_name eq 'i915:i915_request_wait_end:') { next unless exists $reqwait{$key}; $reqwait{$key}->{'end'} = $time; - } elsif ($tp_name eq 'i915:i915_gem_request_add:') { + } elsif ($tp_name eq 'i915:i915_request_add:') { if (exists $queue{$key}) { $ctxdb{$orig_ctx}++; $ctx = sanitize_ctx($orig_ctx, $ring); @@ -417,12 +417,12 @@ while (<>) { } $queue{$key} = $time; - } elsif ($tp_name eq 'i915:i915_gem_request_submit:') { + } elsif ($tp_name eq 'i915:i915_request_submit:') { die if exists $submit{$key}; die unless exists $queue{$key}; $submit{$key} = $time; - } elsif ($tp_name eq 'i915:i915_gem_request_in:') { + } elsif ($tp_name eq 'i915:i915_request_in:') { my %req; die if exists $db{$key}; @@ -442,7 +442,7 @@ while (<>) { $rings{$ring} = $gid++ unless exists $rings{$ring}; $ringmap{$rings{$ring}} = $ring; $db{$key} = \%req; - } elsif ($tp_name eq 'i915:i915_gem_request_out:') { + } elsif ($tp_name eq 'i915:i915_request_out:') { my $gkey = global_key($ring, $tp{'global'}); die unless exists $db{$key};