Compare commits

..

10 Commits
master ... f12

Author SHA1 Message Date
Fedora Release Engineering 8e1d78713e dist-git conversion 2010-07-29 05:31:35 +00:00
William Eden Cohen 3d191a2809 Remove unused patch file. 2010-03-08 20:02:04 +00:00
William Eden Cohen 9d1d3e705c - correct the ctests/shlib test
- have PAPI_set_multiplex() return proper value
- properly handle event unit masks
- correct PAPI_name_to_code() to match events
Wed Jan 13 2010 William Cohen <wcohen@redhat.com> - 4.0.0-1
- Generate papi.spec file for papi-4.0.0.
2010-02-16 14:36:19 +00:00
William Eden Cohen 986a90334f - Adjust configure.
Mon Dec 9 2009 William Cohen <wcohen@redhat.com> - 3.7.2-2
- Remove dependency on kernel-devel.
Mon Dec 9 2009 William Cohen <wcohen@redhat.com> - 3.7.2-1
- Import papi-3.7.2.
2009-12-10 21:06:24 +00:00
Bill Nottingham 12015ddbd2 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:50:44 +00:00
William Eden Cohen c53981788b Exclude s390 and s390x. 2009-11-19 16:33:53 +00:00
William Eden Cohen 1d66197d5c Rebase on papi-3.7.1. 2009-11-16 19:49:02 +00:00
William Eden Cohen af1c95402c Initial import of papi for Fedora 12. 2009-10-26 20:52:59 +00:00
William Eden Cohen 619ba2b2a9 Initial commit of papi package into fedora. 2009-10-26 20:47:00 +00:00
Kevin Fenzi 5d97a6735c Initialize branch F-12 for papi 2009-10-26 20:12:09 +00:00
5 changed files with 403 additions and 474 deletions

25
.gitignore vendored
View File

@ -1,24 +1 @@
papi-4.1.0.tar.gz
/papi-4.1.1.tar.gz
/papi-4.1.2.1.tar.gz
/papi-4.1.3.tar.gz
/papi-4.2.0.tar.gz
/papi-4.2.1.tar.gz
/papi-4.4.0.tar.gz
/papi-5.0.0.tar.gz
/papi-5.0.1.tar.gz
/papi-5.1.0.2.tar.gz
/papi-5.1.1.tar.gz
/papi-5.2.0.tar.gz
/papi-5.2.0-2.37.g5c1405a.tar.gz
/papi-5.2.0-2.63.g91a6fa5.tar.gz
/papi-5.2.0-2.1.gff3e15d.tar.gz
/papi-5.3.0.tar.gz
/papi-5.3.0-1.16.ga7f6159.tar.gz
/papi-5.3.2.tar.gz
/papi-5.4.0.tar.gz
/papi-5.4.1.tar.gz
/papi-5.4.3.tar.gz
/papi-5.5.0.tar.gz
/papi-5.5.1.tar.gz
/papi-5.6.0.tar.gz
papi-4.0.0.tar.gz

372
papi-4.0.0-patch1.patch Normal file
View File

