summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbz <bz@FreeBSD.org>2014-10-12 10:39:59 +0000
committerbz <bz@FreeBSD.org>2014-10-12 10:39:59 +0000
commit4312cb7398483961718347416773a13258c75680 (patch)
tree2e5ca352b21032a198f4acfb92a174abe513f29f
parent23e62f1e420c1c7cea469251b944f0c0dea4ce45 (diff)
downloadFreeBSD-src-4312cb7398483961718347416773a13258c75680.zip
FreeBSD-src-4312cb7398483961718347416773a13258c75680.tar.gz
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)
-rw-r--r--sys/dev/hwpmc/hwpmc_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/hwpmc/hwpmc_core.c b/sys/dev/hwpmc/hwpmc_core.c
index c8cc4a3..f182450 100644
--- a/sys/dev/hwpmc/hwpmc_core.c
+++ b/sys/dev/hwpmc/hwpmc_core.c
@@ -1796,7 +1796,7 @@ iap_is_event_architectural(enum pmc_event pe, enum pmc_event *map)
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;
OpenPOWER on IntegriCloud