Author: sbruno
Date: Wed Oct 24 01:26:29 2012
New Revision: 241974
URL: http://svn.freebsd.org/changeset/base/241974
Log:
Cleanup and rename some variables in libpmc and hwpmc.
Submitted by: hiren panchasara <hiren.panchas...@gmail.com>
Reviewed by: jimharris@ sbruno@
Obtained from: Yahoo! Inc.
MFC after: 2 weeks
Modified:
head/lib/libpmc/libpmc.c
head/lib/libpmc/pmc.ivybridge.3
head/lib/libpmc/pmc.sandybridge.3
head/lib/libpmc/pmc.sandybridgexeon.3
head/sys/dev/hwpmc/pmc_events.h
Modified: head/lib/libpmc/libpmc.c
==============================================================================
--- head/lib/libpmc/libpmc.c Tue Oct 23 23:49:17 2012 (r241973)
+++ head/lib/libpmc/libpmc.c Wed Oct 24 01:26:29 2012 (r241974)
@@ -721,7 +721,7 @@ static struct pmc_masks iap_rsp_mask_sb_
PMCMASK(RES_SUPPLIER_LLC_HITS, (1ULL << 20)),
PMCMASK(RES_SUPPLIER_LLC_HITF, (1ULL << 21)),
PMCMASK(RES_SUPPLIER_LOCAL, (1ULL << 22)),
- PMCMASK(RES_SNOOP_SNPI_NONE, (1ULL << 31)),
+ PMCMASK(RES_SNOOP_SNP_NONE, (1ULL << 31)),
PMCMASK(RES_SNOOP_SNP_NO_NEEDED,(1ULL << 32)),
PMCMASK(RES_SNOOP_SNP_MISS, (1ULL << 33)),
PMCMASK(RES_SNOOP_HIT_NO_FWD, (1ULL << 34)),
Modified: head/lib/libpmc/pmc.ivybridge.3
==============================================================================
--- head/lib/libpmc/pmc.ivybridge.3 Tue Oct 23 23:49:17 2012
(r241973)
+++ head/lib/libpmc/pmc.ivybridge.3 Wed Oct 24 01:26:29 2012
(r241974)
@@ -134,7 +134,7 @@ S-state.
F-state.
.It Li RES_SUPPLIER_LOCAL
Local DRAM Controller.
-.It Li RES_SNOOP_SNPI_NONE
+.It Li RES_SNOOP_SNP_NONE
No details on snoop-related information.
.It Li RES_SNOOP_SNP_NO_NEEDED
No snoop was needed to satisfy the request.
Modified: head/lib/libpmc/pmc.sandybridge.3
==============================================================================
--- head/lib/libpmc/pmc.sandybridge.3 Tue Oct 23 23:49:17 2012
(r241973)
+++ head/lib/libpmc/pmc.sandybridge.3 Wed Oct 24 01:26:29 2012
(r241974)
@@ -138,7 +138,7 @@ S-state.
F-state.
.It Li RES_SUPPLIER_LOCAL
Local DRAM Controller.
-.It Li RES_SNOOP_SNPI_NONE
+.It Li RES_SNOOP_SNP_NONE
No details on snoop-related information.
.It Li RES_SNOOP_SNP_NO_NEEDED
No snoop was needed to satisfy the request.
Modified: head/lib/libpmc/pmc.sandybridgexeon.3
==============================================================================
--- head/lib/libpmc/pmc.sandybridgexeon.3 Tue Oct 23 23:49:17 2012
(r241973)
+++ head/lib/libpmc/pmc.sandybridgexeon.3 Wed Oct 24 01:26:29 2012
(r241974)
@@ -135,7 +135,7 @@ S-state.
F-state.
.It Li RES_SUPPLIER_LOCAL
Local DRAM Controller.
-.It Li RES_SNOOP_SNPI_NONE
+.It Li RES_SNOOP_SNP_NONE
No details on snoop-related information.
.It Li RES_SNOOP_SNP_NO_NEEDED
No snoop was needed to satisfy the request.
Modified: head/sys/dev/hwpmc/pmc_events.h
==============================================================================
--- head/sys/dev/hwpmc/pmc_events.h Tue Oct 23 23:49:17 2012
(r241973)
+++ head/sys/dev/hwpmc/pmc_events.h Wed Oct 24 01:26:29 2012
(r241974)
@@ -2640,7 +2640,7 @@ __PMC_EV_ALIAS("DTLB_STORE_MISSES.WALK_C
__PMC_EV_ALIAS("DTLB_STORE_MISSES.WALK_DURATION", IAP_EVENT_49H_04H)
\
__PMC_EV_ALIAS("DTLB_STORE_MISSES.STLB_HIT", IAP_EVENT_49H_10H)
\
__PMC_EV_ALIAS("LOAD_HIT_PRE.SW_PF", IAP_EVENT_4CH_01H)
\
-__PMC_EV_ALIAS("LOAD_HIT_PER.HW_PF", IAP_EVENT_4CH_02H)
\
+__PMC_EV_ALIAS("LOAD_HIT_PRE.HW_PF", IAP_EVENT_4CH_02H)
\
__PMC_EV_ALIAS("HW_PRE_REQ.DL1_MISS", IAP_EVENT_4EH_02H)
\
__PMC_EV_ALIAS("L1D.REPLACEMENT", IAP_EVENT_51H_01H)
\
__PMC_EV_ALIAS("L1D.ALLOCATED_IN_M", IAP_EVENT_51H_02H)
\
@@ -2777,7 +2777,7 @@ __PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RE
__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_NONE", IAP_EVENT_D2H_08H)
\
__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.LLC_MISS", IAP_EVENT_D4H_02H)
\
__PMC_EV_ALIAS("L2_TRANS.DEMAND_DATA_RD", IAP_EVENT_F0H_01H)
\
-__PMC_EV_ALIAS("L2_TRANS.RF0", IAP_EVENT_F0H_02H)
\
+__PMC_EV_ALIAS("L2_TRANS.RFO", IAP_EVENT_F0H_02H)
\
__PMC_EV_ALIAS("L2_TRANS.CODE_RD", IAP_EVENT_F0H_04H)
\
__PMC_EV_ALIAS("L2_TRANS.ALL_PF", IAP_EVENT_F0H_08H)
\
__PMC_EV_ALIAS("L2_TRANS.L1D_WB", IAP_EVENT_F0H_10H)
\
@@ -2787,7 +2787,7 @@ __PMC_EV_ALIAS("L2_TRANS.ALL_REQUESTS",
__PMC_EV_ALIAS("L2_LINES_IN.I", IAP_EVENT_F1H_01H)
\
__PMC_EV_ALIAS("L2_LINES_IN.S", IAP_EVENT_F1H_02H)
\
__PMC_EV_ALIAS("L2_LINES_IN.E", IAP_EVENT_F1H_04H)
\
-__PMC_EV_ALIAS("L2_LINES-IN.ALL", IAP_EVENT_F1H_07H)
\
+__PMC_EV_ALIAS("L2_LINES_IN.ALL", IAP_EVENT_F1H_07H)
\
__PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_CLEAN", IAP_EVENT_F2H_01H)
\
__PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_DIRTY", IAP_EVENT_F2H_02H)
\
__PMC_EV_ALIAS("L2_LINES_OUT.PF_CLEAN", IAP_EVENT_F2H_04H)
\
@@ -2855,7 +2855,7 @@ __PMC_EV_ALIAS("DTLB_STORE_MISSES.WALK_C
__PMC_EV_ALIAS("DTLB_STORE_MISSES.WALK_DURATION", IAP_EVENT_49H_04H)
\
__PMC_EV_ALIAS("DTLB_STORE_MISSES.STLB_HIT", IAP_EVENT_49H_10H)
\
__PMC_EV_ALIAS("LOAD_HIT_PRE.SW_PF", IAP_EVENT_4CH_01H)
\
-__PMC_EV_ALIAS("LOAD_HIT_PER.HW_PF", IAP_EVENT_4CH_02H)
\
+__PMC_EV_ALIAS("LOAD_HIT_PRE.HW_PF", IAP_EVENT_4CH_02H)
\
__PMC_EV_ALIAS("HW_PRE_REQ.DL1_MISS", IAP_EVENT_4EH_02H)
\
__PMC_EV_ALIAS("L1D.REPLACEMENT", IAP_EVENT_51H_01H)
\
__PMC_EV_ALIAS("L1D.ALLOCATED_IN_M", IAP_EVENT_51H_02H)
\
@@ -3005,7 +3005,7 @@ __PMC_EV_ALIAS("L2_TRANS.ALL_REQUESTS",
__PMC_EV_ALIAS("L2_LINES_IN.I", IAP_EVENT_F1H_01H)
\
__PMC_EV_ALIAS("L2_LINES_IN.S", IAP_EVENT_F1H_02H)
\
__PMC_EV_ALIAS("L2_LINES_IN.E", IAP_EVENT_F1H_04H)
\
-__PMC_EV_ALIAS("L2_LINES-IN.ALL", IAP_EVENT_F1H_07H)
\
+__PMC_EV_ALIAS("L2_LINES_IN.ALL", IAP_EVENT_F1H_07H)
\
__PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_CLEAN", IAP_EVENT_F2H_01H)
\
__PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_DIRTY", IAP_EVENT_F2H_02H)
\
__PMC_EV_ALIAS("L2_LINES_OUT.PF_CLEAN", IAP_EVENT_F2H_04H)
\
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
