Commit 2aadca4b authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf parse-events: Avoid error when assigning a legacy cache term 



Avoid the parser error:
'''
$ perf stat -e 'cycles/name=l1d/' true
event syntax error: 'cycles/name=l1d/'
                                \___ parser error
'''
by combining the name and legacy cache cases in the parser.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Tested-by: default avatarKan Liang <kan.liang@linux.intel.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ahmad Yasin <ahmad.yasin@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Caleb Biggers <caleb.biggers@intel.com>
Cc: Edward Baker <edward.baker@intel.com>
Cc: Florian Fischer <florian.fischer@muhq.space>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kang Minchul <tegongkang@gmail.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Perry Taylor <perry.taylor@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Samantha Alt <samantha.alt@intel.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Sumanth Korikkar <sumanthk@linux.ibm.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Tiezhu Yang <yangtiezhu@loongson.cn>
Cc: Weilin Wang <weilin.wang@intel.com>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Cc: Yang Jihong <yangjihong1@huawei.com>
Link: https://lore.kernel.org/r/20230502223851.2234828-36-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e831f3cc

tools/perf/tests/parse-events.c

+21 −0
Original line number Diff line number Diff line
@@ -1509,6 +1509,16 @@ static int test__term_equal_term(struct evlist *evlist) 
	return TEST_OK;

}



static int test__term_equal_legacy(struct evlist *evlist)

{

	struct evsel *evsel = evlist__first(evlist);



	TEST_ASSERT_VAL("wrong type", evsel->core.attr.type == PERF_TYPE_HARDWARE);

	TEST_ASSERT_VAL("wrong config", test_config(evsel, PERF_COUNT_HW_CPU_CYCLES));

	TEST_ASSERT_VAL("wrong name setting", strcmp(evsel->name, "l1d") == 0);

	return TEST_OK;

}



#ifdef HAVE_LIBTRACEEVENT

static int count_tracepoints(void)

{
@@ -1886,6 +1896,11 @@ static const struct evlist_test test__events[] = { 
		.check = test__term_equal_term,

		/* 8 */

	},

	{

		.name  = "cycles/name=l1d/",

		.check = test__term_equal_legacy,

		/* 9 */

	},

};



static const struct evlist_test test__events_pmu[] = {
@@ -2073,6 +2088,12 @@ static const struct evlist_test test__events_pmu[] = { 
		.check = test__term_equal_term,

		/* 0 */

	},

	{

		.name  = "cpu/cycles,name=l1d/",

		.valid = test__pmu_cpu_valid,

		.check = test__term_equal_legacy,

		/* 1 */

	},

};



struct terms_test {

tools/perf/util/parse-events.y

+6 −4
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static void free_list_evsel(struct list_head* list_evsel) 
%type <str> PE_EVENT_NAME

%type <str> PE_KERNEL_PMU_EVENT PE_PMU_EVENT_FAKE

%type <str> PE_DRV_CFG_TERM

%type <str> name_or_raw

%type <str> name_or_raw name_or_legacy

%destructor { free ($$); } <str>

%type <term> event_term

%destructor { parse_events_term__delete ($$); } <term>
@@ -739,6 +739,8 @@ event_term 


name_or_raw: PE_RAW | PE_NAME | PE_LEGACY_CACHE



name_or_legacy: PE_NAME | PE_LEGACY_CACHE



event_term:

PE_RAW

{
@@ -752,7 +754,7 @@ PE_RAW 
	$$ = term;

}

|

name_or_raw '=' PE_NAME

name_or_raw '=' name_or_legacy

{

	struct parse_events_term *term;
@@ -826,7 +828,7 @@ PE_TERM_HW 
	$$ = term;

}

|

PE_TERM '=' PE_NAME

PE_TERM '=' name_or_legacy

{

	struct parse_events_term *term;
@@ -872,7 +874,7 @@ PE_TERM 
	$$ = term;

}

|

name_or_raw array '=' PE_NAME

name_or_raw array '=' name_or_legacy

{

	struct parse_events_term *term;