Revert "perf pmu: Fix pmu events parsing rule"

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=4a35a9027f64d588d2fd9436dda4126e8d5647d7
Commit:     4a35a9027f64d588d2fd9436dda4126e8d5647d7
Parent:     5981ec36688c49b7262f399c1a10edecc6e55ed2
Author:     Arnaldo Carvalho de Melo <acme at redhat.com>
AuthorDate: Mon May 7 15:27:01 2018 -0300
Committer:  Arnaldo Carvalho de Melo <acme at redhat.com>
CommitDate: Mon May 7 16:28:10 2018 -0300

    Revert "perf pmu: Fix pmu events parsing rule"
    
    As reported by Adrian Hunter, this breaks intel_pt event parsing:
    
      # perf record -e intel_pt//u uname
      event syntax error: 'intel_pt//u'
                                   \___ parser error
      Run 'perf list' for a list of valid events
    
       Usage: perf record [<options>] [<command>]
          or: perf record [<options>] -- <command> [<options>]
    
          -e, --event <event>   event selector. use 'perf list' to list available events
      #
    
    This reverts commit 9a4a931ce847f4aaa12edf11b2e050e18bf45910.
    
    Reported-by: Adrian Hunter <adrian.hunter at intel.com>
    Cc: Alexander Shishkin <alexander.shishkin at linux.intel.com>
    Cc: Andi Kleen <ak at linux.intel.com>
    Cc: David Ahern <dsahern at gmail.com>
    Cc: Jiri Olsa <jolsa at kernel.org>
    Cc: Kan Liang <kan.liang at linux.intel.com>
    Cc: Namhyung Kim <namhyung at kernel.org>
    Cc: Peter Zijlstra <peterz at infradead.org>
    Cc: Wang Nan <wangnan0 at huawei.com>
    Link: https://lkml.kernel.org/n/tip-ye1o2mji7x68xotiot1tn1gp@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>
---
 tools/perf/util/parse-events.y | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index d14464c42714..7afeb80cc39e 100644
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -224,15 +224,15 @@ event_def: event_pmu |
 	   event_bpf_file
 
 event_pmu:
-PE_NAME '/' event_config '/'
+PE_NAME opt_event_config
 {
 	struct list_head *list, *orig_terms, *terms;
 
-	if (parse_events_copy_term_list($3, &orig_terms))
+	if (parse_events_copy_term_list($2, &orig_terms))
 		YYABORT;
 
 	ALLOC_LIST(list);
-	if (parse_events_add_pmu(_parse_state, list, $1, $3, false)) {
+	if (parse_events_add_pmu(_parse_state, list, $1, $2, false)) {
 		struct perf_pmu *pmu = NULL;
 		int ok = 0;
 		char *pattern;
@@ -262,7 +262,7 @@ PE_NAME '/' event_config '/'
 		if (!ok)
 			YYABORT;
 	}
-	parse_events_terms__delete($3);
+	parse_events_terms__delete($2);
 	parse_events_terms__delete(orig_terms);
 	$$ = list;
 }