Commit aacb0718 authored by Zide Chen's avatar Zide Chen Committed by Peter Zijlstra
Browse files

perf/x86/intel/uncore: Support uncore constraint ranges 



Add UNCORE_EVENT_CONSTRAINT_RANGE macro for uncore constraints,
similar to INTEL_EVENT_CONSTRAINT_RANGE, to reduce duplication when
defining consecutive uncore event constraints.

No functional change intended.

Suggested-by: default avatarDapeng Mi <dapeng1.mi@linux.intel.com>
Signed-off-by: default avatarZide Chen <zide.chen@intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarDapeng Mi <dapeng1.mi@linux.intel.com>
Link: https://patch.msgid.link/20251231224233.113839-10-zide.chen@intel.com
parent d8987048

arch/x86/events/intel/uncore.c

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ uncore_get_event_constraint(struct intel_uncore_box *box, struct perf_event *eve 


	if (type->constraints) {

		for_each_event_constraint(c, type->constraints) {

			if ((event->hw.config & c->cmask) == c->code)

			if (constraint_match(c, event->hw.config))

				return c;

		}

	}

arch/x86/events/intel/uncore.h

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
#define UNCORE_EXTRA_PCI_DEV_MAX	4



#define UNCORE_EVENT_CONSTRAINT(c, n) EVENT_CONSTRAINT(c, n, 0xff)

#define UNCORE_EVENT_CONSTRAINT_RANGE(c, e, n)			\

		EVENT_CONSTRAINT_RANGE(c, e, n, 0xff)



#define UNCORE_IGNORE_END		-1

arch/x86/events/intel/uncore_snbep.c

+41 −142
Original line number Diff line number Diff line
@@ -836,76 +836,37 @@ static struct intel_uncore_ops snbep_uncore_pci_ops = { 
static struct event_constraint snbep_uncore_cbox_constraints[] = {

	UNCORE_EVENT_CONSTRAINT(0x01, 0x1),

	UNCORE_EVENT_CONSTRAINT(0x02, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x04, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x05, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x04, 0x5, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x07, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x09, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x11, 0x1),

	UNCORE_EVENT_CONSTRAINT(0x12, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x13, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x1b, 0xc),

	UNCORE_EVENT_CONSTRAINT(0x1c, 0xc),

	UNCORE_EVENT_CONSTRAINT(0x1d, 0xc),

	UNCORE_EVENT_CONSTRAINT(0x1e, 0xc),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x12, 0x13, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x1b, 0x1e, 0xc),

	UNCORE_EVENT_CONSTRAINT(0x1f, 0xe),

	UNCORE_EVENT_CONSTRAINT(0x21, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x23, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x31, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x32, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x33, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x34, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x35, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x31, 0x35, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x36, 0x1),

	UNCORE_EVENT_CONSTRAINT(0x37, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x38, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x39, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x37, 0x39, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x3b, 0x1),

	EVENT_CONSTRAINT_END

};



static struct event_constraint snbep_uncore_r2pcie_constraints[] = {

	UNCORE_EVENT_CONSTRAINT(0x10, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x11, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x10, 0x11, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x12, 0x1),

	UNCORE_EVENT_CONSTRAINT(0x23, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x24, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x25, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x26, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x32, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x33, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x34, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x24, 0x26, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x32, 0x34, 0x3),

	EVENT_CONSTRAINT_END

};



static struct event_constraint snbep_uncore_r3qpi_constraints[] = {

	UNCORE_EVENT_CONSTRAINT(0x10, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x11, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x12, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x10, 0x12, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x13, 0x1),

	UNCORE_EVENT_CONSTRAINT(0x20, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x21, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x22, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x23, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x24, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x25, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x26, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x28, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x29, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x2a, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x2b, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x2c, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x2d, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x2e, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x2f, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x30, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x31, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x32, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x33, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x34, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x36, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x37, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x38, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x39, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x20, 0x26, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x28, 0x34, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x36, 0x39, 0x3),

	EVENT_CONSTRAINT_END

};
@@ -3034,24 +2995,15 @@ static struct intel_uncore_type hswep_uncore_qpi = { 
};



static struct event_constraint hswep_uncore_r2pcie_constraints[] = {

	UNCORE_EVENT_CONSTRAINT(0x10, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x11, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x10, 0x11, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x13, 0x1),

	UNCORE_EVENT_CONSTRAINT(0x23, 0x1),

	UNCORE_EVENT_CONSTRAINT(0x24, 0x1),

	UNCORE_EVENT_CONSTRAINT(0x25, 0x1),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x23, 0x25, 0x1),

	UNCORE_EVENT_CONSTRAINT(0x26, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x27, 0x1),

	UNCORE_EVENT_CONSTRAINT(0x28, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x29, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x28, 0x29, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x2a, 0x1),

	UNCORE_EVENT_CONSTRAINT(0x2b, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x2c, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x2d, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x32, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x33, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x34, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x35, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x2b, 0x2d, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x32, 0x35, 0x3),

	EVENT_CONSTRAINT_END

};
@@ -3066,38 +3018,17 @@ static struct intel_uncore_type hswep_uncore_r2pcie = { 


static struct event_constraint hswep_uncore_r3qpi_constraints[] = {

	UNCORE_EVENT_CONSTRAINT(0x01, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x07, 0x7),

	UNCORE_EVENT_CONSTRAINT(0x08, 0x7),

	UNCORE_EVENT_CONSTRAINT(0x09, 0x7),

	UNCORE_EVENT_CONSTRAINT(0x0a, 0x7),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x7, 0x0a, 0x7),

	UNCORE_EVENT_CONSTRAINT(0x0e, 0x7),

	UNCORE_EVENT_CONSTRAINT(0x10, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x11, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x12, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x10, 0x12, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x13, 0x1),

	UNCORE_EVENT_CONSTRAINT(0x14, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x15, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x1f, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x20, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x21, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x22, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x23, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x25, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x26, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x28, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x29, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x2c, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x2d, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x2e, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x2f, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x31, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x32, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x33, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x34, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x36, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x37, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x38, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x39, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x14, 0x15, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x1f, 0x23, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x25, 0x26, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x28, 0x29, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x2c, 0x2f, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x31, 0x34, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x36, 0x39, 0x3),

	EVENT_CONSTRAINT_END

};
@@ -3371,8 +3302,7 @@ static struct event_constraint bdx_uncore_r2pcie_constraints[] = { 
	UNCORE_EVENT_CONSTRAINT(0x25, 0x1),

	UNCORE_EVENT_CONSTRAINT(0x26, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x28, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x2c, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x2d, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x2c, 0x2d, 0x3),

	EVENT_CONSTRAINT_END

};
@@ -3387,35 +3317,18 @@ static struct intel_uncore_type bdx_uncore_r2pcie = { 


static struct event_constraint bdx_uncore_r3qpi_constraints[] = {

	UNCORE_EVENT_CONSTRAINT(0x01, 0x7),

	UNCORE_EVENT_CONSTRAINT(0x07, 0x7),

	UNCORE_EVENT_CONSTRAINT(0x08, 0x7),

	UNCORE_EVENT_CONSTRAINT(0x09, 0x7),

	UNCORE_EVENT_CONSTRAINT(0x0a, 0x7),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x07, 0x0a, 0x7),

	UNCORE_EVENT_CONSTRAINT(0x0e, 0x7),

	UNCORE_EVENT_CONSTRAINT(0x10, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x11, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x10, 0x11, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x13, 0x1),

	UNCORE_EVENT_CONSTRAINT(0x14, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x15, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x1f, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x20, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x21, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x22, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x23, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x14, 0x15, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x1f, 0x23, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x25, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x26, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x28, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x29, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x2c, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x2d, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x2e, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x2f, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x33, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x34, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x36, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x37, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x38, 0x3),

	UNCORE_EVENT_CONSTRAINT(0x39, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x28, 0x29, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x2c, 0x2f, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x33, 0x34, 0x3),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x36, 0x39, 0x3),

	EVENT_CONSTRAINT_END

};
@@ -3722,8 +3635,7 @@ static struct event_constraint skx_uncore_iio_constraints[] = { 
	UNCORE_EVENT_CONSTRAINT(0x95, 0xc),

	UNCORE_EVENT_CONSTRAINT(0xc0, 0xc),

	UNCORE_EVENT_CONSTRAINT(0xc5, 0xc),

	UNCORE_EVENT_CONSTRAINT(0xd4, 0xc),

	UNCORE_EVENT_CONSTRAINT(0xd5, 0xc),

	UNCORE_EVENT_CONSTRAINT_RANGE(0xd4, 0xd5, 0xc),

	EVENT_CONSTRAINT_END

};
@@ -4479,14 +4391,9 @@ static struct intel_uncore_type skx_uncore_m2pcie = { 
};



