12 files changed, 558 insertions, 96 deletions

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 875bf2675326..861f0aec77ae 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -1179,6 +1179,12 @@ int cmd_stat(int argc, const char **argv, const char *prefix __used)
                 fprintf(stderr, "cannot use both --output and --log-fd\n");
                 usage_with_options(stat_usage, options);
         }
+
+        if (output_fd < 0) {
+                fprintf(stderr, "argument to --log-fd must be a > 0\n");
+                usage_with_options(stat_usage, options);
+        }
+
         if (!output) {
                 struct timespec tm;
                 mode = append_file ? "a" : "w";
@@ -1190,7 +1196,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __used)
                 }
                 clock_gettime(CLOCK_REALTIME, &tm);
                 fprintf(output, "# started on %s\n", ctime(&tm.tv_sec));
-        } else if (output_fd != 2) {
+        } else if (output_fd > 0) {
                 mode = append_file ? "a" : "w";
                 output = fdopen(output_fd, mode);
                 if (!output) {
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 07c8f3792954..a5e2015319ee 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -1942,7 +1942,6 @@ int perf_file_header__read(struct perf_file_header *header,
                 else
                         return -1;
         } else if (ph->needs_swap) {
-                unsigned int i;
                 /*
                  * feature bitmap is declared as an array of unsigned longs --
                  * not good since its size can differ between the host that
@@ -1958,14 +1957,17 @@ int perf_file_header__read(struct perf_file_header *header,
                  * file), punt and fallback to the original behavior --
                  * clearing all feature bits and setting buildid.
                  */
-                for (i = 0; i < BITS_TO_LONGS(HEADER_FEAT_BITS); ++i)
-                        header->adds_features[i] = bswap_64(header->adds_features[i]);
+                mem_bswap_64(&header->adds_features,
+                            BITS_TO_U64(HEADER_FEAT_BITS));
 
                 if (!test_bit(HEADER_HOSTNAME, header->adds_features)) {
-                        for (i = 0; i < BITS_TO_LONGS(HEADER_FEAT_BITS); ++i) {
-                                header->adds_features[i] = bswap_64(header->adds_features[i]);
-                                header->adds_features[i] = bswap_32(header->adds_features[i]);
-                        }
+                        /* unswap as u64 */
+                        mem_bswap_64(&header->adds_features,
+                                    BITS_TO_U64(HEADER_FEAT_BITS));
+
+                        /* unswap as u32 */
+                        mem_bswap_32(&header->adds_features,
+                                    BITS_TO_U32(HEADER_FEAT_BITS));
                 }
 
                 if (!test_bit(HEADER_HOSTNAME, header->adds_features)) {
@@ -2091,6 +2093,35 @@ static int read_attr(int fd, struct perf_header *ph,
         return ret <= 0 ? -1 : 0;
 }
 
+static int perf_evsel__set_tracepoint_name(struct perf_evsel *evsel)
+{
+        struct event_format *event = trace_find_event(evsel->attr.config);
+        char bf[128];
+
+        if (event == NULL)
+                return -1;
+
+        snprintf(bf, sizeof(bf), "%s:%s", event->system, event->name);
+        evsel->name = strdup(bf);
+        if (event->name == NULL)
+                return -1;
+
+        return 0;
+}
+
+static int perf_evlist__set_tracepoint_names(struct perf_evlist *evlist)
+{
+        struct perf_evsel *pos;
+
+        list_for_each_entry(pos, &evlist->entries, node) {
+                if (pos->attr.type == PERF_TYPE_TRACEPOINT &&
+                    perf_evsel__set_tracepoint_name(pos))
+                        return -1;
+        }
+
+        return 0;
+}
+
 int perf_session__read_header(struct perf_session *session, int fd)
 {
         struct perf_header *header = &session->header;
@@ -2172,6 +2203,9 @@ int perf_session__read_header(struct perf_session *session, int fd)
 
         lseek(fd, header->data_offset, SEEK_SET);
 
+        if (perf_evlist__set_tracepoint_names(session->evlist))
+                goto out_delete_evlist;
+
         header->frozen = 1;
         return 0;
 out_errno:
diff --git a/tools/perf/util/include/linux/bitops.h b/tools/perf/util/include/linux/bitops.h
index f1584833bd22..587a230d2075 100644
--- a/tools/perf/util/include/linux/bitops.h
+++ b/tools/perf/util/include/linux/bitops.h
@@ -8,6 +8,8 @@
 #define BITS_PER_LONG __WORDSIZE
 #define BITS_PER_BYTE           8
 #define BITS_TO_LONGS(nr)       DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long))
+#define BITS_TO_U64(nr)         DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(u64))
+#define BITS_TO_U32(nr)         DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(u32))
 
 #define for_each_set_bit(bit, addr, size) \
         for ((bit) = find_first_bit((addr), (size));            \
diff --git a/tools/perf/util/parse-events-test.c b/tools/perf/util/parse-events-test.c
index d0cf7c1ed068..229af6da33a2 100644
--- a/tools/perf/util/parse-events-test.c
+++ b/tools/perf/util/parse-events-test.c
@@ -430,6 +430,49 @@ static int test__checkevent_pmu_name(struct perf_evlist *evlist)
         return 0;
 }
 
+static int test__checkterms_simple(struct list_head *terms)
+{
+        struct parse_events__term *term;
+
+        /* config=10 */
+        term = list_entry(terms->next, struct parse_events__term, list);
+        TEST_ASSERT_VAL("wrong type term",
+                        term->type_term == PARSE_EVENTS__TERM_TYPE_CONFIG);
+        TEST_ASSERT_VAL("wrong type val",
+                        term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
+        TEST_ASSERT_VAL("wrong val", term->val.num == 10);
+        TEST_ASSERT_VAL("wrong config", !term->config);
+
+        /* config1 */
+        term = list_entry(term->list.next, struct parse_events__term, list);
+        TEST_ASSERT_VAL("wrong type term",
+                        term->type_term == PARSE_EVENTS__TERM_TYPE_CONFIG1);
+        TEST_ASSERT_VAL("wrong type val",
+                        term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
+        TEST_ASSERT_VAL("wrong val", term->val.num == 1);
+        TEST_ASSERT_VAL("wrong config", !term->config);
+
+        /* config2=3 */
+        term = list_entry(term->list.next, struct parse_events__term, list);
+        TEST_ASSERT_VAL("wrong type term",
+                        term->type_term == PARSE_EVENTS__TERM_TYPE_CONFIG2);
+        TEST_ASSERT_VAL("wrong type val",
+                        term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
+        TEST_ASSERT_VAL("wrong val", term->val.num == 3);
+        TEST_ASSERT_VAL("wrong config", !term->config);
+
+        /* umask=1*/
+        term = list_entry(term->list.next, struct parse_events__term, list);
+        TEST_ASSERT_VAL("wrong type term",
+                        term->type_term == PARSE_EVENTS__TERM_TYPE_USER);
+        TEST_ASSERT_VAL("wrong type val",
+                        term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
+        TEST_ASSERT_VAL("wrong val", term->val.num == 1);
+        TEST_ASSERT_VAL("wrong config", !strcmp(term->config, "umask"));
+
+        return 0;
+}
+
 struct test__event_st {
         const char *name;
         __u32 type;
@@ -559,7 +602,23 @@ static struct test__event_st test__events_pmu[] = {
 #define TEST__EVENTS_PMU_CNT (sizeof(test__events_pmu) / \
                               sizeof(struct test__event_st))
 
-static int test(struct test__event_st *e)
+struct test__term {
+        const char *str;
+        __u32 type;
+        int (*check)(struct list_head *terms);
+};
+
+static struct test__term test__terms[] = {
+        [0] = {
+                .str   = "config=10,config1,config2=3,umask=1",
+                .check = test__checkterms_simple,
+        },
+};
+
+#define TEST__TERMS_CNT (sizeof(test__terms) / \
+                         sizeof(struct test__term))
+
+static int test_event(struct test__event_st *e)
 {
         struct perf_evlist *evlist;
         int ret;
@@ -590,7 +649,48 @@ static int test_events(struct test__event_st *events, unsigned cnt)
                 struct test__event_st *e = &events[i];
 
                 pr_debug("running test %d '%s'\n", i, e->name);
-                ret = test(e);
+                ret = test_event(e);
+                if (ret)
+                        break;
+        }
+
+        return ret;
+}
+
+static int test_term(struct test__term *t)
+{
+        struct list_head *terms;
+        int ret;
+
+        terms = malloc(sizeof(*terms));
+        if (!terms)
+                return -ENOMEM;
+
+        INIT_LIST_HEAD(terms);
+
+        ret = parse_events_terms(terms, t->str);
+        if (ret) {
+                pr_debug("failed to parse terms '%s', err %d\n",
+                         t->str , ret);
+                return ret;
+        }
+
+        ret = t->check(terms);
+        parse_events__free_terms(terms);
+
+        return ret;
+}
+
+static int test_terms(struct test__term *terms, unsigned cnt)
+{
+        int ret = 0;
+        unsigned i;
+
+        for (i = 0; i < cnt; i++) {
+                struct test__term *t = &terms[i];
+
+                pr_debug("running test %d '%s'\n", i, t->str);
+                ret = test_term(t);
                 if (ret)
                         break;
         }
@@ -617,9 +717,21 @@ int parse_events__test(void)
 {
         int ret;
 
-        ret = test_events(test__events, TEST__EVENTS_CNT);
-        if (!ret && test_pmu())
-                ret = test_events(test__events_pmu, TEST__EVENTS_PMU_CNT);
+        do {
+                ret = test_events(test__events, TEST__EVENTS_CNT);
+                if (ret)
+                        break;
+
+                if (test_pmu()) {
+                        ret = test_events(test__events_pmu,
+                                          TEST__EVENTS_PMU_CNT);
+                        if (ret)
+                                break;
+                }
+
+                ret = test_terms(test__terms, TEST__TERMS_CNT);
+
+        } while (0);
 
         return ret;
 }
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index eacf932a36a0..0cc27da30ddb 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -11,6 +11,8 @@
 #include "cache.h"
 #include "header.h"
 #include "debugfs.h"
+#include "parse-events-bison.h"
+#define YY_EXTRA_TYPE int
 #include "parse-events-flex.h"
 #include "pmu.h"
 
@@ -26,7 +28,7 @@ struct event_symbol {
 #ifdef PARSER_DEBUG
 extern int parse_events_debug;
 #endif
-int parse_events_parse(struct list_head *list, int *idx);
+int parse_events_parse(void *data, void *scanner);
 
 #define CHW(x) .type = PERF_TYPE_HARDWARE, .config = PERF_COUNT_HW_##x
 #define CSW(x) .type = PERF_TYPE_SOFTWARE, .config = PERF_COUNT_SW_##x
@@ -529,6 +531,9 @@ int parse_events_add_pmu(struct list_head **list, int *idx,
 
         memset(&attr, 0, sizeof(attr));
 
+        if (perf_pmu__check_alias(pmu, head_config))
+                return -EINVAL;
+
         /*
          * Configure hardcoded terms first, no need to check
          * return value when called with fail == 0 ;)
@@ -617,27 +622,62 @@ int parse_events_modifier(struct list_head *list, char *str)
         return 0;
 }
 
-int parse_events(struct perf_evlist *evlist, const char *str, int unset __used)
+static int parse_events__scanner(const char *str, void *data, int start_token)
 {
-        LIST_HEAD(list);
-        LIST_HEAD(list_tmp);
         YY_BUFFER_STATE buffer;
-        int ret, idx = evlist->nr_entries;
+        void *scanner;
+        int ret;
+
+        ret = parse_events_lex_init_extra(start_token, &scanner);
+        if (ret)
+                return ret;
 
-        buffer = parse_events__scan_string(str);
+        buffer = parse_events__scan_string(str, scanner);
 
 #ifdef PARSER_DEBUG
         parse_events_debug = 1;
 #endif
-        ret = parse_events_parse(&list, &idx);
+        ret = parse_events_parse(data, scanner);
+
+        parse_events__flush_buffer(buffer, scanner);
+        parse_events__delete_buffer(buffer, scanner);
+        parse_events_lex_destroy(scanner);
+        return ret;
+}
+
+/*
+ * parse event config string, return a list of event terms.
+ */
+int parse_events_terms(struct list_head *terms, const char *str)
+{
+        struct parse_events_data__terms data = {
+                .terms = NULL,
+        };
+        int ret;
+
+        ret = parse_events__scanner(str, &data, PE_START_TERMS);
+        if (!ret) {
+                list_splice(data.terms, terms);
+                free(data.terms);
+                return 0;
+        }
+
+        parse_events__free_terms(data.terms);
+        return ret;
+}
 
-        parse_events__flush_buffer(buffer);
-        parse_events__delete_buffer(buffer);
-        parse_events_lex_destroy();
+int parse_events(struct perf_evlist *evlist, const char *str, int unset __used)
+{
+        struct parse_events_data__events data = {
+                .list = LIST_HEAD_INIT(data.list),
+                .idx  = evlist->nr_entries,
+        };
+        int ret;
 
+        ret = parse_events__scanner(str, &data, PE_START_EVENTS);
         if (!ret) {
-                int entries = idx - evlist->nr_entries;
-                perf_evlist__splice_list_tail(evlist, &list, entries);
+                int entries = data.idx - evlist->nr_entries;
+                perf_evlist__splice_list_tail(evlist, &data.list, entries);
                 return 0;
         }
 
@@ -937,6 +977,13 @@ int parse_events__term_str(struct parse_events__term **term,
                         config, str, 0);
 }
 
+int parse_events__term_clone(struct parse_events__term **new,
+                             struct parse_events__term *term)
+{
+        return new_term(new, term->type_val, term->type_term, term->config,
+                        term->val.str, term->val.num);
+}
+
 void parse_events__free_terms(struct list_head *terms)
 {
         struct parse_events__term *term, *h;
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index 1784f06e3a6a..ee9c218a193c 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -31,6 +31,7 @@ extern int parse_events_option(const struct option *opt, const char *str,
                                int unset);
 extern int parse_events(struct perf_evlist *evlist, const char *str,
                         int unset);
+extern int parse_events_terms(struct list_head *terms, const char *str);
 extern int parse_filter(const struct option *opt, const char *str, int unset);
 
 #define EVENTS_HELP_MAX (128*1024)
@@ -61,11 +62,22 @@ struct parse_events__term {
         struct list_head list;
 };
 
+struct parse_events_data__events {
+        struct list_head list;
+        int idx;
+};
+
+struct parse_events_data__terms {
+        struct list_head *terms;
+};
+
 int parse_events__is_hardcoded_term(struct parse_events__term *term);
 int parse_events__term_num(struct parse_events__term **_term,
                            int type_term, char *config, long num);
 int parse_events__term_str(struct parse_events__term **_term,
                            int type_term, char *config, char *str);
+int parse_events__term_clone(struct parse_events__term **new,
+                             struct parse_events__term *term);
 void parse_events__free_terms(struct list_head *terms);
 int parse_events_modifier(struct list_head *list, char *str);
 int parse_events_add_tracepoint(struct list_head **list, int *idx,
@@ -81,8 +93,7 @@ int parse_events_add_pmu(struct list_head **list, int *idx,
                          char *pmu , struct list_head *head_config);
 void parse_events_update_lists(struct list_head *list_event,
                                struct list_head *list_all);
-void parse_events_error(struct list_head *list_all,
-                        int *idx, char const *msg);
+void parse_events_error(void *data, void *scanner, char const *msg);
 int parse_events__test(void);
 
 void print_events(const char *event_glob);
diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l
index 618a8e788399..488362e14133 100644
--- a/tools/perf/util/parse-events.l
+++ b/tools/perf/util/parse-events.l
@@ -1,4 +1,6 @@
 
+%option reentrant
+%option bison-bridge
 %option prefix="parse_events_"
 %option stack
 
@@ -8,7 +10,10 @@
 #include "parse-events-bison.h"
 #include "parse-events.h"
 
-static int __value(char *str, int base, int token)
+char *parse_events_get_text(yyscan_t yyscanner);
+YYSTYPE *parse_events_get_lval(yyscan_t yyscanner);
+
+static int __value(YYSTYPE *yylval, char *str, int base, int token)
 {
         long num;
 
@@ -17,35 +22,48 @@ static int __value(char *str, int base, int token)
         if (errno)
                 return PE_ERROR;
 
-        parse_events_lval.num = num;
+        yylval->num = num;
         return token;
 }
 
-static int value(int base)
+static int value(yyscan_t scanner, int base)
 {
-        return __value(parse_events_text, base, PE_VALUE);
+        YYSTYPE *yylval = parse_events_get_lval(scanner);
+        char *text = parse_events_get_text(scanner);
+
+        return __value(yylval, text, base, PE_VALUE);
 }
 
-static int raw(void)
+static int raw(yyscan_t scanner)
 {
-        return __value(parse_events_text + 1, 16, PE_RAW);
+        YYSTYPE *yylval = parse_events_get_lval(scanner);
+        char *text = parse_events_get_text(scanner);
+
+        return __value(yylval, text + 1, 16, PE_RAW);
 }
 
-static int str(int token)
+static int str(yyscan_t scanner, int token)
 {
-        parse_events_lval.str = strdup(parse_events_text);
+        YYSTYPE *yylval = parse_events_get_lval(scanner);
+        char *text = parse_events_get_text(scanner);
+
+        yylval->str = strdup(text);
         return token;
 }
 
-static int sym(int type, int config)
+static int sym(yyscan_t scanner, int type, int config)
 {
-        parse_events_lval.num = (type << 16) + config;
+        YYSTYPE *yylval = parse_events_get_lval(scanner);
+
+        yylval->num = (type << 16) + config;
         return PE_VALUE_SYM;
 }
 
-static int term(int type)
+static int term(yyscan_t scanner, int type)
 {
-        parse_events_lval.num = type;
+        YYSTYPE *yylval = parse_events_get_lval(scanner);
+
+        yylval->num = type;
         return PE_TERM;
 }
 
@@ -61,25 +79,38 @@ modifier_event	[ukhpGH]{1,8}
 modifier_bp     [rwx]
 
 %%
-cpu-cycles|cycles                               { return sym(PERF_TYPE_HARDWARE, PERF_COUNT_HW_CPU_CYCLES); }
-stalled-cycles-frontend|idle-cycles-frontend    { return sym(PERF_TYPE_HARDWARE, PERF_COUNT_HW_STALLED_CYCLES_FRONTEND); }
-stalled-cycles-backend|idle-cycles-backend      { return sym(PERF_TYPE_HARDWARE, PERF_COUNT_HW_STALLED_CYCLES_BACKEND); }
-instructions                                    { return sym(PERF_TYPE_HARDWARE, PERF_COUNT_HW_INSTRUCTIONS); }
-cache-references                                { return sym(PERF_TYPE_HARDWARE, PERF_COUNT_HW_CACHE_REFERENCES); }
-cache-misses                                    { return sym(PERF_TYPE_HARDWARE, PERF_COUNT_HW_CACHE_MISSES); }
-branch-instructions|branches                    { return sym(PERF_TYPE_HARDWARE, PERF_COUNT_HW_BRANCH_INSTRUCTIONS); }
-branch-misses                                   { return sym(PERF_TYPE_HARDWARE, PERF_COUNT_HW_BRANCH_MISSES); }
-bus-cycles                                      { return sym(PERF_TYPE_HARDWARE, PERF_COUNT_HW_BUS_CYCLES); }
-ref-cycles                                      { return sym(PERF_TYPE_HARDWARE, PERF_COUNT_HW_REF_CPU_CYCLES); }
-cpu-clock                                       { return sym(PERF_TYPE_SOFTWARE, PERF_COUNT_SW_CPU_CLOCK); }
-task-clock                                      { return sym(PERF_TYPE_SOFTWARE, PERF_COUNT_SW_TASK_CLOCK); }
-page-faults|faults                              { return sym(PERF_TYPE_SOFTWARE, PERF_COUNT_SW_PAGE_FAULTS); }
-minor-faults                                    { return sym(PERF_TYPE_SOFTWARE, PERF_COUNT_SW_PAGE_FAULTS_MIN); }
-major-faults                                    { return sym(PERF_TYPE_SOFTWARE, PERF_COUNT_SW_PAGE_FAULTS_MAJ); }
-context-switches|cs                             { return sym(PERF_TYPE_SOFTWARE, PERF_COUNT_SW_CONTEXT_SWITCHES); }
-cpu-migrations|migrations                       { return sym(PERF_TYPE_SOFTWARE, PERF_COUNT_SW_CPU_MIGRATIONS); }
-alignment-faults                                { return sym(PERF_TYPE_SOFTWARE, PERF_COUNT_SW_ALIGNMENT_FAULTS); }
-emulation-faults                                { return sym(PERF_TYPE_SOFTWARE, PERF_COUNT_SW_EMULATION_FAULTS); }
+
+%{
+        {
+                int start_token;
+
+                start_token = (int) parse_events_get_extra(yyscanner);
+                if (start_token) {
+                        parse_events_set_extra(NULL, yyscanner);
+                        return start_token;
+                }
+         }
+%}
+
+cpu-cycles|cycles                               { return sym(yyscanner, PERF_TYPE_HARDWARE, PERF_COUNT_HW_CPU_CYCLES); }
+stalled-cycles-frontend|idle-cycles-frontend    { return sym(yyscanner, PERF_TYPE_HARDWARE, PERF_COUNT_HW_STALLED_CYCLES_FRONTEND); }
+stalled-cycles-backend|idle-cycles-backend      { return sym(yyscanner, PERF_TYPE_HARDWARE, PERF_COUNT_HW_STALLED_CYCLES_BACKEND); }
+instructions                                    { return sym(yyscanner, PERF_TYPE_HARDWARE, PERF_COUNT_HW_INSTRUCTIONS); }
+cache-references                                { return sym(yyscanner, PERF_TYPE_HARDWARE, PERF_COUNT_HW_CACHE_REFERENCES); }
+cache-misses                                    { return sym(yyscanner, PERF_TYPE_HARDWARE, PERF_COUNT_HW_CACHE_MISSES); }
+branch-instructions|branches                    { return sym(yyscanner, PERF_TYPE_HARDWARE, PERF_COUNT_HW_BRANCH_INSTRUCTIONS); }
+branch-misses                                   { return sym(yyscanner, PERF_TYPE_HARDWARE, PERF_COUNT_HW_BRANCH_MISSES); }
+bus-cycles                                      { return sym(yyscanner, PERF_TYPE_HARDWARE, PERF_COUNT_HW_BUS_CYCLES); }
+ref-cycles                                      { return sym(yyscanner, PERF_TYPE_HARDWARE, PERF_COUNT_HW_REF_CPU_CYCLES); }
+cpu-clock                                       { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_CPU_CLOCK); }
+task-clock                                      { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_TASK_CLOCK); }
+page-faults|faults                              { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_PAGE_FAULTS); }
+minor-faults                                    { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_PAGE_FAULTS_MIN); }
+major-faults                                    { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_PAGE_FAULTS_MAJ); }
+context-switches|cs                             { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_CONTEXT_SWITCHES); }
+cpu-migrations|migrations                       { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_CPU_MIGRATIONS); }
+alignment-faults                                { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_ALIGNMENT_FAULTS); }
+emulation-faults                                { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_EMULATION_FAULTS); }
 
 L1-dcache|l1-d|l1d|L1-data              |
 L1-icache|l1-i|l1i|L1-instruction       |
@@ -87,14 +118,14 @@ LLC|L2					|
 dTLB|d-tlb|Data-TLB                     |
 iTLB|i-tlb|Instruction-TLB              |
 branch|branches|bpu|btb|bpc             |
-node                                    { return str(PE_NAME_CACHE_TYPE); }
+node                                    { return str(yyscanner, PE_NAME_CACHE_TYPE); }
 
 load|loads|read                         |
 store|stores|write                      |
 prefetch|prefetches                     |
 speculative-read|speculative-load       |
 refs|Reference|ops|access               |
-misses|miss                             { return str(PE_NAME_CACHE_OP_RESULT); }
+misses|miss                             { return str(yyscanner, PE_NAME_CACHE_OP_RESULT); }
 
         /*
          * These are event config hardcoded term names to be specified
@@ -102,20 +133,20 @@ misses|miss				{ return str(PE_NAME_CACHE_OP_RESULT); }
          * so we can put them here directly. In case the we have a conflict
          * in future, this needs to go into '//' condition block.
          */
-config                  { return term(PARSE_EVENTS__TERM_TYPE_CONFIG); }
-config1                 { return term(PARSE_EVENTS__TERM_TYPE_CONFIG1); }
-config2                 { return term(PARSE_EVENTS__TERM_TYPE_CONFIG2); }
-name                    { return term(PARSE_EVENTS__TERM_TYPE_NAME); }
-period                  { return term(PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD); }
-branch_type             { return term(PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE); }
+config                  { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_CONFIG); }
+config1                 { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_CONFIG1); }
+config2                 { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_CONFIG2); }
+name                    { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_NAME); }
+period                  { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD); }
+branch_type             { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE); }
 
 mem:                    { BEGIN(mem); return PE_PREFIX_MEM; }
