1 files changed, 72 insertions, 10 deletions

diff --git a/Documentation/perf_counter/util/parse-events.c b/Documentation/perf_counter/util/parse-events.c
index 77d0917d55d3..88c903eb260a 100644
--- a/Documentation/perf_counter/util/parse-events.c
+++ b/Documentation/perf_counter/util/parse-events.c
@@ -8,6 +8,7 @@
 int nr_counters;
 
 __u64                   event_id[MAX_COUNTERS]          = { };
+int                     event_mask[MAX_COUNTERS];
 
 struct event_symbol {
         __u64 event;
@@ -37,6 +38,64 @@ static struct event_symbol event_symbols[] = {
         {EID(PERF_TYPE_SOFTWARE, PERF_COUNT_CPU_MIGRATIONS),            "migrations",           },
 };
 
+#define __PERF_COUNTER_FIELD(config, name) \
+        ((config & PERF_COUNTER_##name##_MASK) >> PERF_COUNTER_##name##_SHIFT)
+
+#define PERF_COUNTER_RAW(config)        __PERF_COUNTER_FIELD(config, RAW)
+#define PERF_COUNTER_CONFIG(config)     __PERF_COUNTER_FIELD(config, CONFIG)
+#define PERF_COUNTER_TYPE(config)       __PERF_COUNTER_FIELD(config, TYPE)
+#define PERF_COUNTER_ID(config)         __PERF_COUNTER_FIELD(config, EVENT)
+
+static char *hw_event_names[] = {
+        "CPU cycles",
+        "instructions",
+        "cache references",
+        "cache misses",
+        "branches",
+        "branch misses",
+        "bus cycles",
+};
+
+static char *sw_event_names[] = {
+        "cpu clock ticks",
+        "task clock ticks",
+        "pagefaults",
+        "context switches",
+        "CPU migrations",
+        "minor faults",
+        "major faults",
+};
+
+char *event_name(int ctr)
+{
+        __u64 config = event_id[ctr];
+        int type = PERF_COUNTER_TYPE(config);
+        int id = PERF_COUNTER_ID(config);
+        static char buf[32];
+
+        if (PERF_COUNTER_RAW(config)) {
+                sprintf(buf, "raw 0x%llx", PERF_COUNTER_CONFIG(config));
+                return buf;
+        }
+
+        switch (type) {
+        case PERF_TYPE_HARDWARE:
+                if (id < PERF_HW_EVENTS_MAX)
+                        return hw_event_names[id];
+                return "unknown-hardware";
+
+        case PERF_TYPE_SOFTWARE:
+                if (id < PERF_SW_EVENTS_MAX)
+                        return sw_event_names[id];
+                return "unknown-software";
+
+        default:
+                break;
+        }
+
+        return "unknown";
+}
+
 /*
  * Each event can have multiple symbolic names.
  * Symbolic names are (almost) exactly matched.
@@ -46,12 +105,23 @@ static __u64 match_event_symbols(const char *str)
         __u64 config, id;
         int type;
         unsigned int i;
+        char mask_str[4];
 
         if (sscanf(str, "r%llx", &config) == 1)
                 return config | PERF_COUNTER_RAW_MASK;
 
-        if (sscanf(str, "%d:%llu", &type, &id) == 2)
-                return EID(type, id);
+        switch (sscanf(str, "%d:%llu:%2s", &type, &id, mask_str)) {
+                case 3:
+                        if (strchr(mask_str, 'k'))
+                                event_mask[nr_counters] |= EVENT_MASK_USER;
+                        if (strchr(mask_str, 'u'))
+                                event_mask[nr_counters] |= EVENT_MASK_KERNEL;
+                case 2:
+                        return EID(type, id);
+
+                default:
+                        break;
+        }
 
         for (i = 0; i < ARRAY_SIZE(event_symbols); i++) {
                 if (!strncmp(str, event_symbols[i].symbol,
@@ -86,14 +156,6 @@ again:
         return 0;
 }
 
-#define __PERF_COUNTER_FIELD(config, name) \
-        ((config & PERF_COUNTER_##name##_MASK) >> PERF_COUNTER_##name##_SHIFT)
-
-#define PERF_COUNTER_RAW(config)        __PERF_COUNTER_FIELD(config, RAW)
-#define PERF_COUNTER_CONFIG(config)     __PERF_COUNTER_FIELD(config, CONFIG)
-#define PERF_COUNTER_TYPE(config)       __PERF_COUNTER_FIELD(config, TYPE)
-#define PERF_COUNTER_ID(config)         __PERF_COUNTER_FIELD(config, EVENT)
-
 /*
  * Create the help text for the event symbols:
  */