static struct event_constraint skx_uncore_m3upi_constraints[] = {

	UNCORE_EVENT_CONSTRAINT(0x1d, 0x1),

	UNCORE_EVENT_CONSTRAINT(0x1e, 0x1),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x1d, 0x1e, 0x1),

	UNCORE_EVENT_CONSTRAINT(0x40, 0x7),

	UNCORE_EVENT_CONSTRAINT(0x4e, 0x7),

	UNCORE_EVENT_CONSTRAINT(0x4f, 0x7),

	UNCORE_EVENT_CONSTRAINT(0x50, 0x7),

	UNCORE_EVENT_CONSTRAINT(0x51, 0x7),

	UNCORE_EVENT_CONSTRAINT(0x52, 0x7),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x4e, 0x52, 0x7),

	EVENT_CONSTRAINT_END

};
@@ -5652,14 +5559,9 @@ static struct intel_uncore_type icx_uncore_upi = { 
};



static struct event_constraint icx_uncore_m3upi_constraints[] = {

	UNCORE_EVENT_CONSTRAINT(0x1c, 0x1),

	UNCORE_EVENT_CONSTRAINT(0x1d, 0x1),

	UNCORE_EVENT_CONSTRAINT(0x1e, 0x1),

	UNCORE_EVENT_CONSTRAINT(0x1f, 0x1),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x1c, 0x1f, 0x1),

	UNCORE_EVENT_CONSTRAINT(0x40, 0x7),

	UNCORE_EVENT_CONSTRAINT(0x4e, 0x7),

	UNCORE_EVENT_CONSTRAINT(0x4f, 0x7),

	UNCORE_EVENT_CONSTRAINT(0x50, 0x7),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x4e, 0x50, 0x7),

	EVENT_CONSTRAINT_END

};
@@ -6142,10 +6044,7 @@ static struct intel_uncore_ops spr_uncore_mmio_offs8_ops = { 
static struct event_constraint spr_uncore_cxlcm_constraints[] = {

	UNCORE_EVENT_CONSTRAINT(0x02, 0x0f),

	UNCORE_EVENT_CONSTRAINT(0x05, 0x0f),

	UNCORE_EVENT_CONSTRAINT(0x40, 0xf0),

	UNCORE_EVENT_CONSTRAINT(0x41, 0xf0),

	UNCORE_EVENT_CONSTRAINT(0x42, 0xf0),

	UNCORE_EVENT_CONSTRAINT(0x43, 0xf0),

	UNCORE_EVENT_CONSTRAINT_RANGE(0x40, 0x43, 0xf0),

	UNCORE_EVENT_CONSTRAINT(0x4b, 0xf0),

	UNCORE_EVENT_CONSTRAINT(0x52, 0xf0),

	EVENT_CONSTRAINT_END