Commit 62b3feaa authored by John Garry's avatar John Garry Committed by Ge Hu
Browse files

perf test: Add pmu-events test for aliases with hyphens 

driver inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAMH2B


CVE: NA

----------------------------------------------------------------------

Add a test for aliases with hyphens in the name to ensure that the
pmu-events tables are as expects. There should be no reason why these sort
of aliases would be treated differently, but no harm in checking.

Fixes: 231bb2aa ("perf pmu: Support event aliases for non cpu//pmus")
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarzhangqz <14294317+zwx1160575@user.noreply.gitee.com>
parent 94a4acf5

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

+16 −0
Original line number Diff line number Diff line
@@ -18,6 +18,22 @@ 
	    "Invert": "0",

	    "EdgeDetect": "0"

  },

  {

	    "Unit": "CBO",

	    "EventCode": "0xE0",

	    "UMask": "0x00",

	    "EventName": "event-hyphen",

	    "BriefDescription": "UNC_CBO_HYPHEN",

	    "PublicDescription": "UNC_CBO_HYPHEN"

  },

  {

	    "Unit": "CBO",

	    "EventCode": "0xC0",

	    "UMask": "0x00",

	    "EventName": "event-two-hyph",

	    "BriefDescription": "UNC_CBO_TWO_HYPH",

	    "PublicDescription": "UNC_CBO_TWO_HYPH"

  },

  {

	    "EventCode": "0x7",

	    "EventName": "uncore_hisi_l3c.rd_hit_cpipe",

tools/perf/tests/pmu-events.c

+32 −0
Original line number Diff line number Diff line
@@ -141,6 +141,34 @@ static const struct perf_pmu_test_event unc_cbo_xsnp_response_miss_eviction = { 
	.matching_pmu = "uncore_cbox_0",

};



static const struct perf_pmu_test_event uncore_hyphen = {

	.event = {

		.name = "event-hyphen",

		.event = "umask=0x00,event=0xe0",

		.desc = "Unit: uncore_cbox UNC_CBO_HYPHEN",

		.topic = "uncore",

		.long_desc = "UNC_CBO_HYPHEN",

		.pmu = "uncore_cbox",

	},

	.alias_str = "umask=0,event=0xe0",

	.alias_long_desc = "UNC_CBO_HYPHEN",

	.matching_pmu = "uncore_cbox_0",

};



static const struct perf_pmu_test_event uncore_two_hyph = {

	.event = {

		.name = "event-two-hyph",

		.event = "umask=0x00,event=0xc0",

		.desc = "Unit: uncore_cbox UNC_CBO_TWO_HYPH",

		.topic = "uncore",

		.long_desc = "UNC_CBO_TWO_HYPH",

		.pmu = "uncore_cbox",

	},

	.alias_str = "umask=0,event=0xc0",

	.alias_long_desc = "UNC_CBO_TWO_HYPH",

	.matching_pmu = "uncore_cbox_0",

};



static const struct perf_pmu_test_event uncore_hisi_l3c_rd_hit_cpipe = {

	.event = {

		.name = "uncore_hisi_l3c.rd_hit_cpipe",
@@ -186,6 +214,8 @@ static const struct perf_pmu_test_event uncore_imc_cache_hits = { 
static const struct perf_pmu_test_event *uncore_events[] = {

	&uncore_hisi_ddrc_flux_wcmd,

	&unc_cbo_xsnp_response_miss_eviction,

	&uncore_hyphen,

	&uncore_two_hyph,

	&uncore_hisi_l3c_rd_hit_cpipe,

	&uncore_imc_free_running_cache_miss,

	&uncore_imc_cache_hits,
@@ -652,6 +682,8 @@ static struct perf_pmu_test_pmu test_pmus[] = { 
		},

		.aliases = {

			&unc_cbo_xsnp_response_miss_eviction,

			&uncore_hyphen,

			&uncore_two_hyph,

		},

	},

	{