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

[Bjoern A. Zeeb]

Author: bz
Date: Fri Oct 10 12:02:34 2014
New Revision: 272892
URL: https://svnweb.freebsd.org/changeset/base/272892

Log:
  MFC r272713:
  
   Since introducing the extra mapping in r250103 (head) for architectural performance
   events we have actually counted 'Branch Instruction Retired' when people
   asked for 'Unhalted core cycles' using the 'unhalted-core-cycles' event mask
   mnemonic.
  
   Reviewed by:		jimharris
   Discussed with:	gnn, rwatson
  Sponsored by:		DARPA/AFRL

Modified:
  stable/10/sys/dev/hwpmc/hwpmc_core.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/hwpmc/hwpmc_core.c
==============================================================================
--- stable/10/sys/dev/hwpmc/hwpmc_core.c	Fri Oct 10 08:57:55 2014	(r272891)
+++ stable/10/sys/dev/hwpmc/hwpmc_core.c	Fri Oct 10 12:02:34 2014	(r272892)
@@ -1796,7 +1796,7 @@ iap_is_event_architectural(enum pmc_even
 	switch (pe) {
 	case PMC_EV_IAP_ARCH_UNH_COR_CYC:
 		ae = CORE_AE_UNHALTED_CORE_CYCLES;
-		*map = PMC_EV_IAP_EVENT_C4H_00H;
+		*map = PMC_EV_IAP_EVENT_3CH_00H;
 		break;
 	case PMC_EV_IAP_ARCH_INS_RET:
 		ae = CORE_AE_INSTRUCTION_RETIRED;