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

[George V. Neville-Neil]

Author: gnn
Date: Mon Jun  2 20:50:08 2014
New Revision: 266983
URL: http://svnweb.freebsd.org/changeset/base/266983

Log:
  Add missing Ivy Bridge and Haswell events.
  
  Submitted by: Anton Rang <rang at mac.com>
  MFC: 2 weeks

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

Modified: head/sys/dev/hwpmc/pmc_events.h
==============================================================================
--- head/sys/dev/hwpmc/pmc_events.h	Mon Jun  2 20:23:41 2014	(r266982)
+++ head/sys/dev/hwpmc/pmc_events.h	Mon Jun  2 20:50:08 2014	(r266983)
@@ -2573,6 +2573,7 @@ __PMC_EV_ALIAS("SIMD_INT_64.SHUFFLE_MOVE
  * Aliases for Haswell core PMC events
  */
 #define __PMC_EV_ALIAS_HASWELL()					\
+__PMC_EV_ALIAS_INTEL_ARCHITECTURAL()					\
 __PMC_EV_ALIAS("LD_BLOCKS.STORE_FORWARD", IAP_EVENT_03H_02H)		\
 __PMC_EV_ALIAS("MISALIGN_MEM_REF.LOADS", IAP_EVENT_05H_01H)		\
 __PMC_EV_ALIAS("MISALIGN_MEM_REF.STORES", IAP_EVENT_05H_02H)		\
@@ -2794,6 +2795,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("MISALIGN_MEM_REF.LOADS", IAP_EVENT_05H_01H)		\
 __PMC_EV_ALIAS("MISALIGN_MEM_REF.STORES", IAP_EVENT_05H_02H)		\
@@ -3002,6 +3004,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("MISALIGN_MEM_REF.LOADS", IAP_EVENT_05H_01H)		\
 __PMC_EV_ALIAS("MISALIGN_MEM_REF.STORES", IAP_EVENT_05H_02H)		\