-r{num_raw_hex}          { return raw(); }
-{num_dec}               { return value(10); }
-{num_hex}               { return value(16); }
+r{num_raw_hex}          { return raw(yyscanner); }
+{num_dec}               { return value(yyscanner, 10); }
+{num_hex}               { return value(yyscanner, 16); }
 
-{modifier_event}        { return str(PE_MODIFIER_EVENT); }
-{name}                  { return str(PE_NAME); }
+{modifier_event}        { return str(yyscanner, PE_MODIFIER_EVENT); }
+{name}                  { return str(yyscanner, PE_NAME); }
 "/"                     { return '/'; }
 -                       { return '-'; }
 ,                       { return ','; }
@@ -123,17 +154,17 @@ r{num_raw_hex}		{ return raw(); }
 =                       { return '='; }
 
 <mem>{
-{modifier_bp}           { return str(PE_MODIFIER_BP); }
+{modifier_bp}           { return str(yyscanner, PE_MODIFIER_BP); }
 :                       { return ':'; }
-{num_dec}               { return value(10); }
-{num_hex}               { return value(16); }
+{num_dec}               { return value(yyscanner, 10); }
+{num_hex}               { return value(yyscanner, 16); }
         /*
          * We need to separate 'mem:' scanner part, in order to get specific
          * modifier bits parsed out. Otherwise we would need to handle PE_NAME
          * and we'd need to parse it manually. During the escape from <mem>
          * state we need to put the escaping char back, so we dont miss it.
          */
-.                       { unput(*parse_events_text); BEGIN(INITIAL); }
+.                       { unput(*yytext); BEGIN(INITIAL); }
         /*
          * We destroy the scanner after reaching EOF,
          * but anyway just to be sure get back to INIT state.
@@ -143,7 +174,7 @@ r{num_raw_hex}		{ return raw(); }
 
 %%
 
-int parse_events_wrap(void)
+int parse_events_wrap(void *scanner __used)
 {
         return 1;
 }
diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index 362cc59332ae..9525c455d27f 100644
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -1,7 +1,8 @@
-
+%pure-parser
 %name-prefix "parse_events_"
-%parse-param {struct list_head *list_all}
-%parse-param {int *idx}
+%parse-param {void *_data}
+%parse-param {void *scanner}
+%lex-param {void* scanner}
 
 %{
 
@@ -12,8 +13,9 @@
 #include "types.h"
 #include "util.h"
 #include "parse-events.h"
+#include "parse-events-bison.h"
 
-extern int parse_events_lex (void);
+extern int parse_events_lex (YYSTYPE* lvalp, void* scanner);
 
 #define ABORT_ON(val) \
 do { \
@@ -23,6 +25,7 @@ do { \
 
 %}
 
+%token PE_START_EVENTS PE_START_TERMS
 %token PE_VALUE PE_VALUE_SYM PE_RAW PE_TERM
 %token PE_NAME
 %token PE_MODIFIER_EVENT PE_MODIFIER_BP
@@ -58,24 +61,33 @@ do { \
 }
 %%
 
+start:
+PE_START_EVENTS events
+|
+PE_START_TERMS  terms
+
 events:
 events ',' event | event
 
 event:
 event_def PE_MODIFIER_EVENT
 {
+        struct parse_events_data__events *data = _data;
+
         /*
          * Apply modifier on all events added by single event definition
          * (there could be more events added for multiple tracepoint
          * definitions via '*?'.
          */
         ABORT_ON(parse_events_modifier($1, $2));
-        parse_events_update_lists($1, list_all);
+        parse_events_update_lists($1, &data->list);
 }
 |
 event_def
 {
-        parse_events_update_lists($1, list_all);
+        struct parse_events_data__events *data = _data;
+
+        parse_events_update_lists($1, &data->list);
 }
 
 event_def: event_pmu |
