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

[Ryan Stone]

Author: rstone
Date: Tue Mar 10 01:24:02 2015
New Revision: 279834
URL: https://svnweb.freebsd.org/changeset/base/279834

Log:
  Support architectural events on Haswell/Ivy Bridge
  
  Differential Revision:	https://reviews.freebsd.org/D1589
  MFC after:	1 month
  Sponsored by:	Sandvine Inc

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

Modified: head/sys/dev/hwpmc/pmc_events.h
==============================================================================
--- head/sys/dev/hwpmc/pmc_events.h	Tue Mar 10 01:23:55 2015	(r279833)
+++ head/sys/dev/hwpmc/pmc_events.h	Tue Mar 10 01:24:02 2015	(r279834)
@@ -2592,6 +2592,7 @@ __PMC_EV_ALIAS("SIMD_INT_64.SHUFFLE_MOVE
  * 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)		\
@@ -2819,6 +2820,7 @@ __PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_DIRT
 
 
 #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)		\
@@ -3046,6 +3048,7 @@ __PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_DIRT
 
 
 #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)		\
@@ -3276,6 +3279,7 @@ __PMC_EV_ALIAS("L2_LINES_OUT.PF_DIRTY", 
  * 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)		\