svn commit: r272981 - releng/10.1/sys/dev/hwpmc

[Bjoern A. Zeeb]

Author: bz
Date: Sun Oct 12 10:39:59 2014
New Revision: 272981
URL: https://svnweb.freebsd.org/changeset/base/272981

Log:
  MFS r272892 (r272713 in head):
  
   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
  Approved by:		re (gjb)

Modified:
  releng/10.1/sys/dev/hwpmc/hwpmc_core.c
Directory Properties:
  releng/10.1/   (props changed)

Modified: releng/10.1/sys/dev/hwpmc/hwpmc_core.c
==============================================================================
--- releng/10.1/sys/dev/hwpmc/hwpmc_core.c	Sun Oct 12 10:07:26 2014	(r272980)
+++ releng/10.1/sys/dev/hwpmc/hwpmc_core.c	Sun Oct 12 10:39:59 2014	(r272981)
@@ -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;