Commit 8ee465a1 authored by John Garry's avatar John Garry Committed by Arnaldo Carvalho de Melo
Browse files

perf test: Add pmu-events sys event support 



Add support for system events, along with core and uncore events.

Support for a sample PMU is also added.

Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linuxarm@huawei.com
Link: https //lore.kernel.org/r/1627566986-30605-12-git-send-email-john.garry@huawei.com
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 5abd3988

tools/perf/pmu-events/arch/test/test_soc/sys/uncore.json

0 → 100644
+9 −0
Original line number Original line Diff line number Diff line 
[

  {

           "BriefDescription": "ddr write-cycles event",

           "EventCode": "0x2b",

           "EventName": "sys_ddr_pmu.write_cycles",

           "Unit": "sys_ddr_pmu",

           "Compat": "v8"

   },

]

tools/perf/tests/pmu-events.c

+74 −3
Original line number Original line Diff line number Diff line
@@ -194,6 +194,25 @@ static const struct perf_pmu_test_event *uncore_events[] = { 
	NULL

	NULL

};

};





static const struct perf_pmu_test_event sys_ddr_pmu_write_cycles = {

	.event = {

		.name = "sys_ddr_pmu.write_cycles",

		.event = "event=0x2b",

		.desc = "ddr write-cycles event. Unit: uncore_sys_ddr_pmu ",

		.topic = "uncore",

		.pmu = "uncore_sys_ddr_pmu",

		.compat = "v8",

	},

	.alias_str = "event=0x2b",

	.alias_long_desc = "ddr write-cycles event. Unit: uncore_sys_ddr_pmu ",

	.matching_pmu = "uncore_sys_ddr_pmu",

};



static const struct perf_pmu_test_event *sys_events[] = {

	&sys_ddr_pmu_write_cycles,

	NULL

};



static bool is_same(const char *reference, const char *test)

static bool is_same(const char *reference, const char *test)

{

{

	if (!reference && !test)

	if (!reference && !test)
@@ -222,6 +241,18 @@ static struct pmu_events_map *__test_pmu_get_events_map(void) 
	return NULL;

	return NULL;

}

}





static struct pmu_event *__test_pmu_get_sys_events_table(void)

{

	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(struct pmu_event *e1, const struct pmu_event *e2)

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

{

{

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

	if (!is_same(e1->desc, e2->desc)) {
@@ -344,15 +375,17 @@ static int compare_alias_to_test_event(struct perf_pmu_alias *alias, 
/* Verify generated events from pmu-events.c are as expected */

/* Verify generated events from pmu-events.c are as expected */

static int test_pmu_event_table(void)

static int test_pmu_event_table(void)

{

{

	struct pmu_event *sys_event_tables = __test_pmu_get_sys_events_table();

	struct pmu_events_map *map = __test_pmu_get_events_map();

	struct pmu_events_map *map = __test_pmu_get_events_map();

	struct pmu_event *table;

	struct pmu_event *table;

	int map_events = 0, expected_events;

	int map_events = 0, expected_events;





	/* ignore 2x sentinels */

	/* ignore 3x sentinels */

	expected_events = ARRAY_SIZE(core_events) +

	expected_events = ARRAY_SIZE(core_events) +

			  ARRAY_SIZE(uncore_events) - 2;

			  ARRAY_SIZE(uncore_events) +

			  ARRAY_SIZE(sys_events) - 3;





	if (!map)

	if (!map || !sys_event_tables)

		return -1;

		return -1;





	for (table = map->table; table->name; table++) {

	for (table = map->table; table->name; table++) {
@@ -386,6 +419,33 @@ static int test_pmu_event_table(void) 
		}

		}

	}

	}





	for (table = sys_event_tables; table->name; table++) {

		struct perf_pmu_test_event const **test_event_table;

		bool found = false;



		test_event_table = &sys_events[0];



		for (; *test_event_table; test_event_table++) {

			struct perf_pmu_test_event const *test_event = *test_event_table;

			struct pmu_event const *event = &test_event->event;



			if (strcmp(table->name, event->name))

				continue;

			found = true;

			map_events++;



			if (compare_pmu_events(table, event))

				return -1;



			pr_debug("testing sys event table %s: pass\n", table->name);

		}

		if (!found) {

			pr_debug("testing event table: could not find event %s\n",

				   table->name);

			return -1;

		}

	}



	if (map_events != expected_events) {

	if (map_events != expected_events) {

		pr_err("testing event table: found %d, but expected %d\n",

		pr_err("testing event table: found %d, but expected %d\n",

		       map_events, expected_events);

		       map_events, expected_events);
@@ -474,6 +534,7 @@ static int __test_uncore_pmu_event_aliases(struct perf_pmu_test_pmu *test_pmu) 
	if (!map)

	if (!map)

		return -1;

		return -1;

	pmu_add_cpu_aliases_map(&aliases, pmu, map);

	pmu_add_cpu_aliases_map(&aliases, pmu, map);

	pmu_add_sys_aliases(&aliases, pmu);





	/* Count how many aliases we generated */

	/* Count how many aliases we generated */

	list_for_each_entry(alias, &aliases, list)

	list_for_each_entry(alias, &aliases, list)
@@ -576,6 +637,16 @@ static struct perf_pmu_test_pmu test_pmus[] = { 
			&uncore_imc_cache_hits,

			&uncore_imc_cache_hits,

		},

		},

	},

	},

	{

		.pmu = {

			.name = (char *)"uncore_sys_ddr_pmu0",

			.is_uncore = 1,

			.id = (char *)"v8",

		},

		.aliases = {

			&sys_ddr_pmu_write_cycles,

		},

	},

};

};





/* Test that aliases generated are as expected */

/* Test that aliases generated are as expected */