| 
									
										
											  
											
												perf: Do the big rename: Performance Counters -> Performance Events
Bye-bye Performance Counters, welcome Performance Events!
In the past few months the perfcounters subsystem has grown out its
initial role of counting hardware events, and has become (and is
becoming) a much broader generic event enumeration, reporting, logging,
monitoring, analysis facility.
Naming its core object 'perf_counter' and naming the subsystem
'perfcounters' has become more and more of a misnomer. With pending
code like hw-breakpoints support the 'counter' name is less and
less appropriate.
All in one, we've decided to rename the subsystem to 'performance
events' and to propagate this rename through all fields, variables
and API names. (in an ABI compatible fashion)
The word 'event' is also a bit shorter than 'counter' - which makes
it slightly more convenient to write/handle as well.
Thanks goes to Stephane Eranian who first observed this misnomer and
suggested a rename.
User-space tooling and ABI compatibility is not affected - this patch
should be function-invariant. (Also, defconfigs were not touched to
keep the size down.)
This patch has been generated via the following script:
  FILES=$(find * -type f | grep -vE 'oprofile|[^K]config')
  sed -i \
    -e 's/PERF_EVENT_/PERF_RECORD_/g' \
    -e 's/PERF_COUNTER/PERF_EVENT/g' \
    -e 's/perf_counter/perf_event/g' \
    -e 's/nb_counters/nb_events/g' \
    -e 's/swcounter/swevent/g' \
    -e 's/tpcounter_event/tp_event/g' \
    $FILES
  for N in $(find . -name perf_counter.[ch]); do
    M=$(echo $N | sed 's/perf_counter/perf_event/g')
    mv $N $M
  done
  FILES=$(find . -name perf_event.*)
  sed -i \
    -e 's/COUNTER_MASK/REG_MASK/g' \
    -e 's/COUNTER/EVENT/g' \
    -e 's/\<event\>/event_id/g' \
    -e 's/counter/event/g' \
    -e 's/Counter/Event/g' \
    $FILES
... to keep it as correct as possible. This script can also be
used by anyone who has pending perfcounters patches - it converts
a Linux kernel tree over to the new naming. We tried to time this
change to the point in time where the amount of pending patches
is the smallest: the end of the merge window.
Namespace clashes were fixed up in a preparatory patch - and some
stylistic fallout will be fixed up in a subsequent patch.
( NOTE: 'counters' are still the proper terminology when we deal
  with hardware registers - and these sed scripts are a bit
  over-eager in renaming them. I've undone some of that, but
  in case there's something left where 'counter' would be
  better than 'event' we can undo that on an individual basis
  instead of touching an otherwise nicely automated patch. )
