svn commit: r320107 - stable/10/sys/dev/hwpmc

[Andriy Gapon]

Author: avg
Date: Mon Jun 19 15:16:47 2017
New Revision: 320107
URL: https://svnweb.freebsd.org/changeset/base/320107

Log:
  MFC r279834: Support architectural events on Haswell/Ivy Bridge

Modified:
  stable/10/sys/dev/hwpmc/pmc_events.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/hwpmc/pmc_events.h
==============================================================================
--- stable/10/sys/dev/hwpmc/pmc_events.h	Mon Jun 19 15:13:20 2017	(r320106)
+++ stable/10/sys/dev/hwpmc/pmc_events.h	Mon Jun 19 15:16:47 2017	(r320107)
@@ -2597,6 +2597,7 @@ __PMC_EV_ALIAS("SIMD_INT_64.SHUFFLE_MOVE", IAP_EVENT_F
  * Aliases for Haswell core PMC events
  */
 #define __PMC_EV_ALIAS_HASWELL_XEON()					\
+__PMC_EV_ALIAS_INTEL_ARCHITECTURAL()					\
 __PMC_EV_ALIAS("LD_BLOCKS.STORE_FORWARD", IAP_EVENT_03H_02H)		\
 __PMC_EV_ALIAS("LD_BLOCKS.NO_SR", IAP_EVENT_03H_08H)		 	\
 __PMC_EV_ALIAS("MISALIGN_MEM_REF.LOADS", IAP_EVENT_05H_01H)		\
@@ -2824,6 +2825,7 @@ __PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_DIRTY", IAP_EVENT_
 
 
 #define __PMC_EV_ALIAS_HASWELL()					\
+__PMC_EV_ALIAS_INTEL_ARCHITECTURAL()					\
 __PMC_EV_ALIAS("LD_BLOCKS.STORE_FORWARD", IAP_EVENT_03H_02H)		\
 __PMC_EV_ALIAS("LD_BLOCKS.NO_SR", IAP_EVENT_03H_08H)		 	\
 __PMC_EV_ALIAS("MISALIGN_MEM_REF.LOADS", IAP_EVENT_05H_01H)		\
@@ -3051,6 +3053,7 @@ __PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_DIRTY", IAP_EVENT_
 
 
 #define __PMC_EV_ALIAS_IVYBRIDGE()					\
+__PMC_EV_ALIAS_INTEL_ARCHITECTURAL()					\
 __PMC_EV_ALIAS("LD_BLOCKS.STORE_FORWARD", IAP_EVENT_03H_02H)		\
 __PMC_EV_ALIAS("LD_BLOCKS.NO_SR", IAP_EVENT_03H_08H)		 	\
 __PMC_EV_ALIAS("MISALIGN_MEM_REF.LOADS", IAP_EVENT_05H_01H)		\
@@ -3281,6 +3284,7 @@ __PMC_EV_ALIAS("L2_LINES_OUT.PF_DIRTY", IAP_EVENT_F2H_
  * Aliases for Ivy Bridge Xeon PMC events (325462-045US January 2013)
  */
 #define __PMC_EV_ALIAS_IVYBRIDGE_XEON()					\
+__PMC_EV_ALIAS_INTEL_ARCHITECTURAL()					\
 __PMC_EV_ALIAS("LD_BLOCKS.STORE_FORWARD", IAP_EVENT_03H_02H)		\
 __PMC_EV_ALIAS("LD_BLOCKS.NO_SR", IAP_EVENT_03H_08H)	 		\
 __PMC_EV_ALIAS("MISALIGN_MEM_REF.LOADS", IAP_EVENT_05H_01H)		\