From: Kim Phillips Subject: [PATCH 5/5] perf list: specify metrics are to be used with -M Date: Thu, 19 Sep 2019 15:43:06 -0500 Message-ID: <20190919204306.12598-5-kim.phillips@amd.com> References: <20190919204306.12598-1-kim.phillips@amd.com> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20190919204306.12598-1-kim.phillips@amd.com> Sender: linux-kernel-owner@vger.kernel.org To: Arnaldo Carvalho de Melo Cc: kim.phillips@amd.com, Janakarajan Natarajan , Peter Zijlstra , Ingo Molnar , Alexander Shishkin , Andi Kleen , Jiri Olsa , Namhyung Kim , Borislav Petkov , Martin Liska , Luke Mujica , Jin Yao , Kan Liang , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org List-Id: linux-perf-users.vger.kernel.org Output of 'perf list metrics' before: $ perf list metrics List of pre-defined events (to be used in -e): Metrics: C2_Pkg_Residency [C2 residency percent per package] ... This misleads the uninitiated user to try: $ perf stat -e C2_Pkg_Residency which gets: event syntax error: 'C2_Pkg_Residency' \___ parser error Run 'perf list' for a list of valid events Explicitly clarify that metrics and metricgroups are meant to be used with -M, and correct the grammar for the -e equivalent statement. Output of 'perf list metrics' after: $ perf list metrics List of pre-defined events (to be used with -e): Metrics (to be used with -M): C2_Pkg_Residency [C2 residency percent per package] ... Signed-off-by: Kim Phillips Cc: Janakarajan Natarajan Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo Cc: Alexander Shishkin Cc: Andi Kleen Cc: Jiri Olsa Cc: Namhyung Kim Cc: Borislav Petkov Cc: Martin Liska Cc: Luke Mujica Cc: Jin Yao Cc: Kan Liang Cc: linux-kernel@vger.kernel.org Cc: linux-perf-users@vger.kernel.org --- tools/perf/builtin-list.c | 2 +- tools/perf/util/metricgroup.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c index 08e62ae9d37e..be8e878aa556 100644 --- a/tools/perf/builtin-list.c +++ b/tools/perf/builtin-list.c @@ -51,7 +51,7 @@ int cmd_list(int argc, const char **argv) setup_pager(); if (!raw_dump && pager_in_use()) - printf("\nList of pre-defined events (to be used in -e):\n\n"); + printf("\nList of pre-defined events (to be used with -e):\n\n"); if (argc == 0) { print_events(NULL, raw_dump, !desc_flag, long_desc_flag, diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index a7c0424dbda3..f116848be9f7 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -377,9 +377,10 @@ void metricgroup__print(bool metrics, bool metricgroups, char *filter, } if (metricgroups && !raw) - printf("\nMetric Groups:\n\n"); + printf("\nMetric Groups"); else if (metrics && !raw) - printf("\nMetrics:\n\n"); + printf("\nMetrics"); + printf(" (to be used with -M):\n\n"); for (node = rb_first_cached(&groups.entries); node; node = next) { struct mep *me = container_of(node, struct mep, nd); -- 2.23.0