Commit 9ea150a8 authored Sep 01, 2023 by Ian Rogers Committed by Arnaldo Carvalho de Melo Sep 02, 2023

perf parse-events: Fixes relating to no_value terms



A term may have no value in which case it is assumed to have a value
of 1. It doesn't just apply to alias/event terms so change the
parse_events_term__to_strbuf assert.

Commit 99e7138e ("perf tools: Fail on using multiple bits long
terms without value") made it so that no_value terms could only be for a
single bit. Prior to commit 64199ae4 ("perf parse-events: Fix
propagation of term's no_value when cloning") this missed a test case
where config1 had no_value.

Fixes: 64199ae4 ("perf parse-events: Fix propagation of term's no_value when cloning")
Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20230901233949.2930562-1-irogers@google.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 64199ae4

tools/perf/tests/parse-events.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2170,7 +2170,7 @@ static const struct evlist_test test__events[] = {

		static const struct evlist_test test__events_pmu[] = {
		{
		.name = "cpu/config=10,config1,config2=3,period=1000/u",
		.name = "cpu/config=10,config1=1,config2=3,period=1000/u",
		.valid = test__pmu_cpu_valid,
		.check = test__checkevent_pmu,
		/* 0 */

tools/perf/util/parse-events.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2607,7 +2607,7 @@ int parse_events_term__to_strbuf(struct list_head term_list, struct strbuf sb)

		if (term->type_val == PARSE_EVENTS__TERM_TYPE_NUM)
		if (term->no_value) {
		assert(term->type_term == PARSE_EVENTS__TERM_TYPE_USER);
		assert(term->val.num == 1);
		ret = strbuf_addf(sb, "%s", term->config);
		} else
		ret = strbuf_addf(sb, "%s=%#"PRIx64, term->config, term->val.num);

tools/perf/util/parse-events.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -124,8 +124,8 @@ struct parse_events_term {
		*/
		bool weak;
		/**
		* @no_value: Is there no value. TODO: this should really be part of
		* type_val.
		* @no_value: Is there no value. If a numeric term has no value then the
		* value is assumed to be 1. An event name also has no value.
		*/
		bool no_value;
		};