Suggested-by: Stephane Eranian <eranian@google.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Paul Mackerras <paulus@samba.org>
Reviewed-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: <linux-arch@vger.kernel.org>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
											
										 
											2009-09-21 12:02:48 +02:00
										 |  |  | #ifndef _ASM_X86_PERF_EVENT_H
 | 
					
						
							|  |  |  | #define _ASM_X86_PERF_EVENT_H
 | 
					
						
							| 
									
										
										
										
											2007-10-15 13:57:47 +02:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-12-17 09:09:13 +01:00
										 |  |  | /*
 | 
					
						
							| 
									
										
											  
											
												perf: Do the big rename: Performance Counters -> Performance Events
Bye-bye Performance Counters, welcome Performance Events!
In the past few months the perfcounters subsystem has grown out its
initial role of counting hardware events, and has become (and is
becoming) a much broader generic event enumeration, reporting, logging,
monitoring, analysis facility.
Naming its core object 'perf_counter' and naming the subsystem
'perfcounters' has become more and more of a misnomer. With pending
code like hw-breakpoints support the 'counter' name is less and
less appropriate.
All in one, we've decided to rename the subsystem to 'performance
events' and to propagate this rename through all fields, variables
and API names. (in an ABI compatible fashion)
The word 'event' is also a bit shorter than 'counter' - which makes
it slightly more convenient to write/handle as well.
Thanks goes to Stephane Eranian who first observed this misnomer and
suggested a rename.
User-space tooling and ABI compatibility is not affected - this patch
should be function-invariant. (Also, defconfigs were not touched to
keep the size down.)
This patch has been generated via the following script:
  FILES=$(find * -type f | grep -vE 'oprofile|[^K]config')
  sed -i \
    -e 's/PERF_EVENT_/PERF_RECORD_/g' \
    -e 's/PERF_COUNTER/PERF_EVENT/g' \
    -e 's/perf_counter/perf_event/g' \
    -e 's/nb_counters/nb_events/g' \
    -e 's/swcounter/swevent/g' \
    -e 's/tpcounter_event/tp_event/g' \
    $FILES
  for N in $(find . -name perf_counter.[ch]); do
    M=$(echo $N | sed 's/perf_counter/perf_event/g')
    mv $N $M
  done
  FILES=$(find . -name perf_event.*)
  sed -i \
    -e 's/COUNTER_MASK/REG_MASK/g' \
    -e 's/COUNTER/EVENT/g' \
    -e 's/\<event\>/event_id/g' \
    -e 's/counter/event/g' \
    -e 's/Counter/Event/g' \
    $FILES
... to keep it as correct as possible. This script can also be
used by anyone who has pending perfcounters patches - it converts
a Linux kernel tree over to the new naming. We tried to time this
change to the point in time where the amount of pending patches
is the smallest: the end of the merge window.
Namespace clashes were fixed up in a preparatory patch - and some
stylistic fallout will be fixed up in a subsequent patch.
( NOTE: 'counters' are still the proper terminology when we deal
  with hardware registers - and these sed scripts are a bit
  over-eager in renaming them. I've undone some of that, but
  in case there's something left where 'counter' would be
  better than 'event' we can undo that on an individual basis
  instead of touching an otherwise nicely automated patch. )
Suggested-by: Stephane Eranian <eranian@google.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Paul Mackerras <paulus@samba.org>
Reviewed-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: <linux-arch@vger.kernel.org>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
											
										 
											2009-09-21 12:02:48 +02:00
										 |  |  |  * Performance event hw details: | 
					
						
							| 
									
										
										
										
											2008-12-17 09:09:13 +01:00
										 |  |  |  */ | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-06-20 20:46:33 +02:00
										 |  |  | #define INTEL_PMC_MAX_GENERIC				       32
 | 
					
						
							|  |  |  | #define INTEL_PMC_MAX_FIXED					3
 | 
					
						
							|  |  |  | #define INTEL_PMC_IDX_FIXED				       32
 | 
					
						
							| 
									
										
										
										
											2008-12-17 09:09:13 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-12-17 13:09:20 +01:00
										 |  |  | #define X86_PMC_IDX_MAX					       64
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-12-03 10:39:53 +01:00
										 |  |  | #define MSR_ARCH_PERFMON_PERFCTR0			      0xc1
 | 
					
						
							|  |  |  | #define MSR_ARCH_PERFMON_PERFCTR1			      0xc2
 | 
					
						
							| 
									
										
										
										
											2007-10-15 13:57:47 +02:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-12-03 10:39:53 +01:00
										 |  |  | #define MSR_ARCH_PERFMON_EVENTSEL0			     0x186
 | 
					
						
							|  |  |  | #define MSR_ARCH_PERFMON_EVENTSEL1			     0x187
 | 
					
						
							| 
									
										
										
										
											2007-10-15 13:57:47 +02:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-03-30 11:28:21 +02:00
										 |  |  | #define ARCH_PERFMON_EVENTSEL_EVENT			0x000000FFULL
 | 
					
						
							|  |  |  | #define ARCH_PERFMON_EVENTSEL_UMASK			0x0000FF00ULL
 | 
					
						
							|  |  |  | #define ARCH_PERFMON_EVENTSEL_USR			(1ULL << 16)
 | 
					
						
							|  |  |  | #define ARCH_PERFMON_EVENTSEL_OS			(1ULL << 17)
 | 
					
						
							|  |  |  | #define ARCH_PERFMON_EVENTSEL_EDGE			(1ULL << 18)
 | 
					
						
							| 
									
										
										
										
											2012-02-26 16:55:40 +02:00
										 |  |  | #define ARCH_PERFMON_EVENTSEL_PIN_CONTROL		(1ULL << 19)
 | 
					
						
							| 
									
										
										
										
											2010-03-30 11:28:21 +02:00
										 |  |  | #define ARCH_PERFMON_EVENTSEL_INT			(1ULL << 20)
 | 
					
						
							|  |  |  | #define ARCH_PERFMON_EVENTSEL_ANY			(1ULL << 21)
 | 
					
						
							|  |  |  | #define ARCH_PERFMON_EVENTSEL_ENABLE			(1ULL << 22)
 | 
					
						
							|  |  |  | #define ARCH_PERFMON_EVENTSEL_INV			(1ULL << 23)
 | 
					
						
							|  |  |  | #define ARCH_PERFMON_EVENTSEL_CMASK			0xFF000000ULL
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2013-06-17 17:36:48 -07:00
										 |  |  | #define HSW_IN_TX					(1ULL << 32)
 | 
					
						
							|  |  |  | #define HSW_IN_TX_CHECKPOINTED				(1ULL << 33)
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2013-02-06 11:26:29 -06:00
										 |  |  | #define AMD64_EVENTSEL_INT_CORE_ENABLE			(1ULL << 36)
 | 
					
						
							| 
									
										
										
										
											2013-02-06 11:26:26 -06:00
										 |  |  | #define AMD64_EVENTSEL_GUESTONLY			(1ULL << 40)
 | 
					
						
							|  |  |  | #define AMD64_EVENTSEL_HOSTONLY				(1ULL << 41)
 | 
					
						
							| 
									
										
										
										
											2011-10-05 14:01:17 +02:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2013-02-06 11:26:29 -06:00
										 |  |  | #define AMD64_EVENTSEL_INT_CORE_SEL_SHIFT		37
 | 
					
						
							|  |  |  | #define AMD64_EVENTSEL_INT_CORE_SEL_MASK		\
 | 
					
						
							|  |  |  | 	(0xFULL << AMD64_EVENTSEL_INT_CORE_SEL_SHIFT) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-03-30 11:28:21 +02:00
										 |  |  | #define AMD64_EVENTSEL_EVENT	\
 | 
					
						
							|  |  |  | 	(ARCH_PERFMON_EVENTSEL_EVENT | (0x0FULL << 32)) | 
					
						
							|  |  |  | #define INTEL_ARCH_EVENT_MASK	\
 | 
					
						
							|  |  |  | 	(ARCH_PERFMON_EVENTSEL_UMASK | ARCH_PERFMON_EVENTSEL_EVENT) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define X86_RAW_EVENT_MASK		\
 | 
					
						
							|  |  |  | 	(ARCH_PERFMON_EVENTSEL_EVENT |	\ | 
					
						
							|  |  |  | 	 ARCH_PERFMON_EVENTSEL_UMASK |	\ | 
					
						
							|  |  |  | 	 ARCH_PERFMON_EVENTSEL_EDGE  |	\ | 
					
						
							|  |  |  | 	 ARCH_PERFMON_EVENTSEL_INV   |	\ | 
					
						
							|  |  |  | 	 ARCH_PERFMON_EVENTSEL_CMASK) | 
					
						
							| 
									
										
										
										
											2014-08-11 21:27:10 +02:00
										 |  |  | #define X86_ALL_EVENT_FLAGS  			\
 | 
					
						
							|  |  |  | 	(ARCH_PERFMON_EVENTSEL_EDGE |  		\ | 
					
						
							|  |  |  | 	 ARCH_PERFMON_EVENTSEL_INV | 		\ | 
					
						
							|  |  |  | 	 ARCH_PERFMON_EVENTSEL_CMASK | 		\ | 
					
						
							|  |  |  | 	 ARCH_PERFMON_EVENTSEL_ANY | 		\ | 
					
						
							|  |  |  | 	 ARCH_PERFMON_EVENTSEL_PIN_CONTROL | 	\ | 
					
						
							|  |  |  | 	 HSW_IN_TX | 				\ | 
					
						
							|  |  |  | 	 HSW_IN_TX_CHECKPOINTED) | 
					
						
							| 
									
										
										
										
											2010-03-30 11:28:21 +02:00
										 |  |  | #define AMD64_RAW_EVENT_MASK		\
 | 
					
						
							|  |  |  | 	(X86_RAW_EVENT_MASK          |  \ | 
					
						
							|  |  |  | 	 AMD64_EVENTSEL_EVENT) | 
					
						
							| 
									
										
										
										
											2013-02-06 11:26:29 -06:00
										 |  |  | #define AMD64_RAW_EVENT_MASK_NB		\
 | 
					
						
							|  |  |  | 	(AMD64_EVENTSEL_EVENT        |  \ | 
					
						
							|  |  |  | 	 ARCH_PERFMON_EVENTSEL_UMASK) | 
					
						
							| 
									
										
										
										
											2011-09-21 11:30:17 +02:00
										 |  |  | #define AMD64_NUM_COUNTERS				4
 | 
					
						
							| 
									
										
										
										
											2012-06-20 20:46:35 +02:00
										 |  |  | #define AMD64_NUM_COUNTERS_CORE				6
 | 
					
						
							| 
									
										
										
										
											2013-02-06 11:26:29 -06:00
										 |  |  | #define AMD64_NUM_COUNTERS_NB				4
 | 
					
						
							| 
									
										
										
										
											2009-10-06 16:42:08 +02:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-09-21 11:30:17 +02:00
										 |  |  | #define ARCH_PERFMON_UNHALTED_CORE_CYCLES_SEL		0x3c
 | 
					
						
							| 
									
										
										
										
											2008-12-03 10:39:53 +01:00
										 |  |  | #define ARCH_PERFMON_UNHALTED_CORE_CYCLES_UMASK		(0x00 << 8)
 | 
					
						
							| 
									
										
										
										
											2011-09-21 11:30:17 +02:00
										 |  |  | #define ARCH_PERFMON_UNHALTED_CORE_CYCLES_INDEX		0
 | 
					
						
							| 
									
										
										
										
											2007-10-15 13:57:47 +02:00
										 |  |  | #define ARCH_PERFMON_UNHALTED_CORE_CYCLES_PRESENT \
 | 
					
						
							| 
									
										
										
										
											2008-12-03 10:39:53 +01:00
										 |  |  | 		(1 << (ARCH_PERFMON_UNHALTED_CORE_CYCLES_INDEX)) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-09-21 11:30:17 +02:00
										 |  |  | #define ARCH_PERFMON_BRANCH_MISSES_RETIRED		6
 | 
					
						
							| 
									
										
										
										
											2011-11-10 14:57:26 +02:00
										 |  |  | #define ARCH_PERFMON_EVENTS_COUNT			7
 | 
					
						
							| 
									
										
										
										
											2007-10-15 13:57:47 +02:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-12-17 09:09:13 +01:00
										 |  |  | /*
 | 
					
						
							|  |  |  |  * Intel "Architectural Performance Monitoring" CPUID | 
					
						
							|  |  |  |  * detection/enumeration details: | 
					
						
							|  |  |  |  */ | 
					
						
							| 
									
										
										
										
											2007-10-15 13:57:47 +02:00
										 |  |  | union cpuid10_eax { | 
					
						
							|  |  |  | 	struct { | 
					
						
							|  |  |  | 		unsigned int version_id:8; | 
					
						
							| 
									
										
										
										
											2010-03-29 18:36:50 +02:00
										 |  |  | 		unsigned int num_counters:8; | 
					
						
							| 
									
										
										
										
											2007-10-15 13:57:47 +02:00
										 |  |  | 		unsigned int bit_width:8; | 
					
						
							|  |  |  | 		unsigned int mask_length:8; | 
					
						
							|  |  |  | 	} split; | 
					
						
							|  |  |  | 	unsigned int full; | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-11-10 14:57:26 +02:00
										 |  |  | union cpuid10_ebx { | 
					
						
							|  |  |  | 	struct { | 
					
						
							|  |  |  | 		unsigned int no_unhalted_core_cycles:1; | 
					
						
							|  |  |  | 		unsigned int no_instructions_retired:1; | 
					
						
							|  |  |  | 		unsigned int no_unhalted_reference_cycles:1; | 
					
						
							|  |  |  | 		unsigned int no_llc_reference:1; | 
					
						
							|  |  |  | 		unsigned int no_llc_misses:1; | 
					
						
							|  |  |  | 		unsigned int no_branch_instruction_retired:1; | 
					
						
							|  |  |  | 		unsigned int no_branch_misses_retired:1; | 
					
						
							|  |  |  | 	} split; | 
					
						
							|  |  |  | 	unsigned int full; | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-12-17 10:51:15 +01:00
										 |  |  | union cpuid10_edx { | 
					
						
							|  |  |  | 	struct { | 
					
						
							| 
									
										
										
										
											2010-06-03 15:00:31 -04:00
										 |  |  | 		unsigned int num_counters_fixed:5; | 
					
						
							|  |  |  | 		unsigned int bit_width_fixed:8; | 
					
						
							|  |  |  | 		unsigned int reserved:19; | 
					
						
							| 
									
										
										
										
											2008-12-17 10:51:15 +01:00
										 |  |  | 	} split; | 
					
						
							|  |  |  | 	unsigned int full; | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-11-10 14:57:27 +02:00
										 |  |  | struct x86_pmu_capability { | 
					
						
							|  |  |  | 	int		version; | 
					
						
							|  |  |  | 	int		num_counters_gp; | 
					
						
							|  |  |  | 	int		num_counters_fixed; | 
					
						
							|  |  |  | 	int		bit_width_gp; | 
					
						
							|  |  |  | 	int		bit_width_fixed; | 
					
						
							|  |  |  | 	unsigned int	events_mask; | 
					
						
							|  |  |  | 	int		events_mask_len; | 
					
						
							|  |  |  | }; | 
					
						
							| 
									
										
										
										
											2008-12-17 10:51:15 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  | /*
 | 
					
						
							| 
									
										
											  
											
												perf: Do the big rename: Performance Counters -> Performance Events
Bye-bye Performance Counters, welcome Performance Events!
In the past few months the perfcounters subsystem has grown out its
initial role of counting hardware events, and has become (and is
becoming) a much broader generic event enumeration, reporting, logging,
monitoring, analysis facility.
Naming its core object 'perf_counter' and naming the subsystem
'perfcounters' has become more and more of a misnomer. With pending
code like hw-breakpoints support the 'counter' name is less and
less appropriate.
All in one, we've decided to rename the subsystem to 'performance
events' and to propagate this rename through all fields, variables
and API names. (in an ABI compatible fashion)
The word 'event' is also a bit shorter than 'counter' - which makes
it slightly more convenient to write/handle as well.
Thanks goes to Stephane Eranian who first observed this misnomer and
suggested a rename.
User-space tooling and ABI compatibility is not affected - this patch
should be function-invariant. (Also, defconfigs were not touched to
keep the size down.)
This patch has been generated via the following script:
  FILES=$(find * -type f | grep -vE 'oprofile|[^K]config')
  sed -i \
    -e 's/PERF_EVENT_/PERF_RECORD_/g' \
    -e 's/PERF_COUNTER/PERF_EVENT/g' \
    -e 's/perf_counter/perf_event/g' \
    -e 's/nb_counters/nb_events/g' \
    -e 's/swcounter/swevent/g' \
    -e 's/tpcounter_event/tp_event/g' \
    $FILES
  for N in $(find . -name perf_counter.[ch]); do
    M=$(echo $N | sed 's/perf_counter/perf_event/g')
    mv $N $M
  done
  FILES=$(find . -name perf_event.*)
  sed -i \
    -e 's/COUNTER_MASK/REG_MASK/g' \
    -e 's/COUNTER/EVENT/g' \
    -e 's/\<event\>/event_id/g' \
    -e 's/counter/event/g' \
    -e 's/Counter/Event/g' \
    $FILES
... to keep it as correct as possible. This script can also be
used by anyone who has pending perfcounters patches - it converts
a Linux kernel tree over to the new naming. We tried to time this
change to the point in time where the amount of pending patches
is the smallest: the end of the merge window.
Namespace clashes were fixed up in a preparatory patch - and some
stylistic fallout will be fixed up in a subsequent patch.
( NOTE: 'counters' are still the proper terminology when we deal
  with hardware registers - and these sed scripts are a bit
  over-eager in renaming them. I've undone some of that, but
  in case there's something left where 'counter' would be
  better than 'event' we can undo that on an individual basis
  instead of touching an otherwise nicely automated patch. )
Suggested-by: Stephane Eranian <eranian@google.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Paul Mackerras <paulus@samba.org>
Reviewed-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: <linux-arch@vger.kernel.org>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
											
										 
											2009-09-21 12:02:48 +02:00
										 |  |  |  * Fixed-purpose performance events: | 
					
						
							| 
									
										
										
										
											2008-12-17 10:51:15 +01:00
										 |  |  |  */ | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-12-17 13:09:20 +01:00
										 |  |  | /*
 | 
					
						
							|  |  |  |  * All 3 fixed-mode PMCs are configured via this single MSR: | 
					
						
							|  |  |  |  */ | 
					
						
							| 
									
										
										
										
											2011-12-11 00:28:51 +01:00
										 |  |  | #define MSR_ARCH_PERFMON_FIXED_CTR_CTRL	0x38d
 | 
					
						
							| 
									
										
										
										
											2008-12-17 13:09:20 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  | /*
 | 
					
						
							|  |  |  |  * The counts are available in three separate MSRs: | 
					
						
							|  |  |  |  */ | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-12-17 10:51:15 +01:00
										 |  |  | /* Instr_Retired.Any: */ | 
					
						
							| 
									
										
										
										
											2011-12-11 00:28:51 +01:00
										 |  |  | #define MSR_ARCH_PERFMON_FIXED_CTR0	0x309
 | 
					
						
							| 
									
										
										
										
											2012-06-20 20:46:33 +02:00
										 |  |  | #define INTEL_PMC_IDX_FIXED_INSTRUCTIONS	(INTEL_PMC_IDX_FIXED + 0)
 | 
					
						
							| 
									
										
										
										
											2008-12-17 10:51:15 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  | /* CPU_CLK_Unhalted.Core: */ | 
					
						
							| 
									
										
										
										
											2011-12-11 00:28:51 +01:00
										 |  |  | #define MSR_ARCH_PERFMON_FIXED_CTR1	0x30a
 | 
					
						
							| 
									
										
										
										
											2012-06-20 20:46:33 +02:00
										 |  |  | #define INTEL_PMC_IDX_FIXED_CPU_CYCLES	(INTEL_PMC_IDX_FIXED + 1)
 | 
					
						
							| 
									
										
										
										
											2008-12-17 10:51:15 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  | /* CPU_CLK_Unhalted.Ref: */ | 
					
						
							| 
									
										
										
										
											2011-12-11 00:28:51 +01:00
										 |  |  | #define MSR_ARCH_PERFMON_FIXED_CTR2	0x30b
 | 
					
						
							| 
									
										
										
										
											2012-06-20 20:46:33 +02:00
										 |  |  | #define INTEL_PMC_IDX_FIXED_REF_CYCLES	(INTEL_PMC_IDX_FIXED + 2)
 | 
					
						
							|  |  |  | #define INTEL_PMC_MSK_FIXED_REF_CYCLES	(1ULL << INTEL_PMC_IDX_FIXED_REF_CYCLES)
 | 
					
						
							| 
									
										
										
										
											2008-12-17 10:51:15 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-07-21 15:56:48 +02:00
										 |  |  | /*
 | 
					
						
							|  |  |  |  * We model BTS tracing as another fixed-mode PMC. | 
					
						
							|  |  |  |  * | 
					
						
							| 
									
										
											  
											
												perf: Do the big rename: Performance Counters -> Performance Events
Bye-bye Performance Counters, welcome Performance Events!
In the past few months the perfcounters subsystem has grown out its
initial role of counting hardware events, and has become (and is
becoming) a much broader generic event enumeration, reporting, logging,
monitoring, analysis facility.
Naming its core object 'perf_counter' and naming the subsystem
'perfcounters' has become more and more of a misnomer. With pending
code like hw-breakpoints support the 'counter' name is less and
less appropriate.
All in one, we've decided to rename the subsystem to 'performance
events' and to propagate this rename through all fields, variables
and API names. (in an ABI compatible fashion)
The word 'event' is also a bit shorter than 'counter' - which makes
it slightly more convenient to write/handle as well.
Thanks goes to Stephane Eranian who first observed this misnomer and
suggested a rename.
User-space tooling and ABI compatibility is not affected - this patch
should be function-invariant. (Also, defconfigs were not touched to
keep the size down.)
This patch has been generated via the following script:
  FILES=$(find * -type f | grep -vE 'oprofile|[^K]config')
  sed -i \
    -e 's/PERF_EVENT_/PERF_RECORD_/g' \
    -e 's/PERF_COUNTER/PERF_EVENT/g' \
    -e 's/perf_counter/perf_event/g' \
    -e 's/nb_counters/nb_events/g' \
    -e 's/swcounter/swevent/g' \
    -e 's/tpcounter_event/tp_event/g' \
    $FILES
  for N in $(find . -name perf_counter.[ch]); do
    M=$(echo $N | sed 's/perf_counter/perf_event/g')
    mv $N $M
  done
  FILES=$(find . -name perf_event.*)
  sed -i \
    -e 's/COUNTER_MASK/REG_MASK/g' \
    -e 's/COUNTER/EVENT/g' \
    -e 's/\<event\>/event_id/g' \
    -e 's/counter/event/g' \
    -e 's/Counter/Event/g' \
    $FILES
... to keep it as correct as possible. This script can also be
used by anyone who has pending perfcounters patches - it converts
a Linux kernel tree over to the new naming. We tried to time this
change to the point in time where the amount of pending patches
is the smallest: the end of the merge window.
Namespace clashes were fixed up in a preparatory patch - and some
stylistic fallout will be fixed up in a subsequent patch.
( NOTE: 'counters' are still the proper terminology when we deal
  with hardware registers - and these sed scripts are a bit
  over-eager in renaming them. I've undone some of that, but
  in case there's something left where 'counter' would be
  better than 'event' we can undo that on an individual basis
  instead of touching an otherwise nicely automated patch. )
Suggested-by: Stephane Eranian <eranian@google.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Paul Mackerras <paulus@samba.org>
Reviewed-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: <linux-arch@vger.kernel.org>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
											
										 
											2009-09-21 12:02:48 +02:00
										 |  |  |  * We choose a value in the middle of the fixed event range, since lower | 
					
						
							|  |  |  |  * values are used by actual fixed events and higher values are used | 
					
						
							| 
									
										
										
										
											2009-07-21 15:56:48 +02:00
										 |  |  |  * to indicate other overflow conditions in the PERF_GLOBAL_STATUS msr. | 
					
						
							|  |  |  |  */ | 
					
						
							| 
									
										
										
										
											2012-06-20 20:46:33 +02:00
										 |  |  | #define INTEL_PMC_IDX_FIXED_BTS				(INTEL_PMC_IDX_FIXED + 16)
 | 
					
						
							| 
									
										
										
										
											2009-07-21 15:56:48 +02:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-09-21 11:30:17 +02:00
										 |  |  | /*
 | 
					
						
							|  |  |  |  * IBS cpuid feature detection | 
					
						
							|  |  |  |  */ | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define IBS_CPUID_FEATURES		0x8000001b
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /*
 | 
					
						
							|  |  |  |  * Same bit mask as for IBS cpuid feature flags (Fn8000_001B_EAX), but | 
					
						
							|  |  |  |  * bit 0 is used to indicate the existence of IBS. | 
					
						
							|  |  |  |  */ | 
					
						
							|  |  |  | #define IBS_CAPS_AVAIL			(1U<<0)
 | 
					
						
							|  |  |  | #define IBS_CAPS_FETCHSAM		(1U<<1)
 | 
					
						
							|  |  |  | #define IBS_CAPS_OPSAM			(1U<<2)
 | 
					
						
							|  |  |  | #define IBS_CAPS_RDWROPCNT		(1U<<3)
 | 
					
						
							|  |  |  | #define IBS_CAPS_OPCNT			(1U<<4)
 | 
					
						
							|  |  |  | #define IBS_CAPS_BRNTRGT		(1U<<5)
 | 
					
						
							|  |  |  | #define IBS_CAPS_OPCNTEXT		(1U<<6)
 | 
					
						
							| 
									
										
										
										
											2012-04-02 20:19:11 +02:00
										 |  |  | #define IBS_CAPS_RIPINVALIDCHK		(1U<<7)
 | 
					
						
							| 
									
										
										
										
											2014-11-10 14:24:26 -06:00
										 |  |  | #define IBS_CAPS_OPBRNFUSE		(1U<<8)
 | 
					
						
							|  |  |  | #define IBS_CAPS_FETCHCTLEXTD		(1U<<9)
 | 
					
						
							|  |  |  | #define IBS_CAPS_OPDATA4		(1U<<10)
 | 
					
						
							| 
									
										
										
										
											2011-09-21 11:30:17 +02:00
										 |  |  | 
 | 
					
						
							|  |  |  | #define IBS_CAPS_DEFAULT		(IBS_CAPS_AVAIL		\
 | 
					
						
							|  |  |  | 					 | IBS_CAPS_FETCHSAM	\ | 
					
						
							|  |  |  | 					 | IBS_CAPS_OPSAM) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /*
 | 
					
						
							|  |  |  |  * IBS APIC setup | 
					
						
							|  |  |  |  */ | 
					
						
							|  |  |  | #define IBSCTL				0x1cc
 | 
					
						
							|  |  |  | #define IBSCTL_LVT_OFFSET_VALID		(1ULL<<8)
 | 
					
						
							|  |  |  | #define IBSCTL_LVT_OFFSET_MASK		0x0F
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-04-02 20:19:11 +02:00
										 |  |  | /* ibs fetch bits/masks */ | 
					
						
							| 
									
										
										
										
											2010-09-22 17:45:39 +02:00
										 |  |  | #define IBS_FETCH_RAND_EN	(1ULL<<57)
 | 
					
						
							|  |  |  | #define IBS_FETCH_VAL		(1ULL<<49)
 | 
					
						
							|  |  |  | #define IBS_FETCH_ENABLE	(1ULL<<48)
 | 
					
						
							|  |  |  | #define IBS_FETCH_CNT		0xFFFF0000ULL
 | 
					
						
							|  |  |  | #define IBS_FETCH_MAX_CNT	0x0000FFFFULL
 | 
					
						
							| 
									
										
										
										
											2010-02-25 19:40:46 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-04-02 20:19:11 +02:00
										 |  |  | /* ibs op bits/masks */ | 
					
						
							| 
									
										
										
										
											2011-12-15 17:56:39 +01:00
										 |  |  | /* lower 4 bits of the current count are ignored: */ | 
					
						
							|  |  |  | #define IBS_OP_CUR_CNT		(0xFFFF0ULL<<32)
 | 
					
						
							| 
									
										
										
										
											2010-09-22 17:45:39 +02:00
										 |  |  | #define IBS_OP_CNT_CTL		(1ULL<<19)
 | 
					
						
							|  |  |  | #define IBS_OP_VAL		(1ULL<<18)
 | 
					
						
							|  |  |  | #define IBS_OP_ENABLE		(1ULL<<17)
 | 
					
						
							|  |  |  | #define IBS_OP_MAX_CNT		0x0000FFFFULL
 | 
					
						
							|  |  |  | #define IBS_OP_MAX_CNT_EXT	0x007FFFFFULL	/* not a register bit mask */
 | 
					
						
							| 
									
										
										
										
											2012-04-02 20:19:11 +02:00
										 |  |  | #define IBS_RIP_INVALID		(1ULL<<38)
 | 
					
						
							| 
									
										
										
										
											2009-07-21 15:56:48 +02:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-05-11 11:44:59 +02:00
										 |  |  | #ifdef CONFIG_X86_LOCAL_APIC
 | 
					
						
							| 
									
										
										
										
											2011-09-21 11:30:18 +02:00
										 |  |  | extern u32 get_ibs_caps(void); | 
					
						
							| 
									
										
										
										
											2012-05-11 11:44:59 +02:00
										 |  |  | #else
 | 
					
						
							|  |  |  | static inline u32 get_ibs_caps(void) { return 0; } | 
					
						
							|  |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											2011-09-21 11:30:18 +02:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												perf: Do the big rename: Performance Counters -> Performance Events
Bye-bye Performance Counters, welcome Performance Events!
In the past few months the perfcounters subsystem has grown out its
initial role of counting hardware events, and has become (and is
becoming) a much broader generic event enumeration, reporting, logging,
monitoring, analysis facility.
Naming its core object 'perf_counter' and naming the subsystem
'perfcounters' has become more and more of a misnomer. With pending
code like hw-breakpoints support the 'counter' name is less and
less appropriate.
All in one, we've decided to rename the subsystem to 'performance
events' and to propagate this rename through all fields, variables
and API names. (in an ABI compatible fashion)
The word 'event' is also a bit shorter than 'counter' - which makes
it slightly more convenient to write/handle as well.
Thanks goes to Stephane Eranian who first observed this misnomer and
suggested a rename.
User-space tooling and ABI compatibility is not affected - this patch
should be function-invariant. (Also, defconfigs were not touched to
keep the size down.)
This patch has been generated via the following script:
  FILES=$(find * -type f | grep -vE 'oprofile|[^K]config')
  sed -i \
    -e 's/PERF_EVENT_/PERF_RECORD_/g' \
    -e 's/PERF_COUNTER/PERF_EVENT/g' \
    -e 's/perf_counter/perf_event/g' \
    -e 's/nb_counters/nb_events/g' \
    -e 's/swcounter/swevent/g' \
    -e 's/tpcounter_event/tp_event/g' \
    $FILES
  for N in $(find . -name perf_counter.[ch]); do
    M=$(echo $N | sed 's/perf_counter/perf_event/g')
    mv $N $M
  done
  FILES=$(find . -name perf_event.*)
  sed -i \
    -e 's/COUNTER_MASK/REG_MASK/g' \
    -e 's/COUNTER/EVENT/g' \
    -e 's/\<event\>/event_id/g' \
    -e 's/counter/event/g' \
    -e 's/Counter/Event/g' \
    $FILES
... to keep it as correct as possible. This script can also be
used by anyone who has pending perfcounters patches - it converts
a Linux kernel tree over to the new naming. We tried to time this
change to the point in time where the amount of pending patches
is the smallest: the end of the merge window.
Namespace clashes were fixed up in a preparatory patch - and some
stylistic fallout will be fixed up in a subsequent patch.
( NOTE: 'counters' are still the proper terminology when we deal
  with hardware registers - and these sed scripts are a bit
  over-eager in renaming them. I've undone some of that, but
  in case there's something left where 'counter' would be
  better than 'event' we can undo that on an individual basis
  instead of touching an otherwise nicely automated patch. )
Suggested-by: Stephane Eranian <eranian@google.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Paul Mackerras <paulus@samba.org>
Reviewed-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: <linux-arch@vger.kernel.org>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
											
										 
											2009-09-21 12:02:48 +02:00
										 |  |  | #ifdef CONFIG_PERF_EVENTS
 | 
					
						
							|  |  |  | extern void perf_events_lapic_init(void); | 
					
						
							| 
									
										
										
										
											2009-06-22 16:35:24 +02:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-03-03 13:12:23 +01:00
										 |  |  | /*
 | 
					
						
							| 
									
										
										
										
											2012-07-10 09:42:15 +02:00
										 |  |  |  * Abuse bits {3,5} of the cpu eflags register. These flags are otherwise | 
					
						
							|  |  |  |  * unused and ABI specified to be 0, so nobody should care what we do with | 
					
						
							|  |  |  |  * them. | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * EXACT - the IP points to the exact instruction that triggered the | 
					
						
							|  |  |  |  *         event (HW bugs exempt). | 
					
						
							|  |  |  |  * VM    - original X86_VM_MASK; see set_linear_ip(). | 
					
						
							| 
									
										
										
										
											2010-03-03 13:12:23 +01:00
										 |  |  |  */ | 
					
						
							|  |  |  | #define PERF_EFLAGS_EXACT	(1UL << 3)
 | 
					
						
							| 
									
										
										
										
											2012-07-10 09:42:15 +02:00
										 |  |  | #define PERF_EFLAGS_VM		(1UL << 5)
 | 
					
						
							| 
									
										
										
										
											2010-03-03 13:12:23 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-04-19 13:32:41 +08:00
										 |  |  | struct pt_regs; | 
					
						
							|  |  |  | extern unsigned long perf_instruction_pointer(struct pt_regs *regs); | 
					
						
							|  |  |  | extern unsigned long perf_misc_flags(struct pt_regs *regs); | 
					
						
							|  |  |  | #define perf_misc_flags(regs)	perf_misc_flags(regs)
 | 
					
						
							| 
									
										
										
										
											2010-03-03 13:12:23 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-05-20 07:47:21 +02:00
										 |  |  | #include <asm/stacktrace.h>
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /*
 | 
					
						
							|  |  |  |  * We abuse bit 3 from flags to pass exact information, see perf_misc_flags | 
					
						
							|  |  |  |  * and the comment with PERF_EFLAGS_EXACT. | 
					
						
							|  |  |  |  */ | 
					
						
							|  |  |  | #define perf_arch_fetch_caller_regs(regs, __ip)		{	\
 | 
					
						
							|  |  |  | 	(regs)->ip = (__ip);					\ | 
					
						
							|  |  |  | 	(regs)->bp = caller_frame_pointer();			\ | 
					
						
							|  |  |  | 	(regs)->cs = __KERNEL_CS;				\ | 
					
						
							|  |  |  | 	regs->flags = 0;					\ | 
					
						
							| 
									
										
										
										
											2011-07-02 15:00:52 +02:00
										 |  |  | 	asm volatile(						\ | 
					
						
							|  |  |  | 		_ASM_MOV "%%"_ASM_SP ", %0\n"			\ | 
					
						
							|  |  |  | 		: "=m" ((regs)->sp)				\ | 
					
						
							|  |  |  | 		:: "memory"					\ | 
					
						
							|  |  |  | 	);							\ | 
					
						
							| 
									
										
										
										
											2010-05-20 07:47:21 +02:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-10-05 14:01:21 +02:00
										 |  |  | struct perf_guest_switch_msr { | 
					
						
							|  |  |  | 	unsigned msr; | 
					
						
							|  |  |  | 	u64 host, guest; | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | extern struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr); | 
					
						
							| 
									
										
										
										
											2011-11-10 14:57:27 +02:00
										 |  |  | extern void perf_get_x86_pmu_capability(struct x86_pmu_capability *cap); | 
					
						
							| 
									
										
										
										
											2012-06-08 14:50:50 +02:00
										 |  |  | extern void perf_check_microcode(void); | 
					
						
							| 
									
										
										
										
											2008-12-03 10:39:53 +01:00
										 |  |  | #else
 | 
					
						
							| 
									
										
										
										
											2012-07-17 10:14:41 +08:00
										 |  |  | static inline struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr) | 
					
						
							| 
									
										
										
										
											2011-10-05 14:01:21 +02:00
										 |  |  | { | 
					
						
							|  |  |  | 	*nr = 0; | 
					
						
							|  |  |  | 	return NULL; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-11-10 14:57:27 +02:00
										 |  |  | static inline void perf_get_x86_pmu_capability(struct x86_pmu_capability *cap) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	memset(cap, 0, sizeof(*cap)); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												perf: Do the big rename: Performance Counters -> Performance Events
Bye-bye Performance Counters, welcome Performance Events!
In the past few months the perfcounters subsystem has grown out its
initial role of counting hardware events, and has become (and is
becoming) a much broader generic event enumeration, reporting, logging,
monitoring, analysis facility.
Naming its core object 'perf_counter' and naming the subsystem
'perfcounters' has become more and more of a misnomer. With pending
code like hw-breakpoints support the 'counter' name is less and
less appropriate.
All in one, we've decided to rename the subsystem to 'performance
events' and to propagate this rename through all fields, variables
and API names. (in an ABI compatible fashion)
The word 'event' is also a bit shorter than 'counter' - which makes
it slightly more convenient to write/handle as well.
Thanks goes to Stephane Eranian who first observed this misnomer and
suggested a rename.
User-space tooling and ABI compatibility is not affected - this patch
should be function-invariant. (Also, defconfigs were not touched to
keep the size down.)
This patch has been generated via the following script:
  FILES=$(find * -type f | grep -vE 'oprofile|[^K]config')
  sed -i \
    -e 's/PERF_EVENT_/PERF_RECORD_/g' \
    -e 's/PERF_COUNTER/PERF_EVENT/g' \
    -e 's/perf_counter/perf_event/g' \
    -e 's/nb_counters/nb_events/g' \
    -e 's/swcounter/swevent/g' \
    -e 's/tpcounter_event/tp_event/g' \
    $FILES
  for N in $(find . -name perf_counter.[ch]); do
    M=$(echo $N | sed 's/perf_counter/perf_event/g')
    mv $N $M
  done
  FILES=$(find . -name perf_event.*)
  sed -i \
    -e 's/COUNTER_MASK/REG_MASK/g' \
    -e 's/COUNTER/EVENT/g' \
    -e 's/\<event\>/event_id/g' \
    -e 's/counter/event/g' \
    -e 's/Counter/Event/g' \
    $FILES
... to keep it as correct as possible. This script can also be
used by anyone who has pending perfcounters patches - it converts
a Linux kernel tree over to the new naming. We tried to time this
change to the point in time where the amount of pending patches
is the smallest: the end of the merge window.
Namespace clashes were fixed up in a preparatory patch - and some
stylistic fallout will be fixed up in a subsequent patch.
( NOTE: 'counters' are still the proper terminology when we deal
  with hardware registers - and these sed scripts are a bit
  over-eager in renaming them. I've undone some of that, but
  in case there's something left where 'counter' would be
  better than 'event' we can undo that on an individual basis
  instead of touching an otherwise nicely automated patch. )
Suggested-by: Stephane Eranian <eranian@google.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Paul Mackerras <paulus@samba.org>
Reviewed-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: <linux-arch@vger.kernel.org>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
											
										 
											2009-09-21 12:02:48 +02:00
										 |  |  | static inline void perf_events_lapic_init(void)	{ } | 
					
						
							| 
									
										
										
										
											2012-06-08 14:50:50 +02:00
										 |  |  | static inline void perf_check_microcode(void) { } | 
					
						
							| 
									
										
										
										
											2008-12-03 10:39:53 +01:00
										 |  |  | #endif
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-02-29 14:57:32 +01:00
										 |  |  | #if defined(CONFIG_PERF_EVENTS) && defined(CONFIG_CPU_SUP_AMD)
 | 
					
						
							|  |  |  |  extern void amd_pmu_enable_virt(void); | 
					
						
							|  |  |  |  extern void amd_pmu_disable_virt(void); | 
					
						
							|  |  |  | #else
 | 
					
						
							|  |  |  |  static inline void amd_pmu_enable_virt(void) { } | 
					
						
							|  |  |  |  static inline void amd_pmu_disable_virt(void) { } | 
					
						
							|  |  |  | #endif
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-08-07 15:20:38 +02:00
										 |  |  | #define arch_perf_out_copy_user copy_from_user_nmi
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												perf: Do the big rename: Performance Counters -> Performance Events
Bye-bye Performance Counters, welcome Performance Events!
In the past few months the perfcounters subsystem has grown out its
initial role of counting hardware events, and has become (and is
becoming) a much broader generic event enumeration, reporting, logging,
monitoring, analysis facility.
Naming its core object 'perf_counter' and naming the subsystem
'perfcounters' has become more and more of a misnomer. With pending
code like hw-breakpoints support the 'counter' name is less and
less appropriate.
All in one, we've decided to rename the subsystem to 'performance
events' and to propagate this rename through all fields, variables
and API names. (in an ABI compatible fashion)
The word 'event' is also a bit shorter than 'counter' - which makes
it slightly more convenient to write/handle as well.
Thanks goes to Stephane Eranian who first observed this misnomer and
suggested a rename.
User-space tooling and ABI compatibility is not affected - this patch
should be function-invariant. (Also, defconfigs were not touched to
keep the size down.)
This patch has been generated via the following script:
  FILES=$(find * -type f | grep -vE 'oprofile|[^K]config')
  sed -i \
    -e 's/PERF_EVENT_/PERF_RECORD_/g' \
    -e 's/PERF_COUNTER/PERF_EVENT/g' \
    -e 's/perf_counter/perf_event/g' \
    -e 's/nb_counters/nb_events/g' \
    -e 's/swcounter/swevent/g' \
    -e 's/tpcounter_event/tp_event/g' \
    $FILES
  for N in $(find . -name perf_counter.[ch]); do
    M=$(echo $N | sed 's/perf_counter/perf_event/g')
    mv $N $M
  done
  FILES=$(find . -name perf_event.*)
  sed -i \
    -e 's/COUNTER_MASK/REG_MASK/g' \
    -e 's/COUNTER/EVENT/g' \
    -e 's/\<event\>/event_id/g' \
    -e 's/counter/event/g' \
    -e 's/Counter/Event/g' \
    $FILES
... to keep it as correct as possible. This script can also be
used by anyone who has pending perfcounters patches - it converts
a Linux kernel tree over to the new naming. We tried to time this
change to the point in time where the amount of pending patches
is the smallest: the end of the merge window.
Namespace clashes were fixed up in a preparatory patch - and some
stylistic fallout will be fixed up in a subsequent patch.
( NOTE: 'counters' are still the proper terminology when we deal
  with hardware registers - and these sed scripts are a bit
  over-eager in renaming them. I've undone some of that, but
  in case there's something left where 'counter' would be
  better than 'event' we can undo that on an individual basis
  instead of touching an otherwise nicely automated patch. )
Suggested-by: Stephane Eranian <eranian@google.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Paul Mackerras <paulus@samba.org>
Reviewed-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: <linux-arch@vger.kernel.org>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
											
										 
											2009-09-21 12:02:48 +02:00
										 |  |  | #endif /* _ASM_X86_PERF_EVENT_H */
 |