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

perf pmu-events: Hide pmu_sys_event_tables 



Move usage of the table to pmu-events.c so it may be hidden. By
abstracting the table the implementation can later be changed.

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: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.garry@huawei.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Will Deacon <will@kernel.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20220812230949.683239-6-irogers@google.com


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

tools/perf/pmu-events/empty-pmu-events.c

+36 −1
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
 * The test cpu/soc is provided for testing.

 */

#include "pmu-events/pmu-events.h"

#include <string.h>

#include <stddef.h>



static const struct pmu_event pme_test_soc_cpu[] = {

	{
@@ -145,7 +147,12 @@ static const struct pmu_event pme_test_soc_sys[] = { 
	},

};



const struct pmu_sys_events pmu_sys_event_tables[] = {

struct pmu_sys_events {

	const char *name;

	const struct pmu_event *table;

};



static const struct pmu_sys_events pmu_sys_event_tables[] = {

	{

		.table = pme_test_soc_sys,

		.name = "pme_test_soc_sys",
@@ -154,3 +161,31 @@ const struct pmu_sys_events pmu_sys_event_tables[] = { 
		.table = 0

	},

};



const struct pmu_event *find_sys_events_table(const char *name)

{

	for (const struct pmu_sys_events *tables = &pmu_sys_event_tables[0];

	     tables->name;

	     tables++) {

		if (!strcmp(tables->name, name))

			return tables->table;

	}

	return NULL;

}



int pmu_for_each_sys_event(pmu_event_iter_fn fn, void *data)

{

	for (const struct pmu_sys_events *tables = &pmu_sys_event_tables[0];

	     tables->name;

	     tables++) {

		for (const struct pmu_event *pe = &tables->table[0];

		     pe->name || pe->metric_group || pe->metric_name;

		     pe++) {

			int ret = fn(pe, data);



			if (ret)

				return ret;

		}

	}

	return 0;

}

tools/perf/pmu-events/jevents.py

+42 −3
Original line number Diff line number Diff line
@@ -371,8 +371,14 @@ def print_mapping_table(archs: Sequence[str]) -> None: 


def print_system_mapping_table() -> None:

  """C struct mapping table array for tables from /sys directories."""

  _args.output_file.write(

      '\nconst struct pmu_sys_events pmu_sys_event_tables[] = {\n')

  _args.output_file.write("""

struct pmu_sys_events {

\tconst char *name;

\tconst struct pmu_event *table;

};



static const struct pmu_sys_events pmu_sys_event_tables[] = {

""")

  for tblname in _sys_event_tables:

    _args.output_file.write(f"""\t{{

\t\t.table = {tblname},
@@ -383,6 +389,34 @@ def print_system_mapping_table() -> None: 
\t\t.table = 0

\t},

};



const struct pmu_event *find_sys_events_table(const char *name)

{

        for (const struct pmu_sys_events *tables = &pmu_sys_event_tables[0];

             tables->name;

             tables++) {

                if (!strcmp(tables->name, name))

                        return tables->table;

        }

        return NULL;

}



int pmu_for_each_sys_event(pmu_event_iter_fn fn, void *data)

{

        for (const struct pmu_sys_events *tables = &pmu_sys_event_tables[0];

             tables->name;

             tables++) {

                for (const struct pmu_event *pe = &tables->table[0];

                     pe->name || pe->metric_group || pe->metric_name;

                     pe++) {

                        int ret = fn(pe, data);



                        if (ret)

                                return ret;

                }

        }

        return 0;

}

""")
@@ -414,7 +448,12 @@ def main() -> None: 
      'output_file', type=argparse.FileType('w'), nargs='?', default=sys.stdout)

  _args = ap.parse_args()



  _args.output_file.write("#include \"pmu-events/pmu-events.h\"\n")

  _args.output_file.write("""

#include "pmu-events/pmu-events.h"

#include <string.h>

#include <stddef.h>



""")

  archs = []

  for item in os.scandir(_args.starting_dir):

    if not item.is_dir():

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

+5 −6
Original line number Diff line number Diff line
@@ -43,16 +43,15 @@ struct pmu_events_map { 
	const struct pmu_event *table;

};



struct pmu_sys_events {

	const char *name;

	const struct pmu_event *table;

};



/*

 * Global table mapping each known CPU for the architecture to its

 * table of PMU events.

 */

extern const struct pmu_events_map pmu_events_map[];

extern const struct pmu_sys_events pmu_sys_event_tables[];



const struct pmu_event *find_sys_events_table(const char *name);



typedef int (*pmu_event_iter_fn)(const struct pmu_event *pe, void *data);

int pmu_for_each_sys_event(pmu_event_iter_fn fn, void *data);



#endif

tools/perf/tests/pmu-events.c

+1 −13
Original line number Diff line number Diff line
@@ -286,18 +286,6 @@ static const struct pmu_events_map *__test_pmu_get_events_map(void) 
	return NULL;

}



static const struct pmu_event *__test_pmu_get_sys_events_table(void)

{

	const struct pmu_sys_events *tables = &pmu_sys_event_tables[0];



	for ( ; tables->name; tables++) {

		if (!strcmp("pme_test_soc_sys", tables->name))

			return tables->table;

	}



	return NULL;

}



static int compare_pmu_events(const struct pmu_event *e1, const struct pmu_event *e2)

{

	if (!is_same(e1->name, e2->name)) {
@@ -451,7 +439,7 @@ static int compare_alias_to_test_event(struct perf_pmu_alias *alias, 
static int test__pmu_event_table(struct test_suite *test __maybe_unused,

				 int subtest __maybe_unused)

{

	const struct pmu_event *sys_event_tables = __test_pmu_get_sys_events_table();

	const struct pmu_event *sys_event_tables = find_sys_events_table("pme_test_soc_sys");

	const struct pmu_events_map *map = __test_pmu_get_events_map();

	const struct pmu_event *table;

	int map_events = 0, expected_events;

tools/perf/util/pmu.c

+0 −27
Original line number Diff line number Diff line
@@ -868,33 +868,6 @@ static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu) 
	pmu_add_cpu_aliases_map(head, pmu, map);

}



void pmu_for_each_sys_event(pmu_sys_event_iter_fn fn, void *data)

{

	int i = 0;



	while (1) {

		const struct pmu_sys_events *event_table;

		int j = 0;



		event_table = &pmu_sys_event_tables[i++];



		if (!event_table->table)

			break;



		while (1) {

			const struct pmu_event *pe = &event_table->table[j++];

			int ret;



			if (!pe->name && !pe->metric_group && !pe->metric_name)

				break;



			ret = fn(pe, data);

			if (ret)

				break;

		}

	}

}



struct pmu_sys_event_iter_data {

	struct list_head *head;

	struct perf_pmu *pmu;