From patchwork Tue Mar 6 14:04:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Agustin Vega-Frias X-Patchwork-Id: 10261789 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 32BE06037E for ; Tue, 6 Mar 2018 14:07:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20C9028FD7 for ; Tue, 6 Mar 2018 14:07:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1580F28FDD; Tue, 6 Mar 2018 14:07:02 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 82C0628FD9 for ; Tue, 6 Mar 2018 14:07:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=1j/cXTFE8XVCfzGOp7qoP1UdwCjJBk8hQBc0PuyhSn0=; b=Lj14X7xeiL+3qBZSTKOUXiFtaF ps/9xaH6p8iMVHl7rdLzP39EqBA0tfp5iYjig9Lvxlf/lA9M5u9FJFUN38AElqxJI3Iyk0+ftTFRm XGv/Njy92565Sc30AejuEcNjd1R2FhYnGyvbvznz/z5UB9hpEKJ71kNEGBYk4uKNEr/Mw48hIJTZt VPoOoRdxSl1S41TEKLXAe2F6NhCFPj7knMHyPDmlIlz8Wgwy1lNz1UW5viXkz63NEX0tCJcYtPsaT 4TTMOKL4D8LVtJgpyDWAQfuFaFxClilBzAclhOsO78KQW1G7NJJ43VKRlZCZIJVXze9lix9079UYD 7Cw37m8w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1etDEw-0002lF-Ie; Tue, 06 Mar 2018 14:06:50 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1etDDO-0000Mq-6v for linux-arm-kernel@lists.infradead.org; Tue, 06 Mar 2018 14:05:22 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id CB0F56053B; Tue, 6 Mar 2018 14:05:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1520345105; bh=qy3/IfNEuqyP2SNDwyimRm6z4J44Kj1ejcp7zTMHTjc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=grW6jOIUVk1J16Ud2KCb3O1rpMTjCjtoPj9a8lWic/OgAC+ltG9fbE6qnBfexP3Df QOmJw6+6ltOyDz3SV6yFyNB3LHSdkTUPR1CWqo9sjChWJtXsfl0Dy387rHNyAUEQ4w jscVnca64+1og5VhRwBKBXrRdiiNqvYimrGb3Ex4= Received: from ral-tools-sdp4.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: agustinv@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 05BD9600E6; Tue, 6 Mar 2018 14:05:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1520345104; bh=qy3/IfNEuqyP2SNDwyimRm6z4J44Kj1ejcp7zTMHTjc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pDEOIyAw5NvEe+fcmD49TqAN+SEMsToZ/U/ccBeAVq9dAaVsJBSK+2F4h5YsSkT22 +qNbwC4AAs/xiu7Xnc96syt/lGvCIpXevixERxq8xcsp/Ovp66eC3QrIESYrqYq8zC GuqRO+/IKmj3sUtAsLMaU83yeCqKfkHNcUmciMYQ= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 05BD9600E6 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=agustinv@codeaurora.org From: Agustin Vega-Frias To: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Andi Kleen , Alexander Shishkin , Jiri Olsa , Namhyung Kim Subject: [RFC V3 1/3] perf, tools: Support wildcards on pmu name in dynamic pmu events Date: Tue, 6 Mar 2018 09:04:42 -0500 Message-Id: <1520345084-42646-2-git-send-email-agustinv@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520345084-42646-1-git-send-email-agustinv@codeaurora.org> References: <1520345084-42646-1-git-send-email-agustinv@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180306_060514_384486_50B9BDA4 X-CRM114-Status: GOOD ( 18.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: timur@codeaurora.org, agustinv@codeaurora.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Starting on v4.12 event parsing code for dynamic pmu events already supports prefix-based matching of multiple pmus when creating dynamic events. E.g., in a system with the following dynamic pmus: mypmu_0 mypmu_1 mypmu_2 mypmu_4 passing mypmu// as an event spec will result in the creation of the event in all of the pmus. This change expands this matching through the use of fnmatch so glob-like expressions can be used to create events in multiple pmus. E.g., in the system described above if a user only wants to create the event in mypmu_0 and mypmu_1, mypmu_[01]// can be passed. Change-Id: Icb25653fc5d5239c20f3bffdfdf4ab4c9c9bb20b Signed-off-by: Agustin Vega-Frias --- tools/perf/Documentation/perf-list.txt | 8 +++++++- tools/perf/Documentation/perf-stat.txt | 13 +++++++++++++ tools/perf/util/parse-events.l | 2 +- tools/perf/util/parse-events.y | 19 ++++++++++++------- 4 files changed, 33 insertions(+), 9 deletions(-) diff --git a/tools/perf/Documentation/perf-list.txt b/tools/perf/Documentation/perf-list.txt index e2a897a..2549c34 100644 --- a/tools/perf/Documentation/perf-list.txt +++ b/tools/perf/Documentation/perf-list.txt @@ -141,7 +141,13 @@ on the first memory controller on socket 0 of a Intel Xeon system Each memory controller has its own PMU. Measuring the complete system bandwidth would require specifying all imc PMUs (see perf list output), -and adding the values together. +and adding the values together. To simplify creation of multiple events, +prefix and glob matching is supported in the PMU name, and the prefix +'uncore_' is also ignored when performing the match. So the command above +can be expanded to all memory controllers by using the syntaxes: + + perf stat -C 0 -a imc/cas_count_read/,imc/cas_count_write/ -I 1000 ... + perf stat -C 0 -a *imc*/cas_count_read/,*imc*/cas_count_write/ -I 1000 ... This example measures the combined core power every second diff --git a/tools/perf/Documentation/perf-stat.txt b/tools/perf/Documentation/perf-stat.txt index 823fce7..5ee954f 100644 --- a/tools/perf/Documentation/perf-stat.txt +++ b/tools/perf/Documentation/perf-stat.txt @@ -49,6 +49,13 @@ report:: parameters are defined by corresponding entries in /sys/bus/event_source/devices//format/* + Note that the last two syntaxes support prefix and glob matching in + the PMU name to simplify creation of events accross multiple instances + of the same type of PMU in large systems (e.g. memory controller PMUs). + Multiple PMU instances are typical for uncore PMUs, so the prefix + 'uncore_' is also ignored when performing this match. + + -i:: --no-inherit:: child tasks do not inherit counters @@ -246,6 +253,12 @@ taskset. --no-merge:: Do not merge results from same PMUs. +When multiple events are created from a single event alias, stat will, +by default, aggregate the event counts and show the result in a single +row. This option disables that behavior and shows the individual events +and counts. Aliases are listed immediately after the Kernel PMU events +by perf list. + --smi-cost:: Measure SMI cost if msr/aperf/ and msr/smi/ events are supported. diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l index 655ecff..a1a01b1 100644 --- a/tools/perf/util/parse-events.l +++ b/tools/perf/util/parse-events.l @@ -175,7 +175,7 @@ bpf_source [^,{}]+\.c[a-zA-Z0-9._]* num_dec [0-9]+ num_hex 0x[a-fA-F0-9]+ num_raw_hex [a-fA-F0-9]+ -name [a-zA-Z_*?][a-zA-Z0-9_*?.]* +name [a-zA-Z_*?\[\]][a-zA-Z0-9_*?.\[\]]* name_minus [a-zA-Z_*?][a-zA-Z0-9\-_*?.:]* drv_cfg_term [a-zA-Z0-9_\.]+(=[a-zA-Z0-9_*?\.:]+)? /* If you add a modifier you need to update check_modifier() */ diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index e81a20e..316ac07 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -8,6 +8,7 @@ #define YYDEBUG 1 +#include #include #include #include @@ -234,21 +235,25 @@ PE_NAME opt_event_config if (parse_events_add_pmu(_parse_state, list, $1, $2)) { struct perf_pmu *pmu = NULL; int ok = 0; + char *pattern; - while ((pmu = perf_pmu__scan(pmu)) != NULL) { - char *name = pmu->name; + if (asprintf(&pattern, "?(uncore_)%s*", $1) < 0) + YYABORT; - if (!strncmp(name, "uncore_", 7) && - strncmp($1, "uncore_", 7)) - name += 7; - if (!strncmp($1, name, strlen($1))) { - if (parse_events_copy_term_list(orig_terms, &terms)) + while ((pmu = perf_pmu__scan(pmu)) != NULL) { + if (!fnmatch(pattern, pmu->name, FNM_EXTMATCH)) { + if (parse_events_copy_term_list(orig_terms, &terms)) { + free(pattern); YYABORT; + } if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms)) ok++; parse_events_terms__delete(terms); } } + + free(pattern); + if (!ok) YYABORT; }