|
Lines 1-36
Link Here
|
| 1 |
Index: papi/src/freebsd/map-i7.c |
|
|
| 2 |
diff -u papi/src/freebsd/map-i7.c:1.1.2.1 papi/src/freebsd/map-i7.c:1.1.2.2 |
| 3 |
--- papi/src/freebsd/map-i7.c:1.1.2.1 Sat Oct 31 06:16:53 2009 |
| 4 |
+++ papi/src/freebsd/map-i7.c Sat Mar 6 11:12:08 2010 |
| 5 |
@@ -4,7 +4,7 @@ |
| 6 |
|
| 7 |
/* |
| 8 |
* File: map-i7.c |
| 9 |
-* CVS: $Id: map-i7.c,v 1.1.2.1 2009/10/31 10:16:53 servat Exp $ |
| 10 |
+* CVS: $Id: map-i7.c,v 1.1.2.2 2010/03/06 16:12:08 servat Exp $ |
| 11 |
* Author: George Neville-Neil |
| 12 |
* gnn@freebsd.org |
| 13 |
* Harald Servat |
| 14 |
@@ -327,6 +327,9 @@ |
| 15 |
{"SIMD_INT_64.PACKED_LOGICAL", "Counts number of SID integer 64 bit logical operations."}, |
| 16 |
{"SIMD_INT_64.PACKED_ARITH", "Counts number of SID integer 64 bit arithmetic operations."}, |
| 17 |
{"SIMD_INT_64.SHUFFLE_MOVE", "Counts number of SID integer 64 bit shift or move operations."}, |
| 18 |
+ {"INSTR_RETIRED_ANY", "Instructions retired (IAF)"}, |
| 19 |
+ {"CPU_CLK_UNHALTED_CORE", "Unhalted core cycles (IAF)"}, |
| 20 |
+ {"CPU_CLK_UNHALTED_REF", "Unhalted reference cycles (IAF)"}, |
| 21 |
{ NULL, NULL } |
| 22 |
}; |
| 23 |
|
| 24 |
@@ -334,8 +337,12 @@ |
| 25 |
hwi_search_t i7Processor_map[] = { |
| 26 |
{PAPI_BR_INS, {0, {PNE_I7_BR_INST_RETIRED_ALL_BRANCHES, PAPI_NULL}, {0,}}}, |
| 27 |
{PAPI_RES_STL, {0, {PNE_I7_RESOURCE_STALLS_ANY, PAPI_NULL}, {0,}}}, |
| 28 |
+/* |
| 29 |
{PAPI_TOT_CYC, {0, {PNE_I7_CPU_CLK_UNHALTED_REF_P, PAPI_NULL}, {0,}}}, |
| 30 |
{PAPI_TOT_INS, {0, {PNE_I7_INST_RETIRED_ANY_P, PAPI_NULL}, {0,}}}, |
| 31 |
+*/ |
| 32 |
+ {PAPI_TOT_CYC, {0, {PNE_I7_CPU_CLK_UNHALTED_CORE, PAPI_NULL}, {0,}}}, |
| 33 |
+ {PAPI_TOT_INS, {0, {PNE_I7_INSTR_RETIRED_ANY, PAPI_NULL}, {0,}}}, |
| 34 |
{PAPI_HW_INT, {0, {PNE_I7_HW_INT_RCV, PAPI_NULL}, {0,}}}, |
| 35 |
{PAPI_BR_TKN, {0, {PNE_I7_BR_MISP_EXEC_TAKEN, PAPI_NULL}, {0,}}}, |
| 36 |
{PAPI_BR_MSP, {0, {PNE_I7_BR_MISP_EXEC_ANY, PAPI_NULL}, {0,}}}, |