Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1568820
| From | Andi Kleen <andi@firstfloor.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 01/10] perf, tools: Parse eventcode as number in jevents |
| Date | 2017-01-28 03:10 +0100 |
| Message-ID | <t4qCK-3Iy-11@gated-at.bofh.it> (permalink) |
| References | <t4qCK-3Iy-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Andi Kleen <ak@linux.intel.com>
The next patch needs to modify event code. Previously eventcode was just
passed through as a string. Now parse it as a number.
v2: Don't special case 0
Acked-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
tools/perf/pmu-events/jevents.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
index 41611d7f9873..551377bf8428 100644
--- a/tools/perf/pmu-events/jevents.c
+++ b/tools/perf/pmu-events/jevents.c
@@ -135,7 +135,6 @@ static struct field {
const char *field;
const char *kernel;
} fields[] = {
- { "EventCode", "event=" },
{ "UMask", "umask=" },
{ "CounterMask", "cmask=" },
{ "Invert", "inv=" },
@@ -343,6 +342,7 @@ int json_events(const char *fn,
jsmntok_t *tokens, *tok;
int i, j, len;
char *map;
+ char buf[128];
if (!fn)
return -ENOENT;
@@ -356,6 +356,7 @@ int json_events(const char *fn,
char *event = NULL, *desc = NULL, *name = NULL;
char *long_desc = NULL;
char *extra_desc = NULL;
+ unsigned long long eventcode = 0;
struct msrmap *msr = NULL;
jsmntok_t *msrval = NULL;
jsmntok_t *precise = NULL;
@@ -376,6 +377,11 @@ int json_events(const char *fn,
nz = !json_streq(map, val, "0");
if (match_field(map, field, nz, &event, val)) {
/* ok */
+ } else if (json_streq(map, field, "EventCode")) {
+ char *code = NULL;
+ addfield(map, &code, "", "", val);
+ eventcode |= strtoul(code, NULL, 0);
+ free(code);
} else if (json_streq(map, field, "EventName")) {
addfield(map, &name, "", "", val);
} else if (json_streq(map, field, "BriefDescription")) {
@@ -410,6 +416,8 @@ int json_events(const char *fn,
addfield(map, &extra_desc, " ",
"(Precise event)", NULL);
}
+ snprintf(buf, sizeof buf, "event=%#llx", eventcode);
+ addfield(map, &event, ",", buf, NULL);
if (desc && extra_desc)
addfield(map, &desc, " ", extra_desc, NULL);
if (long_desc && extra_desc)
--
2.9.3
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
Support Intel uncore event lists Andi Kleen <andi@firstfloor.org> - 2017-01-28 03:10 +0100 [PATCH 06/10] perf, tools: Collapse identically named events in perf stat Andi Kleen <andi@firstfloor.org> - 2017-01-28 03:10 +0100 [PATCH 01/10] perf, tools: Parse eventcode as number in jevents Andi Kleen <andi@firstfloor.org> - 2017-01-28 03:10 +0100 [PATCH 04/10] perf, tools: Support event aliases for non cpu// pmus Andi Kleen <andi@firstfloor.org> - 2017-01-28 03:10 +0100 [PATCH 02/10] perf, tools: Add support for parsing uncore json files Andi Kleen <andi@firstfloor.org> - 2017-01-28 03:10 +0100 [PATCH 09/10] perf, tools: Support MetricExpr header in JSON event list Andi Kleen <andi@firstfloor.org> - 2017-01-28 03:10 +0100 [PATCH 03/10] perf, tools: Support per pmu json aliases Andi Kleen <andi@firstfloor.org> - 2017-01-28 03:10 +0100 [PATCH 05/10] perf, tools: Add debug support for outputing alias string Andi Kleen <andi@firstfloor.org> - 2017-01-28 03:20 +0100 [PATCH 07/10] perf, tools: Expand PMU events by prefix match Andi Kleen <andi@firstfloor.org> - 2017-01-28 03:20 +0100 [PATCH 10/10] perf, tools, stat: Output JSON MetricExpr metric Andi Kleen <andi@firstfloor.org> - 2017-01-28 03:20 +0100 [PATCH 08/10] perf, tools: Add a simple expression parser for JSON Andi Kleen <andi@firstfloor.org> - 2017-01-28 03:30 +0100
csiph-web