Skip to contentSkip to conversation

perf c2c: fix '-e list'

PATCH Superseded Ian Rogers 2 participants 4 messages Nov 27, 2019 perf events

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Ian Rogers

author reviewer
#0 lore raw

PATCH 1/1 perf c2c: fix '-e list'

When the event is passed as list, the default events should be listed as per 'perf mem record -e list'. Previous behavior is:

$ perf c2c record -e list
failed: event 'list' not found, use '-e list' to get list of available events

Usage: perf c2c record [<options>] [<command>]
or: perf c2c record [<options>] -- <command> [<options>]

-e, --event <event> event selector. Use 'perf mem record -e list' to list available events

New behavior:

$ perf c2c record -e list
ldlat-loads  : available
ldlat-stores : available
---
 tools/perf/builtin-c2c.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)
tools/perf/builtin-c2c.c +18 -2
index e69f44941aad..dd69cd218e4c 100644
@@ -2872,10 +2872,26 @@ static int perf_c2c__report(int argc, const char **argv)
 static int parse_record_events(const struct option *opt,
 			       const char *str, int unset __maybe_unused)
 {
+	int j;
 	bool *event_set = (bool *) opt->value;
 
-	*event_set = true;
-	return perf_mem_events__parse(str);
+	if (strcmp(str, "list")) {
+		*event_set = true;
+		if (!perf_mem_events__parse(str))
+			return 0;
+
+		exit(-1);
+	}
+	for (j = 0; j < PERF_MEM_EVENTS__MAX; j++) {
+		struct perf_mem_event *e = &perf_mem_events[j];
+
+		fprintf(stderr, "%-13s%-*s%s\n",
+			e->tag,
+			verbose > 0 ? 25 : 0,
+			verbose > 0 ? perf_mem_events__name(j) : "",
+			e->supported ? ": available" : "");
+	}
+	exit(0);
 }
 
 
Signature · 1 line
2.24.0.393.g34dc348eaf-goog
#1 lore raw
Quoted 10 lines · Ian Rogers

When the event is passed as list, the default events should be listed as per 'perf mem record -e list'. Previous behavior is:

$ perf c2c record -e list
failed: event 'list' not found, use '-e list' to get list of available events

Usage: perf c2c record [<options>] [<command>]
or: perf c2c record [<options>] -- <command> [<options>]

-e, --event <event> event selector. Use 'perf mem record -e list' to list available events

man c2c page do say you should use 'perf mem' not 'perf c2c' could you please change the man page as well?

Quoted 31 lines

New behavior:

$ perf c2c record -e list
ldlat-loads  : available
ldlat-stores : available
---
 tools/perf/builtin-c2c.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)
tools/perf/builtin-c2c.c +7 -2
index e69f44941aad..dd69cd218e4c 100644
@@ -2872,10 +2872,26 @@ static int perf_c2c__report(int argc, const char **argv)
 static int parse_record_events(const struct option *opt,
 			       const char *str, int unset __maybe_unused)
 {
+	int j;
 	bool *event_set = (bool *) opt->value;
 
-	*event_set = true;
-	return perf_mem_events__parse(str);
+	if (strcmp(str, "list")) {
+		*event_set = true;
+		if (!perf_mem_events__parse(str))
+			return 0;
+
+		exit(-1);

tools/perf/builtin-c2c.c static int perf_c2c__report(int argc, const char **argv) · line 2893

Quoted 10 lines
tools/perf/builtin-c2c.c +10 -0
+	}
+	for (j = 0; j < PERF_MEM_EVENTS__MAX; j++) {
+		struct perf_mem_event *e = &perf_mem_events[j];
+
+		fprintf(stderr, "%-13s%-*s%s\n",
+			e->tag,
+			verbose > 0 ? 25 : 0,
+			verbose > 0 ? perf_mem_events__name(j) : "",
+			e->supported ? ": available" : "");
+	}

there's same loop in builtin-mem.c, could you please put it to function in mem-events.c?

thanks,
jirka

author reviewer
#2 lore raw
Quoted 8 lines · Jiri Olsa
Quoted 6 lines · Ian Rogers

When the event is passed as list, the default events should be listed as per 'perf mem record -e list'. Previous behavior is:

$ perf c2c record -e list
failed: event 'list' not found, use '-e list' to get list of available events
Quoted 7 lines
Quoted 4 lines

Usage: perf c2c record [<options>] [<command>]
or: perf c2c record [<options>] -- <command> [<options>]

-e, --event <event> event selector. Use 'perf mem record -e list' to list available events

man c2c page do say you should use 'perf mem' not 'perf c2c' could you please change the man page as well?

Done.

Quoted 36 lines
Quoted 36 lines

New behavior:

$ perf c2c record -e list
ldlat-loads  : available
ldlat-stores : available
---
 tools/perf/builtin-c2c.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)
