[PATCH 11/11] perf, tools: Add a --no-desc flag to perf list
From: Andi Kleen
Add a --no-desc flag to perf list to not print the event descriptions
that were earlier added for JSON events. This may be useful to
get a less crowded listing.
It's still default to print descriptions as that is the more useful
default for most users.
Before:
% perf list
...
baclears.any [Counts the total number
when the front end is
resteered, mainly when
the BPU cannot provide a
correct prediction and
this is corrected by other
branch handling
mechanisms at the front end]
br_inst_exec.all_branches [Speculative and retired
branches]
After:
% perf list --no-desc
...
baclears.any [Kernel PMU event]
br_inst_exec.all_branches [Kernel PMU event]
v2: Rename --quiet to --no-desc. Add option to man page.
Signed-off-by: Andi Kleen
---
tools/perf/Documentation/perf-list.txt | 5 -
tools/perf/builtin-list.c | 14 +-
tools/perf/util/parse-events.c | 4 ++--
tools/perf/util/parse-events.h | 2 +-
tools/perf/util/pmu.c | 4 ++--
tools/perf/util/pmu.h | 2 +-
6 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/tools/perf/Documentation/perf-list.txt
b/tools/perf/Documentation/perf-list.txt
index d241b5c..7a6b25d 100644
--- a/tools/perf/Documentation/perf-list.txt
+++ b/tools/perf/Documentation/perf-list.txt
@@ -8,7 +8,7 @@ perf-list - List all symbolic event types
SYNOPSIS
[verse]
-'perf list' [hw|sw|cache|tracepoint|pmu|event_glob]
+'perf list' [--no-desc] [hw|sw|cache|tracepoint|pmu|event_glob]
DESCRIPTION
---
@@ -23,6 +23,9 @@ automatically downloaded with perf download.
The JSON event file can be also specified with the EVENTMAP environment
variable.
+--no-desc::
+Don't print descriptions.
+
[[EVENT_MODIFIERS]] EVENT MODIFIERS
---
diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c
index 086c96f..68752a1 100644
--- a/tools/perf/builtin-list.c
+++ b/tools/perf/builtin-list.c
@@ -16,16 +16,20 @@
#include "util/pmu.h"
#include "util/parse-options.h"
+static bool desc_flag = true;
+
int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
{
int i;
const struct option list_options[] = {
OPT_STRING(0, "events-file", _file, "json file",
"Read event json file"),
+ OPT_BOOLEAN('d', "desc", _flag,
+ "Print extra event descriptions. --no-desc to not
print."),
OPT_END()
};
const char * const list_usage[] = {
- "perf list [hw|sw|cache|tracepoint|pmu|event_glob]",
+ "perf list [--events-file FILE] [--no-desc]
[hw|sw|cache|tracepoint|pmu|event_glob]",
NULL
};
@@ -35,7 +39,7 @@ int cmd_list(int argc, const char **argv, const char *prefix
__maybe_unused)
setup_pager();
if (argc == 0) {
- print_events(NULL, false);
+ print_events(NULL, false, !desc_flag);
return 0;
}
@@ -54,15 +58,15 @@ int cmd_list(int argc, const char **argv, const char
*prefix __maybe_unused)
strcmp(argv[i], "hwcache") == 0)
print_hwcache_events(NULL, false);
else if (strcmp(argv[i], "pmu") == 0)
- print_pmu_events(NULL, false);
+ print_pmu_events(NULL, false, !desc_flag);
else if (strcmp(argv[i], "--raw-dump") == 0)
- print_events(NULL, true);
+ print_events(NULL, true, !desc_flag);
else {
char *sep = strchr(argv[i], ':'), *s;
int sep_idx;
if (sep == NULL) {
- print_events(argv[i], false);
+ print_events(argv[i], false, !desc_flag);
continue;
}
sep_idx = sep - argv[i];
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 1e15df1..e2badf3 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1231,7 +1231,7 @@ static void print_symbol_events(const char *event_glob,
unsigned type,
/*
* Print the help text for the event symbols:
*/
-void print_events(const char *event_glob, bool name_only)
+void print_events(const char *event_glob, bool name_only, bool quiet)
{
if (!name_only) {
printf("\n");
@@ -1246,7 +1246,7 @@ void print_events(const char *event_glob, bool name_only)
print_hwcache_events(event_glob, name_only);
[PATCH 11/11] perf, tools: Add a --no-desc flag to perf list
From: Andi Kleen a...@linux.intel.com
Add a --no-desc flag to perf list to not print the event descriptions
that were earlier added for JSON events. This may be useful to
get a less crowded listing.
It's still default to print descriptions as that is the more useful
default for most users.
Before:
% perf list
...
baclears.any [Counts the total number
when the front end is
resteered, mainly when
the BPU cannot provide a
correct prediction and
this is corrected by other
branch handling
mechanisms at the front end]
br_inst_exec.all_branches [Speculative and retired
branches]
After:
% perf list --no-desc
...
baclears.any [Kernel PMU event]
br_inst_exec.all_branches [Kernel PMU event]
v2: Rename --quiet to --no-desc. Add option to man page.
Signed-off-by: Andi Kleen a...@linux.intel.com
---
tools/perf/Documentation/perf-list.txt | 5 -
tools/perf/builtin-list.c | 14 +-
tools/perf/util/parse-events.c | 4 ++--
tools/perf/util/parse-events.h | 2 +-
tools/perf/util/pmu.c | 4 ++--
tools/perf/util/pmu.h | 2 +-
6 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/tools/perf/Documentation/perf-list.txt
b/tools/perf/Documentation/perf-list.txt
index d241b5c..7a6b25d 100644
--- a/tools/perf/Documentation/perf-list.txt
+++ b/tools/perf/Documentation/perf-list.txt
@@ -8,7 +8,7 @@ perf-list - List all symbolic event types
SYNOPSIS
[verse]
-'perf list' [hw|sw|cache|tracepoint|pmu|event_glob]
+'perf list' [--no-desc] [hw|sw|cache|tracepoint|pmu|event_glob]
DESCRIPTION
---
@@ -23,6 +23,9 @@ automatically downloaded with perf download.
The JSON event file can be also specified with the EVENTMAP environment
variable.
+--no-desc::
+Don't print descriptions.
+
[[EVENT_MODIFIERS]] EVENT MODIFIERS
---
diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c
index 086c96f..68752a1 100644
--- a/tools/perf/builtin-list.c
+++ b/tools/perf/builtin-list.c
@@ -16,16 +16,20 @@
#include util/pmu.h
#include util/parse-options.h
+static bool desc_flag = true;
+
int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
{
int i;
const struct option list_options[] = {
OPT_STRING(0, events-file, json_file, json file,
Read event json file),
+ OPT_BOOLEAN('d', desc, desc_flag,
+ Print extra event descriptions. --no-desc to not
print.),
OPT_END()
};
const char * const list_usage[] = {
- perf list [hw|sw|cache|tracepoint|pmu|event_glob],
+ perf list [--events-file FILE] [--no-desc]
[hw|sw|cache|tracepoint|pmu|event_glob],
NULL
};
@@ -35,7 +39,7 @@ int cmd_list(int argc, const char **argv, const char *prefix
__maybe_unused)
setup_pager();
if (argc == 0) {
- print_events(NULL, false);
+ print_events(NULL, false, !desc_flag);
return 0;
}
@@ -54,15 +58,15 @@ int cmd_list(int argc, const char **argv, const char
*prefix __maybe_unused)
strcmp(argv[i], hwcache) == 0)
print_hwcache_events(NULL, false);
else if (strcmp(argv[i], pmu) == 0)
- print_pmu_events(NULL, false);
+ print_pmu_events(NULL, false, !desc_flag);
else if (strcmp(argv[i], --raw-dump) == 0)
- print_events(NULL, true);
+ print_events(NULL, true, !desc_flag);
else {
char *sep = strchr(argv[i], ':'), *s;
int sep_idx;
if (sep == NULL) {
- print_events(argv[i], false);
+ print_events(argv[i], false, !desc_flag);
continue;
}
sep_idx = sep - argv[i];
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 1e15df1..e2badf3 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1231,7 +1231,7 @@ static void print_symbol_events(const char *event_glob,
unsigned type,
/*
* Print the help text for the event symbols:
*/
-void print_events(const char *event_glob, bool name_only)
+void print_events(const char *event_glob, bool name_only, bool quiet)
{
if (!name_only) {
printf(\n);
@@ -1246,7 +1246,7 @@ void print_events(const char *event_glob, bool name_only)