@@ -89,9 +101,10 @@ event_def: event_pmu |
 event_pmu:
 PE_NAME '/' event_config '/'
 {
+        struct parse_events_data__events *data = _data;
         struct list_head *list = NULL;
 
-        ABORT_ON(parse_events_add_pmu(&list, idx, $1, $3));
+        ABORT_ON(parse_events_add_pmu(&list, &data->idx, $1, $3));
         parse_events__free_terms($3);
         $$ = list;
 }
@@ -99,94 +112,115 @@ PE_NAME '/' event_config '/'
 event_legacy_symbol:
 PE_VALUE_SYM '/' event_config '/'
 {
+        struct parse_events_data__events *data = _data;
         struct list_head *list = NULL;
         int type = $1 >> 16;
         int config = $1 & 255;
 
-        ABORT_ON(parse_events_add_numeric(&list, idx, type, config, $3));
+        ABORT_ON(parse_events_add_numeric(&list, &data->idx,
+                                          type, config, $3));
         parse_events__free_terms($3);
         $$ = list;
 }
 |
 PE_VALUE_SYM sep_slash_dc
 {
+        struct parse_events_data__events *data = _data;
         struct list_head *list = NULL;
         int type = $1 >> 16;
         int config = $1 & 255;
 
-        ABORT_ON(parse_events_add_numeric(&list, idx, type, config, NULL));
+        ABORT_ON(parse_events_add_numeric(&list, &data->idx,
+                                          type, config, NULL));
         $$ = list;
 }
 
 event_legacy_cache:
 PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT '-' PE_NAME_CACHE_OP_RESULT
 {
+        struct parse_events_data__events *data = _data;
         struct list_head *list = NULL;
 
-        ABORT_ON(parse_events_add_cache(&list, idx, $1, $3, $5));
+        ABORT_ON(parse_events_add_cache(&list, &data->idx, $1, $3, $5));
         $$ = list;
 }
 |
 PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT
 {
+        struct parse_events_data__events *data = _data;
         struct list_head *list = NULL;
 
-        ABORT_ON(parse_events_add_cache(&list, idx, $1, $3, NULL));
+        ABORT_ON(parse_events_add_cache(&list, &data->idx, $1, $3, NULL));
         $$ = list;
 }
 |
 PE_NAME_CACHE_TYPE
 {
+        struct parse_events_data__events *data = _data;
         struct list_head *list = NULL;
 
-        ABORT_ON(parse_events_add_cache(&list, idx, $1, NULL, NULL));
+        ABORT_ON(parse_events_add_cache(&list, &data->idx, $1, NULL, NULL));
         $$ = list;
 }
 
 event_legacy_mem:
 PE_PREFIX_MEM PE_VALUE ':' PE_MODIFIER_BP sep_dc
 {
+        struct parse_events_data__events *data = _data;
         struct list_head *list = NULL;
 
-        ABORT_ON(parse_events_add_breakpoint(&list, idx, (void *) $2, $4));
+        ABORT_ON(parse_events_add_breakpoint(&list, &data->idx,
+                                             (void *) $2, $4));
         $$ = list;
 }
 |
 PE_PREFIX_MEM PE_VALUE sep_dc
 {
+        struct parse_events_data__events *data = _data;
         struct list_head *list = NULL;
 
-        ABORT_ON(parse_events_add_breakpoint(&list, idx, (void *) $2, NULL));
+        ABORT_ON(parse_events_add_breakpoint(&list, &data->idx,
+                                             (void *) $2, NULL));
         $$ = list;
 }
 
 event_legacy_tracepoint:
 PE_NAME ':' PE_NAME
 {
+        struct parse_events_data__events *data = _data;
         struct list_head *list = NULL;
 
-        ABORT_ON(parse_events_add_tracepoint(&list, idx, $1, $3));
+        ABORT_ON(parse_events_add_tracepoint(&list, &data->idx, $1, $3));
         $$ = list;
 }
 
 event_legacy_numeric:
 PE_VALUE ':' PE_VALUE
 {
+        struct parse_events_data__events *data = _data;
         struct list_head *list = NULL;
 
-        ABORT_ON(parse_events_add_numeric(&list, idx, $1, $3, NULL));
+        ABORT_ON(parse_events_add_numeric(&list, &data->idx, $1, $3, NULL));
         $$ = list;
 }
 
 event_legacy_raw:
 PE_RAW
 {
+        struct parse_events_data__events *data = _data;
         struct list_head *list = NULL;
 
-        ABORT_ON(parse_events_add_numeric(&list, idx, PERF_TYPE_RAW, $1, NULL));
+        ABORT_ON(parse_events_add_numeric(&list, &data->idx,
+                                          PERF_TYPE_RAW, $1, NULL));
         $$ = list;
 }
 
