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

perf pmu-events: Change perpkg to be a bool 



Switch to a more natural bool rather than string encoding, where NULL
implicitly meant false. The only value of 'PerPkg' in the event json
is '1'.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Caleb Biggers <caleb.biggers@intel.com>
Cc: Eduard Zingerman <eddyz87@gmail.com>
Cc: Florian Fischer <florian.fischer@muhq.space>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jing Zhang <renyu.zj@linux.alibaba.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.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: Sandipan Das <sandipan.das@amd.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-stm32@st-md-mailman.stormreply.com
Link: https://lore.kernel.org/r/20230219092848.639226-7-irogers@google.com


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

tools/perf/pmu-events/jevents.py

+1 −1
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ static void decompress_event(int offset, struct pmu_event *pe) 
{

\tconst char *p = &big_c_string[offset];

""")

  enum_attributes = ['aggr_mode', 'deprecated']

  enum_attributes = ['aggr_mode', 'deprecated', 'perpkg']

  for attr in _json_event_attributes:

    _args.output_file.write(f'\n\tpe->{attr} = ')

    if attr in enum_attributes:

tools/perf/pmu-events/pmu-events.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ struct pmu_event { 
	const char *long_desc;

	const char *pmu;

	const char *unit;

	const char *perpkg;

	bool perpkg;

	bool deprecated;

};

tools/perf/tests/pmu-events.c

+2 −2
Original line number Diff line number Diff line
@@ -325,8 +325,8 @@ static int compare_pmu_events(const struct pmu_event *e1, const struct pmu_event 
		return -1;

	}



	if (!is_same(e1->perpkg, e2->perpkg)) {

		pr_debug2("testing event e1 %s: mismatched perpkg, %s vs %s\n",

	if (e1->perpkg != e2->perpkg) {

		pr_debug2("testing event e1 %s: mismatched perpkg, %d vs %d\n",

			  e1->name, e1->perpkg, e2->perpkg);

		return -1;

	}

tools/perf/util/pmu.c

+4 −7
Original line number Diff line number Diff line
@@ -328,17 +328,15 @@ static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name, 
	struct parse_events_term *term;

	struct perf_pmu_alias *alias;

	int ret;

	int num;

	char newval[256];

	char *long_desc = NULL, *topic = NULL, *unit = NULL, *perpkg = NULL,

	     *pmu_name = NULL;

	bool deprecated = false;

	char *long_desc = NULL, *topic = NULL, *unit = NULL, *pmu_name = NULL;

	bool deprecated = false, perpkg = false;



	if (pe) {

		long_desc = (char *)pe->long_desc;

		topic = (char *)pe->topic;

		unit = (char *)pe->unit;

		perpkg = (char *)pe->perpkg;

		perpkg = pe->perpkg;

		deprecated = pe->deprecated;

		pmu_name = (char *)pe->pmu;

	}
@@ -350,7 +348,7 @@ static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name, 
	INIT_LIST_HEAD(&alias->terms);

	alias->scale = 1.0;

	alias->unit[0] = '\0';

	alias->per_pkg = false;

	alias->per_pkg = perpkg;

	alias->snapshot = false;

	alias->deprecated = deprecated;
@@ -402,7 +400,6 @@ static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name, 
			return -1;

		snprintf(alias->unit, sizeof(alias->unit), "%s", unit);

	}

	alias->per_pkg = perpkg && sscanf(perpkg, "%d", &num) == 1 && num == 1;

	alias->str = strdup(newval);

	alias->pmu_name = pmu_name ? strdup(pmu_name) : NULL;