Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60b00025 authored by Madhavan Srinivasan's avatar Madhavan Srinivasan Committed by Michael Ellerman
Browse files

powerpc/perf: factor out the event format field 



Factor out the format field structure for PowerISA v2.07.

Signed-off-by: default avatarMadhavan Srinivasan <maddy@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 4b6fad70

arch/powerpc/perf/isa207-common.c

+34 −0
Original line number Diff line number Diff line
@@ -12,6 +12,40 @@ 
 */

#include "isa207-common.h"



PMU_FORMAT_ATTR(event,		"config:0-49");

PMU_FORMAT_ATTR(pmcxsel,	"config:0-7");

PMU_FORMAT_ATTR(mark,		"config:8");

PMU_FORMAT_ATTR(combine,	"config:11");

PMU_FORMAT_ATTR(unit,		"config:12-15");

PMU_FORMAT_ATTR(pmc,		"config:16-19");

PMU_FORMAT_ATTR(cache_sel,	"config:20-23");

PMU_FORMAT_ATTR(sample_mode,	"config:24-28");

PMU_FORMAT_ATTR(thresh_sel,	"config:29-31");

PMU_FORMAT_ATTR(thresh_stop,	"config:32-35");

PMU_FORMAT_ATTR(thresh_start,	"config:36-39");

PMU_FORMAT_ATTR(thresh_cmp,	"config:40-49");



struct attribute *isa207_pmu_format_attr[] = {

	&format_attr_event.attr,

	&format_attr_pmcxsel.attr,

	&format_attr_mark.attr,

	&format_attr_combine.attr,

	&format_attr_unit.attr,

	&format_attr_pmc.attr,

	&format_attr_cache_sel.attr,

	&format_attr_sample_mode.attr,

	&format_attr_thresh_sel.attr,

	&format_attr_thresh_stop.attr,

	&format_attr_thresh_start.attr,

	&format_attr_thresh_cmp.attr,

	NULL,

};



struct attribute_group isa207_pmu_format_group = {

	.name = "format",

	.attrs = isa207_pmu_format_attr,

};



static inline bool event_is_fab_match(u64 event)

{

	/* Only check pmc, unit and pmcxsel, ignore the edge bit (0) */

arch/powerpc/perf/power8-pmu.c

+4 −35
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ enum { 
#define	POWER8_MMCRA_IFM2		0x0000000080000000UL

#define	POWER8_MMCRA_IFM3		0x00000000C0000000UL



/* PowerISA v2.07 format attribute structure*/

extern struct attribute_group isa207_pmu_format_group;



/* Table of alternatives, sorted by column 0 */

static const unsigned int event_alternatives[][MAX_ALT] = {

	{ PM_MRK_ST_CMPL,		PM_MRK_ST_CMPL_ALT },
@@ -175,42 +178,8 @@ static struct attribute_group power8_pmu_events_group = { 
	.attrs = power8_events_attr,

};



PMU_FORMAT_ATTR(event,		"config:0-49");

PMU_FORMAT_ATTR(pmcxsel,	"config:0-7");

PMU_FORMAT_ATTR(mark,		"config:8");

PMU_FORMAT_ATTR(combine,	"config:11");

PMU_FORMAT_ATTR(unit,		"config:12-15");

PMU_FORMAT_ATTR(pmc,		"config:16-19");

PMU_FORMAT_ATTR(cache_sel,	"config:20-23");

PMU_FORMAT_ATTR(sample_mode,	"config:24-28");

PMU_FORMAT_ATTR(thresh_sel,	"config:29-31");

PMU_FORMAT_ATTR(thresh_stop,	"config:32-35");

PMU_FORMAT_ATTR(thresh_start,	"config:36-39");

PMU_FORMAT_ATTR(thresh_cmp,	"config:40-49");



static struct attribute *power8_pmu_format_attr[] = {

	&format_attr_event.attr,

	&format_attr_pmcxsel.attr,

	&format_attr_mark.attr,

	&format_attr_combine.attr,

	&format_attr_unit.attr,

	&format_attr_pmc.attr,

	&format_attr_cache_sel.attr,

	&format_attr_sample_mode.attr,

	&format_attr_thresh_sel.attr,

	&format_attr_thresh_stop.attr,

	&format_attr_thresh_start.attr,

	&format_attr_thresh_cmp.attr,

	NULL,

};



static struct attribute_group power8_pmu_format_group = {

	.name = "format",

	.attrs = power8_pmu_format_attr,

};



static const struct attribute_group *power8_pmu_attr_groups[] = {

	&power8_pmu_format_group,

	&isa207_pmu_format_group,

	&power8_pmu_events_group,

	NULL,

};

arch/powerpc/perf/power9-pmu.c

+4 −35
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ enum { 
#define POWER9_MMCRA_IFM2		0x0000000080000000UL

#define POWER9_MMCRA_IFM3		0x00000000C0000000UL



/* PowerISA v2.07 format attribute structure*/

extern struct attribute_group isa207_pmu_format_group;



GENERIC_EVENT_ATTR(cpu-cycles,			PM_CYC);

GENERIC_EVENT_ATTR(stalled-cycles-frontend,	PM_ICT_NOSLOT_CYC);

GENERIC_EVENT_ATTR(stalled-cycles-backend,	PM_CMPLU_STALL);
@@ -90,42 +93,8 @@ static struct attribute_group power9_pmu_events_group = { 
	.attrs = power9_events_attr,

};



PMU_FORMAT_ATTR(event,		"config:0-49");

PMU_FORMAT_ATTR(pmcxsel,	"config:0-7");

PMU_FORMAT_ATTR(mark,		"config:8");

PMU_FORMAT_ATTR(combine,	"config:11");

PMU_FORMAT_ATTR(unit,		"config:12-15");

PMU_FORMAT_ATTR(pmc,		"config:16-19");

PMU_FORMAT_ATTR(cache_sel,	"config:20-23");

PMU_FORMAT_ATTR(sample_mode,	"config:24-28");

PMU_FORMAT_ATTR(thresh_sel,	"config:29-31");

PMU_FORMAT_ATTR(thresh_stop,	"config:32-35");

PMU_FORMAT_ATTR(thresh_start,	"config:36-39");

PMU_FORMAT_ATTR(thresh_cmp,	"config:40-49");



static struct attribute *power9_pmu_format_attr[] = {

	&format_attr_event.attr,

	&format_attr_pmcxsel.attr,

	&format_attr_mark.attr,

	&format_attr_combine.attr,

	&format_attr_unit.attr,

	&format_attr_pmc.attr,

	&format_attr_cache_sel.attr,

	&format_attr_sample_mode.attr,

	&format_attr_thresh_sel.attr,

	&format_attr_thresh_stop.attr,

	&format_attr_thresh_start.attr,

	&format_attr_thresh_cmp.attr,

	NULL,

};



static struct attribute_group power9_pmu_format_group = {

	.name = "format",

	.attrs = power9_pmu_format_attr,

};



static const struct attribute_group *power9_pmu_attr_groups[] = {

	&power9_pmu_format_group,

	&isa207_pmu_format_group,

	&power9_pmu_events_group,

	NULL,

};