svn commit: r319912 - head/sys/dev/hwpmc

[Zbigniew Bodek]

Author: zbb
Date: Tue Jun 13 18:52:39 2017
New Revision: 319912
URL: https://svnweb.freebsd.org/changeset/base/319912

Log:
  Fix event table for Cortex A9.
  
  Removed events 0x8 (INSTR_EXECUTED), 0xE (PC_PROC_RETURN) and
  0x13-0x1d not supported on Cortex A9.
  Add events 0x68 and 0x6E which replaced 0x8 and 0xE.
  
  Submitted by: Michal Mazur <mkm at semihalf.com>
  Obtained from: Semihalf
  Sponsored by: Stormshield, Netgate
  Differential revision: https://reviews.freebsd.org/D10911

Modified:
  head/sys/dev/hwpmc/pmc_events.h

Modified: head/sys/dev/hwpmc/pmc_events.h
==============================================================================
--- head/sys/dev/hwpmc/pmc_events.h	Tue Jun 13 18:51:23 2017	(r319911)
+++ head/sys/dev/hwpmc/pmc_events.h	Tue Jun 13 18:52:39 2017	(r319912)
@@ -5624,7 +5624,7 @@ __PMC_EV_ALIAS("IMPC_C0H_TRK_REQUEST.ALL", UCP_EVENT_8
 #define	PMC_EV_ARMV7_FIRST	PMC_EV_ARMV7_EVENT_00H
 #define	PMC_EV_ARMV7_LAST	PMC_EV_ARMV7_EVENT_FFH
 
-#define	__PMC_EV_ALIAS_ARMV7_COMMON_A8()				\
+#define	__PMC_EV_ALIAS_ARMV7_COMMON()					\
 	__PMC_EV_ALIAS("PMNC_SW_INCR",		ARMV7_EVENT_00H)	\
 	__PMC_EV_ALIAS("L1_ICACHE_REFILL",	ARMV7_EVENT_01H)	\
 	__PMC_EV_ALIAS("ITLB_REFILL",		ARMV7_EVENT_02H)	\
@@ -5633,20 +5633,20 @@ __PMC_EV_ALIAS("IMPC_C0H_TRK_REQUEST.ALL", UCP_EVENT_8
 	__PMC_EV_ALIAS("DTLB_REFILL",		ARMV7_EVENT_05H)	\
 	__PMC_EV_ALIAS("MEM_READ",		ARMV7_EVENT_06H)	\
 	__PMC_EV_ALIAS("MEM_WRITE",		ARMV7_EVENT_07H)	\
-	__PMC_EV_ALIAS("INSTR_EXECUTED",	ARMV7_EVENT_08H)	\
 	__PMC_EV_ALIAS("EXC_TAKEN",		ARMV7_EVENT_09H)	\
 	__PMC_EV_ALIAS("EXC_EXECUTED",		ARMV7_EVENT_0AH)	\
 	__PMC_EV_ALIAS("CID_WRITE",		ARMV7_EVENT_0BH)	\
 	__PMC_EV_ALIAS("PC_WRITE",		ARMV7_EVENT_0CH)	\
 	__PMC_EV_ALIAS("PC_IMM_BRANCH",		ARMV7_EVENT_0DH)	\
-	__PMC_EV_ALIAS("PC_PROC_RETURN",	ARMV7_EVENT_0EH)	\
 	__PMC_EV_ALIAS("MEM_UNALIGNED_ACCESS",	ARMV7_EVENT_0FH)	\
 	__PMC_EV_ALIAS("PC_BRANCH_MIS_PRED",	ARMV7_EVENT_10H)	\
 	__PMC_EV_ALIAS("CLOCK_CYCLES",		ARMV7_EVENT_11H)	\
 	__PMC_EV_ALIAS("PC_BRANCH_PRED",	ARMV7_EVENT_12H)
 
-#define	__PMC_EV_ALIAS_ARMV7_COMMON()					\
-	__PMC_EV_ALIAS_ARMV7_COMMON_A8()				\
+#define	__PMC_EV_ALIAS_ARMV7_COMMON_A8()				\
+	__PMC_EV_ALIAS_ARMV7_COMMON()					\
+	__PMC_EV_ALIAS("INSTR_EXECUTED",	ARMV7_EVENT_08H)	\
+	__PMC_EV_ALIAS("PC_PROC_RETURN",	ARMV7_EVENT_0EH)	\
 	__PMC_EV_ALIAS("MEM_ACCESS",		ARMV7_EVENT_13H)	\
 	__PMC_EV_ALIAS("L1_ICACHE_ACCESS",	ARMV7_EVENT_14H)	\
 	__PMC_EV_ALIAS("L1_DCACHE_WB",		ARMV7_EVENT_15H)	\
@@ -5710,6 +5710,8 @@ __PMC_EV_ALIAS("IMPC_C0H_TRK_REQUEST.ALL", UCP_EVENT_8
 	__PMC_EV_ALIAS("DATA_EVICTION",			ARMV7_EVENT_65H)	\
 	__PMC_EV_ALIAS("ISSUE_DNOT_DISPATCH_ANY_INSTR",	ARMV7_EVENT_66H)	\
 	__PMC_EV_ALIAS("ISSUE_IS_EMPTY",		ARMV7_EVENT_67H)	\
+	__PMC_EV_ALIAS("INSTR_RENAMED",			ARMV7_EVENT_68H)	\
+	__PMC_EV_ALIAS("PREDICTABLE_FUNCTION_RETURN",	ARMV7_EVENT_6EH)	\
 	__PMC_EV_ALIAS("MAIN_EXECUTION_UNIT_PIPE",	ARMV7_EVENT_70H)	\
 	__PMC_EV_ALIAS("SECOND_EXECUTION_UNIT_PIPE",	ARMV7_EVENT_71H)	\
 	__PMC_EV_ALIAS("LOAD_STORE_PIPE",		ARMV7_EVENT_72H)	\