diff --git a/papi-5.6.0.tar.gz b/papi-5.6.0.tar.gz deleted file mode 100644 index 583afb7..0000000 Binary files a/papi-5.6.0.tar.gz and /dev/null differ diff --git a/papi-6.0.0.tar.gz b/papi-6.0.0.tar.gz new file mode 100644 index 0000000..bd1e23c Binary files /dev/null and b/papi-6.0.0.tar.gz differ diff --git a/papi-add-support-riscv64.patch b/papi-add-support-riscv64.patch index 89d8bcc..231677c 100644 --- a/papi-add-support-riscv64.patch +++ b/papi-add-support-riscv64.patch @@ -1,34 +1,7 @@ -diff --git a/src/configure b/src/configure -index 3d05182..357b874 100644 ---- a/src/configure -+++ b/src/configure -@@ -4628,7 +4628,7 @@ _ACEOF - - # First set pthread-mutexes based on arch - case $arch in -- aarch64|arm*) -+ aarch64|arm*|riscv*) - pthread_mutexes=yes - CFLAGS="$CFLAGS -DUSE_PTHREAD_MUTEXES" - echo "forcing use of pthread mutexes... " >&6 -diff --git a/src/configure.in b/src/configure.in -index cff36bc..697c317 100644 ---- a/src/configure.in -+++ b/src/configure.in -@@ -378,7 +378,7 @@ AC_DEFINE_UNQUOTED(CPU,$CPU,[cpu type]) - - # First set pthread-mutexes based on arch - case $arch in -- aarch64|arm*) -+ aarch64|arm*|riscv*) - pthread_mutexes=yes - CFLAGS="$CFLAGS -DUSE_PTHREAD_MUTEXES" - echo "forcing use of pthread mutexes... " >&6 -diff --git a/src/libpfm4/config.mk b/src/libpfm4/config.mk -index 51d4f25..18f5838 100644 ---- a/src/libpfm4/config.mk -+++ b/src/libpfm4/config.mk -@@ -177,6 +177,9 @@ ifeq ($(ARCH),cell) +diff -ruN papi-6.0.0/src/libpfm4/config.mk papi/src/libpfm4/config.mk +--- papi-6.0.0/src/libpfm4/config.mk 2022-10-29 13:04:32.000000000 +0800 ++++ papi/src/libpfm4/config.mk 2023-01-15 21:16:16.101680541 +0800 +@@ -177,6 +177,9 @@ CONFIG_PFMLIB_CELL=y endif @@ -38,24 +11,22 @@ index 51d4f25..18f5838 100644 # # you shouldn't have to touch anything beyond this point -diff --git a/src/linux-context.h b/src/linux-context.h -index 524490b..7d51495 100644 ---- a/src/linux-context.h -+++ b/src/linux-context.h -@@ -35,6 +35,8 @@ typedef ucontext_t hwd_ucontext_t; - #define OVERFLOW_ADDRESS(ctx) ctx.ucontext->uc_mcontext.pc - #elif defined(__mips__) +diff -ruN papi-6.0.0/src/linux-context.h papi/src/linux-context.h +--- papi-6.0.0/src/linux-context.h 2022-10-29 13:04:32.000000000 +0800 ++++ papi/src/linux-context.h 2023-01-15 21:16:16.101680541 +0800 +@@ -37,6 +37,8 @@ #define OVERFLOW_ADDRESS(ctx) ctx.ucontext->uc_mcontext.pc + #elif defined(__hppa__) + #define OVERFLOW_ADDRESS(ctx) ctx.ucontext->uc_mcontext.sc_iaoq[0] +#elif defined(__riscv) +#define OVERFLOW_ADDRESS(ctx) ctx.ucontext->uc_mcontext.__gregs[REG_PC] #else #error "OVERFLOW_ADDRESS() undefined!" #endif -diff --git a/src/linux-timer.c b/src/linux-timer.c -index 853e676..8222acb 100644 ---- a/src/linux-timer.c -+++ b/src/linux-timer.c -@@ -288,6 +288,27 @@ get_cycles( void ) +diff -ruN papi-6.0.0/src/linux-timer.c papi/src/linux-timer.c +--- papi-6.0.0/src/linux-timer.c 2022-10-29 13:04:32.000000000 +0800 ++++ papi/src/linux-timer.c 2023-01-15 21:16:16.101680541 +0800 +@@ -288,6 +288,27 @@ return 0; } @@ -74,7 +45,7 @@ index 853e676..8222acb 100644 + return ret; +} + -+/* ++/* + * TODO: riscv32 implementation can be done following example in: + * Volume I: RISC-V User-Level ISA V2.2 + * 2.8 Control and Status Register Instructions @@ -83,10 +54,9 @@ index 853e676..8222acb 100644 #elif !defined(HAVE_GETTIMEOFDAY) && !defined(HAVE_CLOCK_GETTIME) #error "No get_cycles support for this architecture. " -diff --git a/src/mb.h b/src/mb.h -index 1019691..0b82a9d 100644 ---- a/src/mb.h -+++ b/src/mb.h +diff -ruN papi-6.0.0/src/mb.h papi/src/mb.h +--- papi-6.0.0/src/mb.h 2022-10-29 13:04:32.000000000 +0800 ++++ papi/src/mb.h 2023-01-15 21:16:16.101680541 +0800 @@ -39,6 +39,9 @@ #elif defined(__aarch64__) #define rmb() asm volatile("dmb ld" ::: "memory") diff --git a/papi-ldflags.patch b/papi-ldflags.patch deleted file mode 100644 index d244458..0000000 --- a/papi-ldflags.patch +++ /dev/null @@ -1,115 +0,0 @@ -commit bde3da26f1f2755689e16fc9f5ab404367d1fdc8 -Author: Vince Weaver -Date: Wed Jan 24 14:13:28 2018 -0500 - - build: fix various LDFLAGS/CFLAGS issues - - issues were reported by Andreas Beckmann - -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@ diff --git a/papi.spec b/papi.spec index a92e6fe..ae02e82 100644 --- a/papi.spec +++ b/papi.spec @@ -1,6 +1,6 @@ Name: papi -Version: 5.6.0 -Release: 10 +Version: 6.0.0 +Release: 1 Summary: Performance Application Programming Interface License: BSD URL: http://icl.cs.utk.edu/papi/ @@ -11,8 +11,7 @@ BuildRequires: net-tools rdma-core-devel perl-generators Provides: papi-libs = %{version}-%{release} Obsoletes: papi-libs < %{version}-%{release} -Patch0001: papi-ldflags.patch -Patch0002: papi-add-support-riscv64.patch +Patch0001: papi-add-support-riscv64.patch %description PAPI provides a programmer interface to monitor the performance of @@ -45,10 +44,6 @@ autoconf --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" -cd components -cd infiniband_umad; %configure -cd ../lmsensors; %configure --with-sensors_incdir=/usr/include/sensors --with-sensors_libdir=%{_libdir}; -cd ../../ DBG="" make %{?_smp_mflags} cd ../doc @@ -83,11 +78,14 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so* %exclude /usr/share/papi/papi_events.csv %files help -%doc INSTALL.txt README RELEASENOTES.txt +%doc INSTALL.txt README.md RELEASENOTES.txt %{_mandir}/man1/* %{_mandir}/man3/* %changelog +* Wed Oct 26 2022 hua - 6.0.0-1 +- upgrade version to 6.0.0 + * Mon Jan 24 2022 wujie - 5.6.0-10 - add support for riscv64 from http://fedora.riscv.rocks/koji/buildinfo?buildID=31200 Author is David Abdurachmanov