perf/x86: Lowercase uncore PMU event names
Subsystems (2)
Commit-ID: 2992c542fcd40777ed253f57362c65711fb8acaf Gitweb: http://git.kernel.org/tip/2992c542fcd40777ed253f57362c65711fb8acaf Author: Peter Zijlstra <[email protected]> AuthorDate: Sat, 16 Jun 2012 14:45:49 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Mon, 18 Jun 2012 15:55:52 +0200
perf/x86: Lowercase uncore PMU event names
Signed-off-by Peter Zijlstra <[email protected]>
[ Trivial build fix ]
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/kernel/cpu/perf_event_intel_uncore.c | 51 ++++++++----------------- 1 files changed, 16 insertions(+), 35 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_uncore.c +16 -35
@@ -179,22 +179,17 @@ static struct attribute *snbep_uncore_pcu_formats_attr[] = { };static struct uncore_event_desc snbep_uncore_imc_events[] = { -INTEL_UNCORE_EVENT_DESC (CLOCKTICKS ,"config=0xffff" ), -/* read */ -INTEL_UNCORE_EVENT_DESC (CAS_COUNT_RD ,"event=0x4,umask=0x3" ), -/* write */ -INTEL_UNCORE_EVENT_DESC (CAS_COUNT_WR ,"event=0x4,umask=0xc" ), +INTEL_UNCORE_EVENT_DESC (clockticks,"event=0xff,umask=0xff" ), +INTEL_UNCORE_EVENT_DESC (cas_count_read,"event=0x04,umask=0x03" ), +INTEL_UNCORE_EVENT_DESC (cas_count_write,"event=0x04,umask=0x0c" ), {/* end: all zeroes */ }, };static struct uncore_event_desc snbep_uncore_qpi_events[] = { -INTEL_UNCORE_EVENT_DESC (CLOCKTICKS ,"event=0x14" ), -/* outgoing data+nondata flits */ -INTEL_UNCORE_EVENT_DESC (TxL_FLITS_ACTIVE,"event=0x0,umask=0x6" ), -/* DRS data received */ -INTEL_UNCORE_EVENT_DESC (DRS_DATA ,"event=0x2,umask=0x8" ), -/* NCB data received */ -INTEL_UNCORE_EVENT_DESC (NCB_DATA ,"event=0x3,umask=0x4" ), +INTEL_UNCORE_EVENT_DESC (clockticks,"event=0x14" ), +INTEL_UNCORE_EVENT_DESC (txl_flits_active,"event=0x00,umask=0x06" ), +INTEL_UNCORE_EVENT_DESC (drs_data,"event=0x02,umask=0x08" ), +INTEL_UNCORE_EVENT_DESC (ncb_data,"event=0x03,umask=0x04" ), {/* end: all zeroes */ }, };
@@ -621,29 +616,15 @@ static struct attribute_group nhm_uncore_format_group = { };static struct uncore_event_desc nhm_uncore_events[] = { -INTEL_UNCORE_EVENT_DESC (CLOCKTICKS ,"config=0xffff" ), -/* full cache line writes to DRAM */ -INTEL_UNCORE_EVENT_DESC (QMC_WRITES_FULL_ANY ,"event=0x2f,umask=0xf" ), -/* Quickpath Memory Controller normal priority read requests */ -INTEL_UNCORE_EVENT_DESC (QMC_NORMAL_READS_ANY ,"event=0x2c,umask=0xf" ), -/* Quickpath Home Logic read requests from the IOH */ -INTEL_UNCORE_EVENT_DESC (QHL_REQUEST_IOH_READS , -"event=0x20,umask=0x1" ), -/* Quickpath Home Logic write requests from the IOH */ -INTEL_UNCORE_EVENT_DESC (QHL_REQUEST_IOH_WRITES , -"event=0x20,umask=0x2" ), -/* Quickpath Home Logic read requests from a remote socket */ -INTEL_UNCORE_EVENT_DESC (QHL_REQUEST_REMOTE_READS , -"event=0x20,umask=0x4" ), -/* Quickpath Home Logic write requests from a remote socket */ -INTEL_UNCORE_EVENT_DESC (QHL_REQUEST_REMOTE_WRITES , -"event=0x20,umask=0x8" ), -/* Quickpath Home Logic read requests from the local socket */ -INTEL_UNCORE_EVENT_DESC (QHL_REQUEST_LOCAL_READS , -"event=0x20,umask=0x10" ), -/* Quickpath Home Logic write requests from the local socket */ -INTEL_UNCORE_EVENT_DESC (QHL_REQUEST_LOCAL_WRITES , -"event=0x20,umask=0x20" ), +INTEL_UNCORE_EVENT_DESC (clockticks,"event=0xff,umask=0xff" ), +INTEL_UNCORE_EVENT_DESC (qmc_writes_full_any,"event=0x2f,umask=0x0f" ), +INTEL_UNCORE_EVENT_DESC (qmc_normal_reads_any,"event=0x2c,umask=0x0f" ), +INTEL_UNCORE_EVENT_DESC (qhl_request_ioh_reads,"event=0x20,umask=0x01" ), +INTEL_UNCORE_EVENT_DESC (qhl_request_ioh_writes,"event=0x20,umask=0x02" ), +INTEL_UNCORE_EVENT_DESC (qhl_request_remote_reads,"event=0x20,umask=0x04" ), +INTEL_UNCORE_EVENT_DESC (qhl_request_remote_writes,"event=0x20,umask=0x08" ), +INTEL_UNCORE_EVENT_DESC (qhl_request_local_reads,"event=0x20,umask=0x10" ), +INTEL_UNCORE_EVENT_DESC (qhl_request_local_writes,"event=0x20,umask=0x20" ), {/* end: all zeroes */ }, };