+terms: event_config
+{
+        struct parse_events_data__terms *data = _data;
+        data->terms = $1;
+}
+
 event_config:
 event_config ',' event_term
 {
@@ -267,8 +301,7 @@ sep_slash_dc: '/' | ':' |
 
 %%
 
-void parse_events_error(struct list_head *list_all __used,
-                        int *idx __used,
+void parse_events_error(void *data __used, void *scanner __used,
                         char const *msg __used)
 {
 }
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index a119a5371699..74d0948ec368 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -80,6 +80,114 @@ static int pmu_format(char *name, struct list_head *format)
         return 0;
 }
 
+static int perf_pmu__new_alias(struct list_head *list, char *name, FILE *file)
+{
+        struct perf_pmu__alias *alias;
+        char buf[256];
+        int ret;
+
+        ret = fread(buf, 1, sizeof(buf), file);
+        if (ret == 0)
+                return -EINVAL;
+        buf[ret] = 0;
+
+        alias = malloc(sizeof(*alias));
+        if (!alias)
+                return -ENOMEM;
+
+        INIT_LIST_HEAD(&alias->terms);
+        ret = parse_events_terms(&alias->terms, buf);
+        if (ret) {
+                free(alias);
+                return ret;
+        }
+
+        alias->name = strdup(name);
+        list_add_tail(&alias->list, list);
+        return 0;
+}
+
+/*
+ * Process all the sysfs attributes located under the directory
+ * specified in 'dir' parameter.
+ */
+static int pmu_aliases_parse(char *dir, struct list_head *head)
+{
+        struct dirent *evt_ent;
+        DIR *event_dir;
+        int ret = 0;
+
+        event_dir = opendir(dir);
+        if (!event_dir)
+                return -EINVAL;
+
+        while (!ret && (evt_ent = readdir(event_dir))) {
+                char path[PATH_MAX];
+                char *name = evt_ent->d_name;
+                FILE *file;
+
+                if (!strcmp(name, ".") || !strcmp(name, ".."))
+                        continue;
+
+                snprintf(path, PATH_MAX, "%s/%s", dir, name);
+
+                ret = -EINVAL;
+                file = fopen(path, "r");
+                if (!file)
+                        break;
+                ret = perf_pmu__new_alias(head, name, file);
+                fclose(file);
+        }
+
+        closedir(event_dir);
+        return ret;
+}
+
+/*
+ * Reading the pmu event aliases definition, which should be located at:
+ * /sys/bus/event_source/devices/<dev>/events as sysfs group attributes.
+ */
+static int pmu_aliases(char *name, struct list_head *head)
+{
+        struct stat st;
+        char path[PATH_MAX];
+        const char *sysfs;
+
+        sysfs = sysfs_find_mountpoint();
+        if (!sysfs)
+                return -1;
+
+        snprintf(path, PATH_MAX,
+                 "%s/bus/event_source/devices/%s/events", sysfs, name);
+
+        if (stat(path, &st) < 0)
+                return -1;
+
+        if (pmu_aliases_parse(path, head))
+                return -1;
+
+        return 0;
+}
+
+static int pmu_alias_terms(struct perf_pmu__alias *alias,
+                           struct list_head *terms)
+{
+        struct parse_events__term *term, *clone;
+        LIST_HEAD(list);
+        int ret;
+
+        list_for_each_entry(term, &alias->terms, list) {
+                ret = parse_events__term_clone(&clone, term);
+                if (ret) {
+                        parse_events__free_terms(&list);
+                        return ret;
+                }
+                list_add_tail(&clone->list, &list);
+        }
+        list_splice(&list, terms);
+        return 0;
+}
+
 /*
  * Reading/parsing the default pmu type value, which should be
  * located at:
@@ -118,6 +226,7 @@ static struct perf_pmu *pmu_lookup(char *name)
 {
         struct perf_pmu *pmu;
         LIST_HEAD(format);
+        LIST_HEAD(aliases);
         __u32 type;
 
         /*
@@ -135,8 +244,12 @@ static struct perf_pmu *pmu_lookup(char *name)
         if (!pmu)
                 return NULL;
 
+        pmu_aliases(name, &aliases);
+
         INIT_LIST_HEAD(&pmu->format);
+        INIT_LIST_HEAD(&pmu->aliases);
         list_splice(&format, &pmu->format);
+        list_splice(&aliases, &pmu->aliases);
         pmu->name = strdup(name);
         pmu->type = type;
         return pmu;
@@ -279,6 +392,59 @@ int perf_pmu__config(struct perf_pmu *pmu, struct perf_event_attr *attr,
         return pmu_config(&pmu->format, attr, head_terms);
 }
 
+static struct perf_pmu__alias *pmu_find_alias(struct perf_pmu *pmu,
+                                              struct parse_events__term *term)
+{
+        struct perf_pmu__alias *alias;
+        char *name;
+
+        if (parse_events__is_hardcoded_term(term))
+                return NULL;
+
+        if (term->type_val == PARSE_EVENTS__TERM_TYPE_NUM) {
+                if (term->val.num != 1)
+                        return NULL;
+                if (pmu_find_format(&pmu->format, term->config))
+                        return NULL;
+                name = term->config;
+        } else if (term->type_val == PARSE_EVENTS__TERM_TYPE_STR) {
+                if (strcasecmp(term->config, "event"))
+                        return NULL;
+                name = term->val.str;
+        } else {
+                return NULL;
+        }
+
+        list_for_each_entry(alias, &pmu->aliases, list) {
+                if (!strcasecmp(alias->name, name))
+                        return alias;
+        }
+        return NULL;
+}
+
+/*
+ * Find alias in the terms list and replace it with the terms
+ * defined for the alias
+ */
+int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms)
+{
+        struct parse_events__term *term, *h;
+        struct perf_pmu__alias *alias;
+        int ret;
+
+        list_for_each_entry_safe(term, h, head_terms, list) {
+                alias = pmu_find_alias(pmu, term);
+                if (!alias)
+                        continue;
+                ret = pmu_alias_terms(alias, &term->list);
+                if (ret)
+                        return ret;
+                list_del(&term->list);
+                free(term);
+        }
+        return 0;
+}
+
 int perf_pmu__new_format(struct list_head *list, char *name,
                          int config, unsigned long *bits)
 {
diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
index 68c0db965e1f..535f2c5258ab 100644
--- a/tools/perf/util/pmu.h
+++ b/tools/perf/util/pmu.h
@@ -19,17 +19,26 @@ struct perf_pmu__format {
         struct list_head list;
 };
 
+struct perf_pmu__alias {
+        char *name;
+        struct list_head terms;
+        struct list_head list;
+};
+
 struct perf_pmu {
         char *name;
         __u32 type;
         struct list_head format;
+        struct list_head aliases;
         struct list_head list;
 };
 
 struct perf_pmu *perf_pmu__find(char *name);
 int perf_pmu__config(struct perf_pmu *pmu, struct perf_event_attr *attr,
                      struct list_head *head_terms);
-
+int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms);
+struct list_head *perf_pmu__alias(struct perf_pmu *pmu,
+                                struct list_head *head_terms);
 int perf_pmu_wrap(void);
 void perf_pmu_error(struct list_head *list, char *name, char const *msg);
 
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index febc0aeb3c66..6b305fbcc986 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -441,6 +441,16 @@ static void perf_tool__fill_defaults(struct perf_tool *tool)
                         tool->finished_round = process_finished_round_stub;
         }
 }
+ 
+void mem_bswap_32(void *src, int byte_size)
+{
+        u32 *m = src;
+        while (byte_size > 0) {
+                *m = bswap_32(*m);
+                byte_size -= sizeof(u32);
+                ++m;
+        }
+}
 
 void mem_bswap_64(void *src, int byte_size)
 {
diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index 877d78186f2c..c71a1a7b05ed 100644
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -80,6 +80,7 @@ struct branch_info *machine__resolve_bstack(struct machine *self,
 bool perf_session__has_traces(struct perf_session *self, const char *msg);
 
 void mem_bswap_64(void *src, int byte_size);
+void mem_bswap_32(void *src, int byte_size);
 void perf_event__attr_swap(struct perf_event_attr *attr);
 
 int perf_session__create_kernel_maps(struct perf_session *self);