Date: Sun, 23 Jan 2011 13:45:11 GMT From: Harald Servat <redcrash@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/154239: [UPDATE] papi/devel from 3.7.1 to 4.1.2.1 Message-ID: <201101231345.p0NDjBQS007681@red.freebsd.org> Resent-Message-ID: <201101231350.p0NDo8YJ075087@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 154239 >Category: ports >Synopsis: [UPDATE] papi/devel from 3.7.1 to 4.1.2.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Jan 23 13:50:08 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Harald Servat >Release: 8.2-PRERELEASE >Organization: >Environment: FreeBSD blackbox.localhost 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #2: Thu Dec 23 21:23:05 CET 2010 root@blackbox.localhost:/usr/obj/usr/src/sys/BLACKBOX amd64 >Description: The attached patch is intended to update the devel/papi port from the 3.7.1 release to the latest 4.1.2.1. The patch also includes support for Intel Core i[357] processors and also adds a support to access to the Intel Core thermal sensors. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN papi/Makefile papi-new/Makefile --- papi/Makefile 2010-03-18 19:50:45.000000000 +0100 +++ papi-new/Makefile 2011-01-23 14:01:18.000000000 +0100 @@ -6,8 +6,7 @@ # PORTNAME= papi -PORTVERSION= 3.7.1 -PORTREVESION= 1 +PORTVERSION= 4.1.2.1 CATEGORIES= devel MASTER_SITES= http://icl.cs.utk.edu/projects/papi/downloads/ @@ -26,8 +25,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src WRKMAN= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/man -OPTIONS= CTESTS "Install C tests" On -OPTIONS+= FTESTS "Install Fortran tests" On +OPTIONS= CORETEMP "Add Intel Core thermal sensor (need coretemp.ko)" Off OPTIONS+= DEBUG "Add debug information (increased verbosity)" Off .include <bsd.port.pre.mk> @@ -39,20 +37,10 @@ Please consult hwpmc(4) on how to do it (or cat pkg-message) .endif -.if defined(WITHOUT_CTESTS) -PLIST_SUB+= CTESTS="@comment " -.else -PLIST_SUB+= CTESTS="" CONFIGURE_ARGS+= --with-tests=ctests -.endif -.if defined(WITHOUT_FTESTS) -PLIST_SUB+= FTESTS="@comment " -.else -PLIST_SUB+= FTESTS="" -USE_FORTRAN= yes -CONFIGURE_ARGS+= --with-tests="ctests ftests" -FFLAGS= -fdefault-integer-8 -fno-range-check +.if defined(WITH_CORETEMP) +CONFIGURE_ARGS+= --with-components=coretemp_freebsd .endif .if defined(WITHOUT_DEBUG) @@ -81,6 +69,7 @@ PAPI_accum_counters.3 \ PAPI_add_event.3 \ PAPI_add_events.3 \ + PAPI_assign_eventset_component.3 \ PAPI_attach.3 \ PAPI_cleanup_eventset.3 \ PAPI_create_eventset.3 \ @@ -92,7 +81,9 @@ PAPI_event_name_to_code.3 \ PAPI_flips.3 \ PAPI_flops.3 \ - PAPI_get_dmem_info.3 \ + PAPI_get_cmp_opt.3 \ + PAPI_get_component_info.3 \ + PAPI_get_dmem_info.3 \ PAPI_get_event_info.3 \ PAPI_get_executable_info.3 \ PAPI_get_hardware_info.3 \ @@ -113,8 +104,10 @@ PAPI_list_events.3 \ PAPI_list_threads.3 \ PAPI_lock.3 \ - PAPI_multiplex_init.3 \ + PAPI_multiplex_init.3 \ PAPI_native.3 \ + PAPI_num_cmp_hwctrs.3 \ + PAPI_num_components.3 \ PAPI_num_counters.3 \ PAPI_num_events.3 \ PAPI_num_hwctrs.3 \ @@ -129,6 +122,8 @@ PAPI_remove_event.3 \ PAPI_remove_events.3 \ PAPI_reset.3 \ + PAPI_set_cmp_domain.3 \ + PAPI_set_cmp_granularity.3 \ PAPI_set_debug.3 \ PAPI_set_domain.3 \ PAPI_set_event_info.3 \ @@ -151,7 +146,7 @@ PAPI_write.3 PAPI_LIBS= libpapi.a \ - libpapi.so.3 + libpapi.so.4 PAPI_BINARIES= papi_avail \ papi_clockres \ @@ -168,74 +163,89 @@ papi.h \ papiStdEventDefs.h -PAPI_FORTRAN_TESTS= strtest \ - zero \ - first \ - second \ - tenth \ - description \ - fdmemtest \ - accum \ - highlevel \ - cost \ - johnmay2 \ - avail \ +PAPI_C_TESTS= \ + all_events \ + all_native_events \ + api \ + branches \ + burn \ + byte_profile \ + calibrate \ case1 \ case2 \ - clockres \ - eventname \ - fmatrixlowpapi \ - fmatrixpapi \ - flops \ - fmatrixpapi2 \ - fmultiplex1 \ - fmultiplex2 - -PAPI_C_TESTS= ipc \ - hwinfo \ + child_overflow \ + clockres_pthreads \ code2name \ - reset \ - subinfo \ - realtime \ - first \ - exeinfo \ - zero \ - branches \ - dmem_info \ - all_native_events \ - all_events \ derived \ - high-level2 \ describe \ - memory \ - zero_flip \ - low-level \ - high-level \ + dmem_info \ eventname \ - case1 \ - case2 \ - calibrate \ + exec \ + exec2 \ + exec_overflow \ + exeinfo \ + first \ flops \ - second \ + fork \ + fork2 \ + fork_overflow \ + forkexec \ + forkexec2 \ + forkexec3 \ + forkexec4 \ + high-level \ + high-level2 \ + hwinfo \ + ipc \ johnmay2 \ - matrix-hl \ - tenth \ - encode \ - encode2 \ - multiplex1_pthreads \ - multiplex3_pthreads \ + krentel_pthreads \ kufrin \ + locks_pthreads \ + low-level \ + matrix-hl \ + memory \ + mendes-alt \ + multiattach \ multiplex1 \ + multiplex1_pthreads \ multiplex2 \ - mendes-alt \ + multiplex3_pthreads \ + overflow \ + overflow2 \ + overflow3_pthreads \ + overflow_allcounters \ + overflow_force_software \ + overflow_index \ + overflow_one_and_read \ + overflow_pthreads \ + overflow_single_event \ + overflow_twoevents \ + profile \ + profile_force_software \ + profile_pthreads \ + profile_twoevents \ + pthrtough \ + pthrtough2 \ + realtime \ + reset \ sdsc-mpx \ sdsc2-mpx \ sdsc4-mpx \ + second \ + shlib \ + sprofile \ + subinfo \ + system_child_overflow \ + system_overflow \ + tenth \ thrspecific \ - zero_pthreads \ - unregister_pthreads \ - clockres_pthreads \ - locks_pthreads + timer_overflow \ + virttime \ + zero \ + zero_attach \ + zero_flip \ + zero_fork \ + zero_pthreads do-install: .for f in ${PAPI_BINARIES} @@ -244,22 +254,14 @@ .for f in ${PAPI_INCLUDES} ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/include .endfor -.if defined(WITH_FTESTS) - ${MKDIR} ${DATADIR}/ftests -.for f in ${PAPI_FORTRAN_TESTS} - ${INSTALL_PROGRAM} ${WRKSRC}/ftests/${f} ${DATADIR}/ftests +.for f in ${PAPI_LIBS} + ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/lib .endfor -.endif -.if defined(WITH_CTESTS) + ${LN} -s ${PREFIX}/lib/libpapi.so.3 ${PREFIX}/lib/libpapi.so ${MKDIR} ${DATADIR}/ctests .for f in ${PAPI_C_TESTS} ${INSTALL_PROGRAM} ${WRKSRC}/ctests/${f} ${DATADIR}/ctests .endfor -.endif -.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 -ruN papi/distinfo papi-new/distinfo --- papi/distinfo 2009-12-03 09:59:40.000000000 +0100 +++ papi-new/distinfo 2011-01-23 13:26:20.000000000 +0100 @@ -1,3 +1,2 @@ -MD5 (papi-3.7.1.tar.gz) = c9d9b073e62bc36dc13d5aa1ee65ec4e -SHA256 (papi-3.7.1.tar.gz) = 447b9439151123cfc45544f3b5bb8f4b4e4024e3f99176230959aa1d144e7f42 -SIZE (papi-3.7.1.tar.gz) = 4568059 +SHA256 (papi-4.1.2.1.tar.gz) = 9ca015345e87014ff7e44ab4fdf76289ff02f74547adda987a2d26fa55d20d70 +SIZE (papi-4.1.2.1.tar.gz) = 3637476 diff -ruN papi/files/patch-freebsd__map-atom.c papi-new/files/patch-freebsd__map-atom.c --- papi/files/patch-freebsd__map-atom.c 2009-12-03 09:59:41.000000000 +0100 +++ papi-new/files/patch-freebsd__map-atom.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ ---- ./freebsd/map-atom.c.old 2009-11-21 11:45:38.000000000 +0100 -+++ ./freebsd/map-atom.c 2009-11-21 11:45:49.000000000 +0100 -@@ -280,9 +280,6 @@ - {PAPI_L2_DCH, {0, {PNE_ATOM_L2_LD, PAPI_NULL}, {0,}}}, - {PAPI_FP_INS, {0, {PNE_ATOM_X87_OPS_RETIRED_ANY, PAPI_NULL}, {0,}}}, - {PAPI_L1_ICM, {0, {PNE_ATOM_L1I_MISSES, PAPI_NULL}, {0,}}}, --#if HWPMC_NUM_COUNTERS >= 2 -- {PAPI_L1_TCM, {DERIVED_ADD, {PNE_ATOM_MEM_LOAD_RETIRED_L1D_MISS, PNE_ATOM_L1I_MISSES, PAPI_NULL}, {0,}}}, --#endif - {PAPI_L2_DCM, {0, {PNE_ATOM_MEM_LOAD_RETIRED_L2_MISS, PAPI_NULL}, {0,}}}, - #if HWPMC_NUM_COUNTERS >= 2 - {PAPI_TLB_TL, {DERIVED_ADD, {PNE_ATOM_DTLB_MISSES_ANY, PNE_ATOM_ITLB_MISSES, PAPI_NULL},{0,}}}, diff -ruN papi/files/patch-freebsd__map-i7.c papi-new/files/patch-freebsd__map-i7.c --- papi/files/patch-freebsd__map-i7.c 2010-03-18 19:50:45.000000000 +0100 +++ papi-new/files/patch-freebsd__map-i7.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -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 -ruN papi/files/patch-freebsd__map-i7.h papi-new/files/patch-freebsd__map-i7.h --- papi/files/patch-freebsd__map-i7.h 2010-03-18 19:50:45.000000000 +0100 +++ papi-new/files/patch-freebsd__map-i7.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -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 -ruN papi/pkg-message papi-new/pkg-message --- papi/pkg-message 2007-06-18 16:21:07.000000000 +0200 +++ papi-new/pkg-message 2011-01-23 13:49:57.000000000 +0100 @@ -5,5 +5,8 @@ and, * device hwpmc (or kldload hwpmc.ko) + Additionally, for i386 systems you need: + * device apic + See http://code.google.com/p/papi-for-freebsd/wiki/HowToInstall for further details. diff -ruN papi/pkg-plist papi-new/pkg-plist --- papi/pkg-plist 2010-03-18 19:50:45.000000000 +0100 +++ papi-new/pkg-plist 2011-01-23 13:47:36.000000000 +0100 @@ -13,75 +13,87 @@ 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 -%%CTESTS%%share/papi/ctests/branches -%%CTESTS%%share/papi/ctests/calibrate -%%CTESTS%%share/papi/ctests/case1 -%%CTESTS%%share/papi/ctests/case2 -%%CTESTS%%share/papi/ctests/clockres_pthreads -%%CTESTS%%share/papi/ctests/code2name -%%CTESTS%%share/papi/ctests/derived -%%CTESTS%%share/papi/ctests/describe -%%CTESTS%%share/papi/ctests/dmem_info -%%CTESTS%%share/papi/ctests/encode -%%CTESTS%%share/papi/ctests/encode2 -%%CTESTS%%share/papi/ctests/eventname -%%CTESTS%%share/papi/ctests/exeinfo -%%CTESTS%%share/papi/ctests/first -%%CTESTS%%share/papi/ctests/flops -%%CTESTS%%share/papi/ctests/high-level -%%CTESTS%%share/papi/ctests/high-level2 -%%CTESTS%%share/papi/ctests/hwinfo -%%CTESTS%%share/papi/ctests/ipc -%%CTESTS%%share/papi/ctests/johnmay2 -%%CTESTS%%share/papi/ctests/kufrin -%%CTESTS%%share/papi/ctests/locks_pthreads -%%CTESTS%%share/papi/ctests/low-level -%%CTESTS%%share/papi/ctests/matrix-hl -%%CTESTS%%share/papi/ctests/memory -%%CTESTS%%share/papi/ctests/mendes-alt -%%CTESTS%%share/papi/ctests/multiplex1 -%%CTESTS%%share/papi/ctests/multiplex1_pthreads -%%CTESTS%%share/papi/ctests/multiplex2 -%%CTESTS%%share/papi/ctests/multiplex3_pthreads -%%CTESTS%%share/papi/ctests/realtime -%%CTESTS%%share/papi/ctests/reset -%%CTESTS%%share/papi/ctests/sdsc-mpx -%%CTESTS%%share/papi/ctests/sdsc2-mpx -%%CTESTS%%share/papi/ctests/sdsc4-mpx -%%CTESTS%%share/papi/ctests/second -%%CTESTS%%share/papi/ctests/subinfo -%%CTESTS%%share/papi/ctests/tenth -%%CTESTS%%share/papi/ctests/thrspecific -%%CTESTS%%share/papi/ctests/unregister_pthreads -%%CTESTS%%share/papi/ctests/zero -%%CTESTS%%share/papi/ctests/zero_flip -%%CTESTS%%share/papi/ctests/zero_pthreads -%%FTESTS%%share/papi/ftests/accum -%%FTESTS%%share/papi/ftests/avail -%%FTESTS%%share/papi/ftests/case1 -%%FTESTS%%share/papi/ftests/case2 -%%FTESTS%%share/papi/ftests/clockres -%%FTESTS%%share/papi/ftests/cost -%%FTESTS%%share/papi/ftests/description -%%FTESTS%%share/papi/ftests/eventname -%%FTESTS%%share/papi/ftests/fdmemtest -%%FTESTS%%share/papi/ftests/first -%%FTESTS%%share/papi/ftests/flops -%%FTESTS%%share/papi/ftests/fmatrixlowpapi -%%FTESTS%%share/papi/ftests/fmatrixpapi -%%FTESTS%%share/papi/ftests/fmatrixpapi2 -%%FTESTS%%share/papi/ftests/fmultiplex1 -%%FTESTS%%share/papi/ftests/fmultiplex2 -%%FTESTS%%share/papi/ftests/highlevel -%%FTESTS%%share/papi/ftests/johnmay2 -%%FTESTS%%share/papi/ftests/second -%%FTESTS%%share/papi/ftests/strtest -%%FTESTS%%share/papi/ftests/tenth -%%FTESTS%%share/papi/ftests/zero -%%FTESTS%%@dirrm share/papi/ftests -%%CTESTS%%@dirrm share/papi/ctests -%%CTESTS%%@dirrmtry share/papi -%%FTESTS%%@dirrmtry share/papi +lib/libpapi.so.4 +share/papi/ctests/all_events +share/papi/ctests/all_native_events +share/papi/ctests/api +share/papi/ctests/branches +share/papi/ctests/burn +share/papi/ctests/byte_profile +share/papi/ctests/calibrate +share/papi/ctests/case1 +share/papi/ctests/case2 +share/papi/ctests/child_overflow +share/papi/ctests/clockres_pthreads +share/papi/ctests/code2name +share/papi/ctests/derived +share/papi/ctests/describe +share/papi/ctests/dmem_info +share/papi/ctests/eventname +share/papi/ctests/exec +share/papi/ctests/exec2 +share/papi/ctests/exec_overflow +share/papi/ctests/exeinfo +share/papi/ctests/first +share/papi/ctests/flops +share/papi/ctests/fork +share/papi/ctests/fork2 +share/papi/ctests/fork_overflow +share/papi/ctests/forkexec +share/papi/ctests/forkexec2 +share/papi/ctests/forkexec3 +share/papi/ctests/forkexec4 +share/papi/ctests/high-level +share/papi/ctests/high-level2 +share/papi/ctests/hwinfo +share/papi/ctests/ipc +share/papi/ctests/johnmay2 +share/papi/ctests/krentel_pthreads +share/papi/ctests/kufrin +share/papi/ctests/locks_pthreads +share/papi/ctests/low-level +share/papi/ctests/matrix-hl +share/papi/ctests/memory +share/papi/ctests/mendes-alt +share/papi/ctests/multiattach +share/papi/ctests/multiplex1 +share/papi/ctests/multiplex1_pthreads +share/papi/ctests/multiplex2 +share/papi/ctests/multiplex3_pthreads +share/papi/ctests/overflow +share/papi/ctests/overflow2 +share/papi/ctests/overflow3_pthreads +share/papi/ctests/overflow_allcounters +share/papi/ctests/overflow_force_software +share/papi/ctests/overflow_index +share/papi/ctests/overflow_one_and_read +share/papi/ctests/overflow_pthreads +share/papi/ctests/overflow_single_event +share/papi/ctests/overflow_twoevents +share/papi/ctests/profile +share/papi/ctests/profile_force_software +share/papi/ctests/profile_pthreads +share/papi/ctests/profile_twoevents +share/papi/ctests/pthrtough +share/papi/ctests/pthrtough2 +share/papi/ctests/realtime +share/papi/ctests/reset +share/papi/ctests/sdsc-mpx +share/papi/ctests/sdsc2-mpx +share/papi/ctests/sdsc4-mpx +share/papi/ctests/second +share/papi/ctests/shlib +share/papi/ctests/sprofile +share/papi/ctests/subinfo +share/papi/ctests/system_child_overflow +share/papi/ctests/system_overflow +share/papi/ctests/tenth +share/papi/ctests/thrspecific +share/papi/ctests/timer_overflow +share/papi/ctests/virttime +share/papi/ctests/zero +share/papi/ctests/zero_attach +share/papi/ctests/zero_flip +share/papi/ctests/zero_fork +share/papi/ctests/zero_pthreads +@dirrmtry share/papi >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101231345.p0NDjBQS007681>