diff options
Diffstat (limited to 'devel/papi')
| -rw-r--r-- | devel/papi/Makefile | 2 | ||||
| -rw-r--r-- | devel/papi/files/patch-freebsd__map-i7.c | 36 | ||||
| -rw-r--r-- | devel/papi/files/patch-freebsd__map-i7.h | 23 | ||||
| -rw-r--r-- | devel/papi/pkg-plist | 1 |
4 files changed, 62 insertions, 0 deletions
diff --git a/devel/papi/Makefile b/devel/papi/Makefile index 015ec30bde89..b1a19cac812a 100644 --- a/devel/papi/Makefile +++ b/devel/papi/Makefile @@ -7,6 +7,7 @@ PORTNAME= papi PORTVERSION= 3.7.1 +PORTREVESION= 1 CATEGORIES= devel MASTER_SITES= http://icl.cs.utk.edu/projects/papi/downloads/ @@ -258,6 +259,7 @@ do-install: .for f in ${PAPI_LIBS} ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/lib .endfor + ${LN} -s ${PREFIX}/lib/libpapi.so.3 ${PREFIX}/lib/libpapi.so .for f in ${MAN1} ${INSTALL_MAN} ${WRKMAN}/man1/${f} ${PREFIX}/man/man1 .endfor diff --git a/devel/papi/files/patch-freebsd__map-i7.c b/devel/papi/files/patch-freebsd__map-i7.c new file mode 100644 index 000000000000..b4d5d76f5b4c --- /dev/null +++ b/devel/papi/files/patch-freebsd__map-i7.c @@ -0,0 +1,36 @@ +Index: freebsd/map-i7.c +diff -u freebsd/map-i7.c:1.1.2.1 freebsd/map-i7.c:1.1.2.2 +--- freebsd/map-i7.c:1.1.2.1 Sat Oct 31 06:16:53 2009 ++++ freebsd/map-i7.c Sat Mar 6 11:12:08 2010 +@@ -4,7 +4,7 @@ + + /* + * File: map-i7.c +-* CVS: $Id: map-i7.c,v 1.1.2.1 2009/10/31 10:16:53 servat Exp $ ++* CVS: $Id: map-i7.c,v 1.1.2.2 2010/03/06 16:12:08 servat Exp $ + * Author: George Neville-Neil + * gnn@freebsd.org + * Harald Servat +@@ -327,6 +327,9 @@ + {"SIMD_INT_64.PACKED_LOGICAL", "Counts number of SID integer 64 bit logical operations."}, + {"SIMD_INT_64.PACKED_ARITH", "Counts number of SID integer 64 bit arithmetic operations."}, + {"SIMD_INT_64.SHUFFLE_MOVE", "Counts number of SID integer 64 bit shift or move operations."}, ++ {"INSTR_RETIRED_ANY", "Instructions retired (IAF)"}, ++ {"CPU_CLK_UNHALTED_CORE", "Unhalted core cycles (IAF)"}, ++ {"CPU_CLK_UNHALTED_REF", "Unhalted reference cycles (IAF)"}, + { NULL, NULL } + }; + +@@ -334,8 +337,12 @@ + hwi_search_t i7Processor_map[] = { + {PAPI_BR_INS, {0, {PNE_I7_BR_INST_RETIRED_ALL_BRANCHES, PAPI_NULL}, {0,}}}, + {PAPI_RES_STL, {0, {PNE_I7_RESOURCE_STALLS_ANY, PAPI_NULL}, {0,}}}, ++/* + {PAPI_TOT_CYC, {0, {PNE_I7_CPU_CLK_UNHALTED_REF_P, PAPI_NULL}, {0,}}}, + {PAPI_TOT_INS, {0, {PNE_I7_INST_RETIRED_ANY_P, PAPI_NULL}, {0,}}}, ++*/ ++ {PAPI_TOT_CYC, {0, {PNE_I7_CPU_CLK_UNHALTED_CORE, PAPI_NULL}, {0,}}}, ++ {PAPI_TOT_INS, {0, {PNE_I7_INSTR_RETIRED_ANY, PAPI_NULL}, {0,}}}, + {PAPI_HW_INT, {0, {PNE_I7_HW_INT_RCV, PAPI_NULL}, {0,}}}, + {PAPI_BR_TKN, {0, {PNE_I7_BR_MISP_EXEC_TAKEN, PAPI_NULL}, {0,}}}, + {PAPI_BR_MSP, {0, {PNE_I7_BR_MISP_EXEC_ANY, PAPI_NULL}, {0,}}}, diff --git a/devel/papi/files/patch-freebsd__map-i7.h b/devel/papi/files/patch-freebsd__map-i7.h new file mode 100644 index 000000000000..d8954780fc75 --- /dev/null +++ b/devel/papi/files/patch-freebsd__map-i7.h @@ -0,0 +1,23 @@ +Index: freebsd/map-i7.h +diff -u freebsd/map-i7.h:1.1.2.1 freebsd/map-i7.h:1.1.2.2 +--- freebsd/map-i7.h:1.1.2.1 Sat Oct 31 06:16:53 2009 ++++ freebsd/map-i7.h Sat Mar 6 11:12:08 2010 +@@ -4,7 +4,7 @@ + + /* + * File: map-i7.h +-* CVS: $Id: map-i7.h,v 1.1.2.1 2009/10/31 10:16:53 servat Exp $ ++* CVS: $Id: map-i7.h,v 1.1.2.2 2010/03/06 16:12:08 servat Exp $ + * Author: George Neville-Neil + * gnn@freebsd.org + */ +@@ -310,6 +310,9 @@ + PNE_I7_SIMD_INT_64_PACKED_LOGICAL, + PNE_I7_SIMD_INT_64_PACKED_ARITH, + PNE_I7_SIMD_INT_64_SHUFFLE_MOVE, ++ PNE_I7_INSTR_RETIRED_ANY, ++ PNE_I7_CPU_CLK_UNHALTED_CORE, ++ PNE_I7_CPU_CLK_UNHALTED_REF, + PNE_I7_NATNAME_GUARD + }; + diff --git a/devel/papi/pkg-plist b/devel/papi/pkg-plist index 8568f9f11a88..423973446da8 100644 --- a/devel/papi/pkg-plist +++ b/devel/papi/pkg-plist @@ -12,6 +12,7 @@ include/fpapi.h include/papi.h include/papiStdEventDefs.h lib/libpapi.a +lib/libpapi.so lib/libpapi.so.3 %%CTESTS%%share/papi/ctests/all_events %%CTESTS%%share/papi/ctests/all_native_events |