@ -0,0 +1,372 @@
diff -rupN papi400t/src/configure papi400b/src/configure
--- papi400t/src/configure 2010-01-13 11:20:35.000000000 -0500
+++ papi400b/src/configure 2010-01-26 12:53:10.000000000 -0500
@@ -2113,7 +2113,6 @@ case "$OS" in
made=GenuineIntel
family="`cat /proc/cpuinfo | grep family | cut -d: -f2 | cut -d' ' -f2 | sed '2,$d'`"
model="`cat /proc/cpuinfo | grep model | cut -d: -f2 | cut -d' ' -f2 | sed '2,$d'`"
- # family 15 is always P4; model 1 is vanilla pre-HT, model 2 is vanilla; model 3 is em64t, 4 is Pentium D, 6 is Xeon D
if test "$family" = "6"; then
# model 14 is an ancient Core
if test "$model" = "14"; then
@@ -2135,14 +2134,10 @@ case "$OS" in
CPU=atom
use_x86_cache_info=yes
fi
+ # family 15 is always P4
elif test "$family" = "15"; then
- if (test "$model" = "3" || test "$model" = "4" || test "$model" = "6"); then
- CPU=em64t
- use_x86_cache_info=yes
- elif (test "$model" = "1" || test "$model" = "2"); then
CPU=p4
use_x86_cache_info=yes
- fi
elif test "$family" = "32"; then
CPU=montecito
elif test "$family" = "31"; then
@@ -2157,7 +2152,8 @@ case "$OS" in
elif test "`cat /proc/cpuinfo | grep -i "Pentium III"`" != ""; then
CPU=p3
use_x86_cache_info=yes
- else CPU=p3
+ else
+ CPU=p3
use_x86_cache_info=yes
fi
fi
@@ -9033,7 +9029,7 @@ $as_echo "$as_me: error: The bitmode you
else
MAKEVER="$OS"-pfm-"$CPU"
fi ;;
- opteron|core|core2|i7|atom|em64t|p3)
+ opteron|core|core2|i7|atom|p3)
if test "$arch" = "x86_64"; then
MAKEVER="$OS"-perfctr-p3
else
@@ -9099,7 +9095,6 @@ case "$MAKEVER" in
linux-perfctr-athlon);;
linux-perfctr-p3);;
linux-perfctr-p4);;
- linux-perfctr-em64t);;
solaris-ultra);;
solaris-ultra-64bit);;
solaris-niagara2|solaris-niagara2-32bit);;
diff -rupN papi400t/src/configure.in papi400b/src/configure.in
--- papi400t/src/configure.in 2010-01-13 11:03:58.000000000 -0500
+++ papi400b/src/configure.in 2010-01-26 12:53:10.000000000 -0500
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
# File: configure.in
-# CVS: $Id: configure.in,v 1.166 2010/01/13 16:03:58 sbk Exp $
+# CVS: $Id: configure.in,v 1.166.2.1 2010/01/26 17:53:10 bsheely Exp $
AC_PREREQ(2.61)
@@ -199,7 +199,6 @@ case "$OS" in
made=GenuineIntel
family="`cat /proc/cpuinfo | grep family | cut -d: -f2 | cut -d' ' -f2 | sed '2,$d'`"
model="`cat /proc/cpuinfo | grep model | cut -d: -f2 | cut -d' ' -f2 | sed '2,$d'`"
- # family 15 is always P4; model 1 is vanilla pre-HT, model 2 is vanilla; model 3 is em64t, 4 is Pentium D, 6 is Xeon D
if test "$family" = "6"; then
# model 14 is an ancient Core
if test "$model" = "14"; then
@@ -221,14 +220,10 @@ case "$OS" in
CPU=atom
use_x86_cache_info=yes
fi
+ # family 15 is always P4
elif test "$family" = "15"; then
- if (test "$model" = "3" || test "$model" = "4" || test "$model" = "6"); then
- CPU=em64t
- use_x86_cache_info=yes
- elif (test "$model" = "1" || test "$model" = "2"); then
CPU=p4
use_x86_cache_info=yes
- fi
elif test "$family" = "32"; then
CPU=montecito
elif test "$family" = "31"; then
@@ -243,7 +238,8 @@ case "$OS" in
elif test "`cat /proc/cpuinfo | grep -i "Pentium III"`" != ""; then
CPU=p3
use_x86_cache_info=yes
- else CPU=p3
+ else
+ CPU=p3
use_x86_cache_info=yes
fi
fi
@@ -1441,7 +1437,7 @@ case "$OS" in
else
MAKEVER="$OS"-pfm-"$CPU"
fi ;;
- opteron|core|core2|i7|atom|em64t|p3)
+ opteron|core|core2|i7|atom|p3)
if test "$arch" = "x86_64"; then
MAKEVER="$OS"-perfctr-p3
else
@@ -1500,7 +1496,6 @@ case "$MAKEVER" in
linux-perfctr-athlon);;
linux-perfctr-p3);;
linux-perfctr-p4);;
- linux-perfctr-em64t);;
solaris-ultra);;
solaris-ultra-64bit);;
solaris-niagara2|solaris-niagara2-32bit);;
diff -rupN papi400t/src/ctests/shlib.c papi400b/src/ctests/shlib.c
--- papi400t/src/ctests/shlib.c 2009-09-10 16:19:49.000000000 -0400
+++ papi400b/src/ctests/shlib.c 2010-01-26 19:27:26.000000000 -0500
@@ -1,6 +1,6 @@
/*
* File: profile.c
-* CVS: $Id: shlib.c,v 1.18 2009/09/10 20:19:49 terpstra Exp $
+* CVS: $Id: shlib.c,v 1.18.6.2 2010/01/27 00:27:26 jagode Exp $
* Author: Philip Mucci
* mucci@cs.utk.edu
* Mods: <your name here>
@@ -59,50 +59,26 @@ int main(int argc, char **argv)
#ifndef NO_DLFCN
{
- char *libname =
- "libpapi.so";
- char *libname2 =
- "libpapi64.so";
- char *_libname;
+ char *_libname =
+ "libm.so";
void *handle ;
-/*
- void *handle = dlopen("libm.so", RTLD_LAZY);
-*/
- int (*num_hwctrs)(void);
+ double (*pow)(double,double);
int oldcount;
- int my_dlerror = 0;
-
-RETRY:
- if ( !my_dlerror ){
- printf("\nLoading %s with dlopen().\n",libname);
- _libname = libname;
- }
- else{
- printf("\nLoading %s with dlopen().\n",libname2);
- _libname = libname2;
- }
handle = dlopen (_libname, RTLD_NOW);
if (!handle) {
printf("dlopen: %s\n",dlerror());
- if ( !my_dlerror ){
- my_dlerror = 1;
- printf("Trying again.");
- goto RETRY;
- }
printf("Did you forget to set the environmental variable LIBPATH (in AIX) or LD_LIBRARY_PATH (in linux) ?\n");
test_fail(__FILE__, __LINE__, "dlopen", 1);
}
- printf("Looking up PAPI_num_counters() \n");
- num_hwctrs = ( int (*) (void)) dlsym(handle, "PAPI_num_counters");
- if (num_hwctrs == NULL) {
- printf("dlsym: %s \n", dlerror());
- test_fail(__FILE__, __LINE__, "dlsym", 1);
- }
-
- printf ("There are %d hardware counters \n", (*num_hwctrs)());
-
+ pow = (double(*)(double,double)) dlsym(handle, "pow");
+ if (pow == NULL) {
+ printf("dlsym: %s\n", dlerror());
+ test_fail(__FILE__,__LINE__,"dlsym",1);
+ }
+ printf("2^2 = %lf \n",(*pow)(2,2));
+
oldcount = shinfo->count;
if ((shinfo = PAPI_get_shared_lib_info()) == NULL) {
diff -rupN papi400t/src/extras.c papi400b/src/extras.c
--- papi400t/src/extras.c 2009-12-18 15:24:24.000000000 -0500
+++ papi400b/src/extras.c 2010-01-27 17:26:42.000000000 -0500
@@ -4,7 +4,7 @@
/*
* File: extras.c
-* CVS: $Id: extras.c,v 1.159 2009/12/18 20:24:24 terpstra Exp $
+* CVS: $Id: extras.c,v 1.159.2.2 2010/01/27 22:26:42 jagode Exp $
* Author: Philip Mucci
* mucci@cs.utk.edu
* Mods: dan terpstra
@@ -562,34 +562,50 @@ int _papi_hwi_native_name_to_code(char *
char name[PAPI_HUGE_STR_LEN]; /* make sure it's big enough */
unsigned int i, j;
- for (j=0,i = 0 | PAPI_NATIVE_MASK;j<papi_num_components; j++,i = 0 | PAPI_NATIVE_MASK) {
+
+ for ( j = 0, i = 0 | PAPI_NATIVE_MASK; j<papi_num_components; j++, i = 0 | PAPI_NATIVE_MASK )
+ {
/* first check each component for name_to_code */
- if (vector_find_dummy( (void*) _papi_hwd[j]->ntv_name_to_code, NULL) == NULL)
- retval = _papi_hwd[j]->ntv_name_to_code(in, (unsigned *)out);
- else {
- _papi_hwd[j]->ntv_enum_events(&i, PAPI_ENUM_FIRST);
- _papi_hwi_lock(INTERNAL_LOCK);
- do {
+ if ( vector_find_dummy( ( void* ) _papi_hwd[j]->ntv_name_to_code, NULL ) == NULL )
+ {
+ /* if ntv_name_to_code is set and != NULL */
+ retval = _papi_hwd[j]->ntv_name_to_code( in, ( unsigned * ) out );
+ }
+ else
+ {
+ _papi_hwd[j]->ntv_enum_events( &i, PAPI_ENUM_FIRST );
+ _papi_hwi_lock( INTERNAL_LOCK );
+
+ do
+ {
retval = _papi_hwd[j]->ntv_code_to_name(i, name, sizeof(name));
/* printf("name =|%s|\ninput=|%s|\n", name, in); */
- if (retval == PAPI_OK) {
- if (strcasecmp(name, in) == 0) {
+ if (retval == PAPI_OK)
+ {
+ if (strcasecmp(name, in) == 0)
+ {
*out = i | PAPI_COMPONENT_MASK(j);;
break;
- } else {
+ }
+ else
retval = PAPI_ENOEVNT;
- }
- } else {
+ }
+ else
+ {
*out = 0;
retval = PAPI_ENOEVNT;
break;
}
- } while ((_papi_hwd[j]->ntv_enum_events(&i, PAPI_ENUM_EVENTS) == PAPI_OK));
+ }
+ while ( ( _papi_hwd[j]->ntv_enum_events( &i, PAPI_ENUM_EVENTS ) == PAPI_OK ) );
+
_papi_hwi_unlock(INTERNAL_LOCK);
- if (retval == PAPI_OK) return(retval);
}
+
+ if ( retval == PAPI_OK )
+ return( retval );
}
- return (retval);
+ return ( retval );
}
diff -rupN papi400t/src/papi.c papi400b/src/papi.c
--- papi400t/src/papi.c 2009-12-18 15:24:24.000000000 -0500
+++ papi400b/src/papi.c 2010-01-26 20:40:35.000000000 -0500
@@ -4,7 +4,7 @@
/*
* File: papi.c
-* CVS: $Id: papi.c,v 1.337 2009/12/18 20:24:24 terpstra Exp $
+* CVS: $Id: papi.c,v 1.337.2.1 2010/01/27 01:40:35 terpstra Exp $
* Author: Philip Mucci
* mucci@cs.utk.edu
* Mods: dan terpstra
@@ -1349,13 +1349,10 @@ int PAPI_set_multiplex(int EventSet)
if (ESI == NULL)
papi_return(PAPI_ENOEVST);
- /* if the eventset has no index and no events, return OK
- otherwise return NOCMP */
+ /* if the eventset has no index return NOCMP */
cidx = valid_ESI_component(ESI);
- if (cidx < 0) {
- if (ESI->NumberOfEvents) papi_return(cidx);
- papi_return(PAPI_OK);
- }
+ if (cidx < 0) papi_return(cidx);
+
if ((ret = mpx_check(EventSet)) != PAPI_OK)
papi_return(ret);
diff -rupN papi400t/src/perf_events.c papi400b/src/perf_events.c
--- papi400t/src/perf_events.c 2010-01-14 10:48:00.000000000 -0500
+++ papi400b/src/perf_events.c 2010-01-27 17:26:42.000000000 -0500
@@ -1,6 +1,6 @@
/*
* File: perf_events.c
-* CVS: $Id: perf_events.c,v 1.18 2010/01/14 15:48:00 terpstra Exp $
+* CVS: $Id: perf_events.c,v 1.18.2.1 2010/01/27 22:26:42 jagode Exp $
* Author: Corey Ashford
* cjashfor@us.ibm.com
* - based upon perfmon.c written by -
@@ -76,6 +76,7 @@ extern papi_vector_t _papi_pe_vector;
extern int _papi_pfm_setup_presets(char *name, int type);
extern int _papi_pfm_ntv_enum_events(unsigned int *EventCode, int modifier);
+extern int _papi_pfm_ntv_name_to_code(char *ntv_name, unsigned int *EventCode);
extern int _papi_pfm_ntv_code_to_name(unsigned int EventCode, char *ntv_name, int len);
extern int _papi_pfm_ntv_code_to_descr(unsigned int EventCode, char *ntv_descr, int len);
extern int _papi_pfm_ntv_code_to_bits(unsigned int EventCode, hwd_register_t *bits);
@@ -2014,8 +2015,8 @@ int _papi_pe_init_substrate (int cidx)
}
SUBDBG ("pfm_get_num_events: %d\n", ncnt);
MY_VECTOR.cmp_info.num_native_events = ncnt;
- strcpy (MY_VECTOR.cmp_info.name, "$Id: perf_events.c,v 1.18 2010/01/14 15:48:00 terpstra Exp $");
- strcpy (MY_VECTOR.cmp_info.version, "$Revision: 1.18 $");
+ strcpy (MY_VECTOR.cmp_info.name, "$Id: perf_events.c,v 1.18.2.1 2010/01/27 22:26:42 jagode Exp $");
+ strcpy (MY_VECTOR.cmp_info.version, "$Revision: 1.18.2.1 $");
sprintf (buf, "%08x", version);
pfm_get_num_counters ((unsigned int *) &MY_VECTOR.cmp_info.num_cntrs);
@@ -3383,6 +3384,7 @@ papi_vector_t _papi_pe_vector = {
.allocate_registers = _papi_pe_allocate_registers,
.write = _papi_pe_write,
.ntv_enum_events = _papi_pfm_ntv_enum_events,
+ .ntv_name_to_code = _papi_pfm_ntv_name_to_code,
.ntv_code_to_name = _papi_pfm_ntv_code_to_name,
.ntv_code_to_descr = _papi_pfm_ntv_code_to_descr,
.ntv_code_to_bits = _papi_pfm_ntv_code_to_bits,
diff -rupN papi400t/src/perfmon.c papi400b/src/perfmon.c
--- papi400t/src/perfmon.c 2009-11-17 23:37:42.000000000 -0500
+++ papi400b/src/perfmon.c 2010-01-27 17:26:42.000000000 -0500
@@ -1,6 +1,6 @@
/*
* File: perfmon.c
-* CVS: $Id: perfmon.c,v 1.97 2009/11/18 04:37:42 mucci Exp $
+* CVS: $Id: perfmon.c,v 1.97.4.1 2010/01/27 22:26:42 jagode Exp $
* Author: Philip Mucci
* mucci@cs.utk.edu
* Mods: Brian Sheely
@@ -42,6 +42,7 @@ extern int get_cpu_info(PAPI_hw_info_t *
extern papi_vector_t _papi_pfm_vector;
extern int _papi_pfm_setup_presets(char *name, int type);
extern int _papi_pfm_ntv_enum_events(unsigned int *EventCode, int modifier);
+extern int _papi_pfm_ntv_name_to_code(char *ntv_name, unsigned int *EventCode);
extern int _papi_pfm_ntv_code_to_name(unsigned int EventCode, char *ntv_name, int len);
extern int _papi_pfm_ntv_code_to_descr(unsigned int EventCode, char *ntv_descr, int len);
extern int _papi_pfm_ntv_code_to_bits(unsigned int EventCode, hwd_register_t *bits);
@@ -2216,8 +2217,8 @@ int _papi_pfm_init_substrate(int cidx)
}
SUBDBG("pfm_get_num_events: %d\n", ncnt);
MY_VECTOR.cmp_info.num_native_events = ncnt;
- strcpy(MY_VECTOR.cmp_info.name, "$Id: perfmon.c,v 1.97 2009/11/18 04:37:42 mucci Exp $");
- strcpy(MY_VECTOR.cmp_info.version, "$Revision: 1.97 $");
+ strcpy(MY_VECTOR.cmp_info.name, "$Id: perfmon.c,v 1.97.4.1 2010/01/27 22:26:42 jagode Exp $");
+ strcpy(MY_VECTOR.cmp_info.version, "$Revision: 1.97.4.1 $");
sprintf(buf,"%08x",version);
pfm_get_num_counters((unsigned int *)&MY_VECTOR.cmp_info.num_cntrs);
@@ -3764,6 +3765,7 @@ papi_vector_t _papi_pfm_vector = {
.allocate_registers = _papi_pfm_allocate_registers,
.write = _papi_pfm_write,
.ntv_enum_events = _papi_pfm_ntv_enum_events,
+ .ntv_name_to_code = _papi_pfm_ntv_name_to_code,
.ntv_code_to_name = _papi_pfm_ntv_code_to_name,
.ntv_code_to_descr = _papi_pfm_ntv_code_to_descr,
.ntv_code_to_bits = _papi_pfm_ntv_code_to_bits,

View File

@ -1,115 +0,0 @@
commit bde3da26f1f2755689e16fc9f5ab404367d1fdc8
Author: Vince Weaver <vincent.weaver@maine.edu>
Date: Wed Jan 24 14:13:28 2018 -0500
build: fix various LDFLAGS/CFLAGS issues
issues were reported by Andreas Beckmann <anbe@debian.org>
diff --git a/src/components/Makefile_comp_tests.target.in b/src/components/Makefile_comp_tests.target.in
index 9a369adb..a4412bea 100644
--- a/src/components/Makefile_comp_tests.target.in
+++ b/src/components/Makefile_comp_tests.target.in
@@ -9,7 +9,7 @@ INCLUDE = -I. -I@includedir@ -I$(datadir) -I$(testlibdir) -I$(validationlibdir)
LIBDIR = @libdir@
PAPILIB = $(datadir)/@LIBRARY@
TESTLIB = $(testlibdir)/libtestlib.a
-LDFLAGS = @LDL@
+LDFLAGS = @LDFLAGS@ @LDL@
CC = @CC@
F77 = @F77@
CC_R = @CC_R@
diff --git a/src/components/perf_event_uncore/tests/Makefile b/src/components/perf_event_uncore/tests/Makefile
index 3ee8fc2a..d70debe6 100644
--- a/src/components/perf_event_uncore/tests/Makefile
+++ b/src/components/perf_event_uncore/tests/Makefile
@@ -17,19 +17,19 @@ perf_event_uncore_lib.o: perf_event_uncore_lib.c perf_event_uncore_lib.h
perf_event_amd_northbridge: perf_event_amd_northbridge.o $(DOLOOPS) $(UTILOBJS) $(PAPILIB) $(DOLOOPS)
- $(CC) $(LFLAGS) -o perf_event_amd_northbridge perf_event_amd_northbridge.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
+ $(CC) $(CFLAGS) -o perf_event_amd_northbridge perf_event_amd_northbridge.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
perf_event_uncore: perf_event_uncore.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) perf_event_uncore_lib.o
- $(CC) $(LFLAGS) -o perf_event_uncore perf_event_uncore.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
+ $(CC) $(CFLAGS) -o perf_event_uncore perf_event_uncore.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
perf_event_uncore_attach: perf_event_uncore_attach.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) perf_event_uncore_lib.o
- $(CC) $(LFLAGS) -o perf_event_uncore_attach perf_event_uncore_attach.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
+ $(CC) $(CFLAGS) -o perf_event_uncore_attach perf_event_uncore_attach.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
perf_event_uncore_multiple: perf_event_uncore_multiple.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB)
- $(CC) $(LFLAGS) $(INCLUDE) -o perf_event_uncore_multiple perf_event_uncore_multiple.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
+ $(CC) $(CFLAGS) $(INCLUDE) -o perf_event_uncore_multiple perf_event_uncore_multiple.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
perf_event_uncore_cbox: perf_event_uncore_cbox.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB)
- $(CC) $(LFLAGS) $(INCLUDE) -o perf_event_uncore_cbox perf_event_uncore_cbox.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
+ $(CC) $(CFLAGS) $(INCLUDE) -o perf_event_uncore_cbox perf_event_uncore_cbox.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
diff --git a/src/ctests/Makefile.recipies b/src/ctests/Makefile.recipies
index 63c107c0..201f3c85 100644
--- a/src/ctests/Makefile.recipies
+++ b/src/ctests/Makefile.recipies
@@ -350,7 +350,7 @@ code2name: code2name.c $(TESTLIB) $(PAPILIB)
$(CC) $(INCLUDE) $(CFLAGS) $(TOPTFLAGS) code2name.c $(TESTLIB) $(PAPILIB) $(LDFLAGS) -o code2name
attach_target: attach_target.c $(DOLOOPS)
- -$(CC) $(INCLUDE) $(CFLAGS) $(TOPTFLAGS) attach_target.c -o attach_target $(DOLOOPS) $(TESTLIB)
+ -$(CC) $(INCLUDE) $(CFLAGS) $(TOPTFLAGS) attach_target.c -o attach_target $(DOLOOPS) $(TESTLIB) $(LDFLAGS)
zero_attach: zero_attach.c $(TESTLIB) $(DOLOOPS) $(PAPILIB)
-$(CC) $(INCLUDE) $(CFLAGS) $(TOPTFLAGS) zero_attach.c $(TESTLIB) $(DOLOOPS) $(PAPILIB) $(LDFLAGS) -o zero_attach
diff --git a/src/ctests/Makefile.target.in b/src/ctests/Makefile.target.in
index bb51c350..fcc3373b 100644
--- a/src/ctests/Makefile.target.in
+++ b/src/ctests/Makefile.target.in
@@ -12,7 +12,7 @@ LIBRARY=@LIBRARY@
SHLIB=@SHLIB@
PAPILIB = ../@LINKLIB@
TESTLIB = $(testlibdir)/libtestlib.a
-LDFLAGS = @LDL@ @STATIC@
+LDFLAGS = @LDFLAGS@ @LDL@ @STATIC@
CC = @CC@
MPICC = @MPICC@
F77 = @F77@
diff --git a/src/ftests/Makefile.target.in b/src/ftests/Makefile.target.in
index 718586e5..8006dd8d 100644
--- a/src/ftests/Makefile.target.in
+++ b/src/ftests/Makefile.target.in
@@ -11,7 +11,7 @@ LIBRARY = @LIBRARY@
SHLIB=@SHLIB@
PAPILIB = ../@LINKLIB@
TESTLIB = $(testlibdir)/libtestlib.a
-LDFLAGS = @LDL@
+LDFLAGS = @LDFLAGS@ @LDL@
CC = @CC@
F77 = @F77@
CC_R = @CC_R@
diff --git a/src/utils/Makefile.target.in b/src/utils/Makefile.target.in
index a5eab438..58d438a1 100644
--- a/src/utils/Makefile.target.in
+++ b/src/utils/Makefile.target.in
@@ -11,7 +11,7 @@ LIBRARY=@LIBRARY@
SHLIB=@SHLIB@
PAPILIB = ../@LINKLIB@
TESTLIB = $(testlibdir)/libtestlib.a
-LDFLAGS = @LDL@ @STATIC@
+LDFLAGS = @LDFLAGS@ @LDL@ @STATIC@
CC = @CC@
MPICC = @MPICC@
F77 = @F77@
diff --git a/src/validation_tests/Makefile.target.in b/src/validation_tests/Makefile.target.in
index a5eab438..58d438a1 100644
--- a/src/validation_tests/Makefile.target.in
+++ b/src/validation_tests/Makefile.target.in
@@ -11,7 +11,7 @@ LIBRARY=@LIBRARY@
SHLIB=@SHLIB@
PAPILIB = ../@LINKLIB@
TESTLIB = $(testlibdir)/libtestlib.a
-LDFLAGS = @LDL@ @STATIC@
+LDFLAGS = @LDFLAGS@ @LDL@ @STATIC@
CC = @CC@
MPICC = @MPICC@
F77 = @F77@

363
papi.spec
View File

@ -1,388 +1,83 @@
%bcond_with bundled_libpfm
# rdma is not available
%ifarch %{arm}
%{!?with_rdma: %global with_rdma 0}
%else
%{!?with_rdma: %global with_rdma 1}
%endif
Summary: Performance Application Programming Interface
Name: papi
Version: 5.6.0
Release: 6%{?dist}
Version: 4.0.0
Release: 2%{?dist}
License: BSD
Group: Development/System
Requires: papi-libs = %{version}-%{release}
URL: http://icl.cs.utk.edu/papi/
Source0: http://icl.cs.utk.edu/projects/papi/downloads/%{name}-%{version}.tar.gz
Patch1: papi-ldflags.patch
BuildRequires: autoconf
BuildRequires: doxygen
Patch1: papi-4.0.0-patch1.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: ncurses-devel
BuildRequires: gcc-gfortran
BuildRequires: kernel-headers >= 2.6.32
BuildRequires: kernel-headers >= 2.6.31
BuildRequires: chrpath
BuildRequires: lm_sensors-devel
%if %{without bundled_libpfm}
BuildRequires: libpfm-devel >= 4.6.0-1
BuildRequires: libpfm-static >= 4.6.0-1
%endif
# Following required for net component
BuildRequires: net-tools
%if %{with_rdma}
# Following required for inifiband component
BuildRequires: rdma-core-devel
BuildRequires: infiniband-diags-devel
%endif
BuildRequires: perl-generators
#Right now libpfm does not know anything about s390 and will fail
ExcludeArch: s390 s390x
ExcludeArch: s390, s390x
%description
PAPI provides a programmer interface to monitor the performance of
running programs.
%package libs
Summary: Libraries for PAPI clients
Group: Development/System
%description libs
This package contains the run-time libraries for any application that wishes
to use PAPI.
%package devel
Summary: Header files for the compiling programs with PAPI
Group: Development/System
Requires: papi = %{version}-%{release}
Requires: pkgconfig
%description devel
PAPI-devel includes the C header files that specify the PAPI user-space
PAPI-devel includes the C header files that specify the PAPI userspace
libraries and interfaces. This is required for rebuilding any program
that uses PAPI.
%package testsuite
Summary: Set of tests for checking PAPI functionality
Group: Development/System
Requires: papi = %{version}-%{release}
%description testsuite
PAPI-testuiste includes compiled versions of papi tests to ensure
that PAPI functions on particular hardware.
%package static
Summary: Static libraries for the compiling programs with PAPI
Group: Development/System
Requires: papi = %{version}-%{release}
%description static
PAPI-static includes the static versions of the library files for
the PAPI user-space libraries and interfaces.
%prep
%setup -q
%patch1 -p1 -b .ldflags
%patch1 -p1
%build
%if %{without bundled_libpfm}
# Build our own copy of libpfm.
%global libpfm_config --with-pfm-incdir=%{_includedir} --with-pfm-libdir=%{_libdir}
%endif
cd src
autoconf
%configure --with-perf-events \
%{?libpfm_config} \
--with-static-lib=yes --with-shared-lib=yes --with-shlib --with-shlib-tools \
--with-components="appio coretemp example infiniband lmsensors lustre micpower mx net rapl stealtime"
# implicit enabled components: perf_event perf_event_uncore
#components currently left out because of build configure/build issues
# --with-components="bgpm coretemp_freebsd cuda host_micpower nvml vmware"
%configure --disable-static
make
pushd components
#pushd cuda; ./configure; popd
#pushd host_micpower; ./configure; popd
%if %{with_rdma}
pushd infiniband_umad; %configure; popd
%endif
pushd lmsensors; \
%configure --with-sensors_incdir=/usr/include/sensors \
--with-sensors_libdir=%{_libdir}; \
popd
#pushd vmware; ./configure; popd
popd
#DBG workaround to make sure libpfm just uses the normal CFLAGS
DBG="" make %{?_smp_mflags}
#generate updated versions of the documentation
#DBG workaround to make sure libpfm just uses the normal CFLAGS
pushd ../doc
DBG="" make
DBG="" make install
popd
#%check
#cd src
#make fulltest
%install
rm -rf $RPM_BUILD_ROOT
cd src
make DESTDIR=$RPM_BUILD_ROOT LDCONFIG=/bin/true install-all
make DESTDIR=$RPM_BUILD_ROOT install
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so*
# Remove the static libraries. Static libraries are undesirable:
# https://fedoraproject.org/wiki/Packaging/Guidelines#Packaging_Static_Libraries
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_bindir}/*
%dir /usr/share/papi
/usr/share/papi/papi_events.csv
%doc INSTALL.txt README LICENSE.txt RELEASENOTES.txt
%doc %{_mandir}/man1/*
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files libs
%{_libdir}/*.so.*
/usr/share/papi
%doc INSTALL.txt README LICENSE.txt RELEASENOTES.txt
%files devel
%defattr(-,root,root,-)
%{_includedir}/*.h
%if %{with bundled_libpfm}
%{_includedir}/perfmon/*.h
%endif
%{_includedir}/perfmon
%{_libdir}/*.so
%{_libdir}/pkgconfig/papi*.pc
%doc %{_mandir}/man3/*
%files testsuite
/usr/share/papi/run_tests*
/usr/share/papi/ctests
/usr/share/papi/ftests
/usr/share/papi/validation_tests
/usr/share/papi/components
/usr/share/papi/testlib
%files static
%{_libdir}/*.a
%doc %{_mandir}/man1/*
%changelog
* Thu May 17 2018 William Cohen <wcohen@redhat.com> - 5.6.0-6
- Dynamically link utilities and tests to papi libraries.
* Mon Apr 30 2018 William Cohen <wcohen@redhat.com> - 5.6.0-5
- Include various LDFLAGS/CFLAGS.
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Jan 31 2018 William Cohen <wcohen@redhat.com> - 5.6.0-3
- Bump and rebuild.
* Thu Dec 21 2017 William Cohen <wcohen@redhat.com> - 5.6.0-2
- Correct infiniband buildrequires.
* Thu Dec 21 2017 William Cohen <wcohen@redhat.com> - 5.6.0-1
- Rebase to papi-5.6.0.
* Mon Aug 28 2017 Honggang LI <honli@redhat.com> - 5.5.1-6
- Disable RDMA support on ARM32
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Feb 2 2017 William Cohen <wcohen@redhat.com> - 5.5.1-2
- Bump version and rebuild due to new libgfortan.so version.
* Fri Nov 18 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.1-1
- Rebase to papi-5.5.1.
* Wed Sep 14 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.0-1
- Rebase to papi-5.5.0.
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Jan 26 2016 William Cohen <wcohen@redhat.com> - 5.4.3-1
- Rebase to papi-5.4.3.
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Fri Mar 6 2015 William Cohen <wcohen@redhat.com> - 5.4.1-2
- Make sure using libpfm-4.6.0.
* Tue Mar 3 2015 William Cohen <wcohen@redhat.com> - 5.4.1-1
- Rebase to papi-5.4.1.
* Wed Feb 11 2015 William Cohen <wcohen@redhat.com> - 5.4.0-3
- Bump version and rebuild.
* Thu Dec 18 2014 William Cohen <wcohen@redhat.com> - 5.4.0-2
- Split out papi-libs as separate subpackage. (#1172875)
* Mon Nov 17 2014 William Cohen <wcohen@redhat.com> - 5.4.0-1
- Rebase to papi-5.4.0.
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.3.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Mon Aug 4 2014 William Cohen <wcohen@redhat.com> - 5.3.2-1
- Rebase to 5.3.2.
* Fri Jun 06 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.3.0-2.16.ga7f6159
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Fri Jan 17 2014 Lukas Berk <lberk@redhat.com> - 5.3.0-1.16.ga7f6159
- Automated weekly rawhide release
* Thu Jan 16 2014 William Cohen <wcohen@redhat.com> - 5.3.0-1
- Rebase to 5.3.0.
* Tue Jan 14 2014 William Cohen <wcohen@redhat.com> - 5.2.0-5
- Add presets for Intel Silvermont.
* Mon Jan 13 2014 William Cohen <wcohen@redhat.com> - 5.2.0-4
- Add presets for Haswell and Ivy Bridge.
* Wed Aug 14 2013 William Cohen <wcohen@redhat.com> - 5.2.0-2
- Enable infiniband and stealtime components.
* Wed Aug 07 2013 William Cohen <wcohen@redhat.com> - 5.2.0-1
- Rebase to 5.2.0
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Wed Jul 24 2013 William Cohen <wcohen@redhat.com> - 5.1.1-7
- rhbz830275 - Add support for POWER8 processor to PAPI
* Mon Jul 22 2013 William Cohen <wcohen@redhat.com> - 5.1.1-6
- Add autoconf buildrequires.
* Mon Jul 22 2013 William Cohen <wcohen@redhat.com> - 5.1.1-5
- rhbz986673 - /usr/lib64/libpapi.so is unowned
- Package files in /usr/share/papi only once.
- Avoid dependency problem with parallel make of man pages.
* Fri Jul 19 2013 William Cohen <wcohen@redhat.com> - 5.1.1-4
- Correct changelog.
* Fri Jul 5 2013 William Cohen <wcohen@redhat.com> - 5.1.1-3
- Add man page corrections/updates.
* Fri Jun 28 2013 William Cohen <wcohen@redhat.com> - 5.1.1-2
- Add testsuite subpackage.
* Thu May 30 2013 William Cohen <wcohen@redhat.com> - 5.1.1-1
- Rebase to 5.1.1
* Mon Apr 15 2013 William Cohen <wcohen@redhat.com> - 5.1.0.2-2
- Fix arm FTBS rhbz 951806.
* Tue Apr 9 2013 William Cohen <wcohen@redhat.com> - 5.1.0.2-1
- Rebase to 5.1.0.2
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.0.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Mon Jan 14 2013 William Cohen <wcohen@redhat.com> - 5.0.1-5
- Add armv7 cortex a15 presets.
* Tue Dec 04 2012 William Cohen <wcohen@redhat.com> - 5.0.1-4
- Disable ldconfig on install.
* Thu Nov 08 2012 William Cohen <wcohen@redhat.com> - 5.0.1-3
- Avoid duplicated shared library.
* Wed Oct 03 2012 William Cohen <wcohen@redhat.com> - 5.0.1-2
- Make sure using compatible version of libpfm.
* Thu Sep 20 2012 William Cohen <wcohen@redhat.com> - 5.0.1-1
- Rebase to 5.0.1.
* Mon Sep 10 2012 William Cohen <wcohen@redhat.com> - 5.0.0-6
- Back port fixes for Intel Ivy Bridge event presets.
* Thu Aug 30 2012 William Cohen <wcohen@redhat.com> - 5.0.0-5
- Fixes to make papi with unbundled libpfm.
* Mon Aug 27 2012 William Cohen <wcohen@redhat.com> - 5.0.0-2
- Keep libpfm unbundled.
* Fri Aug 24 2012 William Cohen <wcohen@redhat.com> - 5.0.0-1
- Rebase to 5.0.0.
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.4.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Mon Jun 11 2012 William Cohen <wcohen@redhat.com> - 4.4.0-4
- Use siginfo_t rather than struct siginfo.
* Mon Jun 11 2012 William Cohen <wcohen@redhat.com> - 4.4.0-3
- Correct build requires.
* Mon Jun 11 2012 William Cohen <wcohen@redhat.com> - 4.4.0-2
- Unbundle libpfm4 from papi.
- Correct description spellings.
- Remove unused test section.
* Fri Apr 20 2012 William Cohen <wcohen@redhat.com> - 4.4.0-1
- Rebase to 4.4.0.
* Fri Mar 9 2012 William Cohen <wcohen@redhat.com> - 4.2.1-2
- Fix overrun in lmsensor component. (rhbz797692)
* Tue Feb 14 2012 William Cohen <wcohen@redhat.com> - 4.2.1-1
- Rebase to 4.2.1.
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Wed Nov 02 2011 William Cohen <wcohen@redhat.com> - 4.2.0-3
- Remove unwanted man1/*.c.1 files. (rhbz749725)
* Mon Oct 31 2011 William Cohen <wcohen@redhat.com> - 4.2.0-2
- Include appropirate man pages with papi rpm. (rhbz749725)
- Rebase to papi-4.2.0, fixup for coretemp component. (rhbz746851)
* Thu Oct 27 2011 William Cohen <wcohen@redhat.com> - 4.2.0-1
- Rebase to papi-4.2.0.
* Fri Aug 12 2011 William Cohen <wcohen@redhat.com> - 4.1.3-3
- Provide papi-static.
* Thu May 12 2011 William Cohen <wcohen@redhat.com> - 4.1.3-2
- Use corrected papi-4.1.3.
* Thu May 12 2011 William Cohen <wcohen@redhat.com> - 4.1.3-1
- Rebase to papi-4.1.3
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Mon Jan 24 2011 William Cohen <wcohen@redhat.com> - 4.1.2.1-1
- Rebase to papi-4.1.2.1
* Fri Oct 1 2010 William Cohen <wcohen@redhat.com> - 4.1.1-1
- Rebase to papi-4.1.1
* Tue Jun 22 2010 William Cohen <wcohen@redhat.com> - 4.1.0-1
- Rebase to papi-4.1.0
* Mon May 17 2010 William Cohen <wcohen@redhat.com> - 4.0.0-5
- Test run with upstream cvs version.
* Wed Feb 10 2010 William Cohen <wcohen@redhat.com> - 4.0.0-4
- Resolves: rhbz562935 Rebase to papi-4.0.0 (correct ExcludeArch).
* Wed Feb 10 2010 William Cohen <wcohen@redhat.com> - 4.0.0-3
- Resolves: rhbz562935 Rebase to papi-4.0.0 (bump nvr).
* Wed Feb 10 2010 William Cohen <wcohen@redhat.com> - 4.0.0-2
* Mon Feb 08 2010 William Cohen <wcohen@redhat.com> - 4.0.0-2
- correct the ctests/shlib test
- have PAPI_set_multiplex() return proper value
- properly handle event unit masks
- correct PAPI_name_to_code() to match events
- Resolves: rhbz562935 Rebase to papi-4.0.0
* Wed Jan 13 2010 William Cohen <wcohen@redhat.com> - 4.0.0-1
- Generate papi.spec file for papi-4.0.0.

View File

@ -1 +1 @@
SHA512 (papi-5.6.0.tar.gz) = b2a1536f220081d08ee9bc94fddbf422e36c60c55b0536bc43dec074bdaf23afaedbdd755b7e6af25c4c0ce582cc7ad4c59e2adc1801e75c482d472b080439be
ed42e99a636283ceb55563d0259d83b9 papi-4.0.0.tar.gz