tools/perf/builtin-c2c.c +12 -2
index e69f44941aad..dd69cd218e4c 100644
@@ -2872,10 +2872,26 @@ static int perf_c2c__report(int argc, const char **argv)
 static int parse_record_events(const struct option *opt,
                             const char *str, int unset __maybe_unused)
 {
+     int j;
      bool *event_set = (bool *) opt->value;
 
-     *event_set = true;
-     return perf_mem_events__parse(str);
+     if (strcmp(str, "list")) {
+             *event_set = true;
+             if (!perf_mem_events__parse(str))
+                     return 0;
+
+             exit(-1);
+     }
+     for (j = 0; j < PERF_MEM_EVENTS__MAX; j++) {
+             struct perf_mem_event *e = &perf_mem_events[j];
+
+             fprintf(stderr, "%-13s%-*s%s\n",
Quoted 8 lines

tools/perf/builtin-c2c.c static int perf_c2c__report(int argc, const char **argv) · line 2893

Quoted 5 lines
tools/perf/builtin-c2c.c +5 -0
+                     e->tag,
+                     verbose > 0 ? 25 : 0,
+                     verbose > 0 ? perf_mem_events__name(j) : "",
+                     e->supported ? ": available" : "");
+     }

there's same loop in builtin-mem.c, could you please put it to function in mem-events.c?

Done.

Thanks for the review!
Ian

Quoted 3 lines

thanks,
jirka

author reviewer
#3 lore raw

PATCH v2 1/1 perf c2c: fix '-e list'

In reply to Ian Rogers

When the event is passed as list, the default events should be listed as per 'perf mem record -e list'. Previous behavior is:

$ perf c2c record -e list
failed: event 'list' not found, use '-e list' to get list of available events

Usage: perf c2c record [<options>] [<command>]
or: perf c2c record [<options>] -- <command> [<options>]

-e, --event <event> event selector. Use 'perf mem record -e list' to list available events

New behavior:

$ perf c2c record -e list
ldlat-loads  : available
ldlat-stores : available

v2: addresses review comments by Jiri Olsa.

---
 tools/perf/Documentation/perf-c2c.txt |  2 +-
 tools/perf/builtin-c2c.c              |  9 ++++++++-
 tools/perf/builtin-mem.c              | 24 +++++++-----------------
 tools/perf/util/mem-events.c          | 15 +++++++++++++++
 tools/perf/util/mem-events.h          |  2 ++
 5 files changed, 33 insertions(+), 19 deletions(-)
tools/perf/Documentation/perf-c2c.txt +1 -1
index e6150f21267d..6ab03e04c925 100644
@@ -40,7 +40,7 @@ RECORD OPTIONS
 --------------
 -e::
 --event=::
-	Select the PMU event. Use 'perf mem record -e list'
+	Select the PMU event. Use 'perf c2c record -e list'
 	to list available events.
 
 -v::
tools/perf/builtin-c2c.c +8 -1
index e69f44941aad..193d6a04f61b 100644
@@ -2874,8 +2874,15 @@ static int parse_record_events(const struct option *opt,
 {
 	bool *event_set = (bool *) opt->value;
 
+	if (!strcmp(str, "list")) {
+		perf_mem_events__list();
+		exit(0);
+	}
+	if (perf_mem_events__parse(str))
+		exit(-1);
+
 	*event_set = true;
-	return perf_mem_events__parse(str);
+	return 0;
 }
 
 
tools/perf/builtin-mem.c +7 -17
index a13f5817d6fc..c796bc08abb7 100644
@@ -38,26 +38,16 @@ static int parse_record_events(const struct option *opt,
 			       const char *str, int unset __maybe_unused)
 {
 	struct perf_mem *mem = *(struct perf_mem **)opt->value;
-	int j;
 
-	if (strcmp(str, "list")) {
-		if (!perf_mem_events__parse(str)) {
-			mem->operation = 0;
-			return 0;
-		}
-		exit(-1);
+	if (!strcmp(str, "list")) {
+		perf_mem_events__list();
+		exit(0);
 	}
+	if (perf_mem_events__parse(str))
+		exit(-1);
 
-	for (j = 0; j < PERF_MEM_EVENTS__MAX; j++) {
-		struct perf_mem_event *e = &perf_mem_events[j];
-
-		fprintf(stderr, "%-13s%-*s%s\n",
-			e->tag,
-			verbose > 0 ? 25 : 0,
-			verbose > 0 ? perf_mem_events__name(j) : "",
-			e->supported ? ": available" : "");
-	}
-	exit(0);
+	mem->operation = 0;
+	return 0;
 }
 
 static const char * const __usage[] = {
tools/perf/util/mem-events.c +15 -0
index aa29589f6904..ea0af0bc4314 100644
@@ -103,6 +103,21 @@ int perf_mem_events__init(void)
 	return found ? 0 : -ENOENT;
 }
 
+void perf_mem_events__list(void)
+{
+	int j;
+
+	for (j = 0; j < PERF_MEM_EVENTS__MAX; j++) {
+		struct perf_mem_event *e = &perf_mem_events[j];
+
+		fprintf(stderr, "%-13s%-*s%s\n",
+			e->tag,
+			verbose > 0 ? 25 : 0,
+			verbose > 0 ? perf_mem_events__name(j) : "",
+			e->supported ? ": available" : "");
+	}
+}
+
 static const char * const tlb_access[] = {
 	"N/A",
 	"HIT",
tools/perf/util/mem-events.h +2 -0
index f1389bdae7bf..904dad34f7f7 100644
@@ -39,6 +39,8 @@ int perf_mem_events__init(void);
 
 char *perf_mem_events__name(int i);
 
+void perf_mem_events__list(void);
+
 struct mem_info;
 int perf_mem__tlb_scnprintf(char *out, size_t sz, struct mem_info *mem_info);
 int perf_mem__lvl_scnprintf(char *out, size_t sz, struct mem_info *mem_info);
Signature · 1 line
2.24.0.393.g34dc348eaf-goog