Revert "Related #1918922"

This reverts commit 0d23da44c5.

.gitignore

@@ -22,3 +22,5 @@ papi-4.1.0.tar.gz
 /papi-5.5.0.tar.gz
 /papi-5.5.1.tar.gz
 /papi-5.6.0.tar.gz
+/papi-5.7.0.tar.gz
+/papi-6.0.0.tar.gz

papi-a64fx.patch

@@ -0,0 +1,34 @@
+commit 9a44d82928ed17ba2ff21eb88b89c5829d0ea30e
+Author: Steve Kaufmann <steven.kaufmann@hpe.com>
+Date:   Wed Jun 24 14:08:08 2020 -0400
+
+    Added PAPI preset support for Fujitsu A64FX.
+    
+    Signed-off-by: Heike Jagode <jagode@icl.utk.edu>
+
+diff --git a/src/papi_events.csv b/src/papi_events.csv
+index 8e96adfbd..1b5c15542 100644
+--- a/src/papi_events.csv
++++ b/src/papi_events.csv
+@@ -1877,6 +1877,21 @@ PRESET,PAPI_L2_DCR,NOT_DERIVED,L2D_CACHE_RD
+ PRESET,PAPI_L2_DCW,NOT_DERIVED,L2D_CACHE_WR
+ PRESET,PAPI_L2_LDM,NOT_DERIVED,L2D_CACHE_REFILL_RD
+ 
++#########################
++# ARM Fujitsu A64FX     #
++#########################
++CPU,arm_a64fx
++#
++PRESET,PAPI_TOT_INS,NOT_DERIVED,INST_RETIRED
++PRESET,PAPI_TOT_CYC,NOT_DERIVED,CPU_CYCLES
++PRESET,PAPI_FP_INS,NOT_DERIVED,VFP_SPEC
++PRESET,PAPI_VEC_INS,NOT_DERIVED,ASE_SPEC
++PRESET,PAPI_L1_DCM,NOT_DERIVED,L1D_CACHE_REFILL
++PRESET,PAPI_L1_ICA,NOT_DERIVED,L1I_CACHE
++PRESET,PAPI_L1_ICM,NOT_DERIVED,L1I_CACHE_REFILL
++PRESET,PAPI_L2_DCH,NOT_DERIVED,L2D_CACHE
++PRESET,PAPI_L2_DCM,NOT_DERIVED,L2D_CACHE_REFILL
++
+ #
+ CPU,mips_74k
+ #

papi-ldflags.patch

@@ -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@

papi-python3.patch

@@ -0,0 +1,10 @@
+diff --git a/src/high-level/scripts/papi_hl_output_writer.py b/src/high-level/scripts/papi_hl_output_writer.py
+index 123d2cd0..34bfbd73 100755
+--- a/src/high-level/scripts/papi_hl_output_writer.py
++++ b/src/high-level/scripts/papi_hl_output_writer.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ from __future__ import division
+ from collections import OrderedDict
+ 

papi.spec

@@ -5,16 +5,18 @@
 %else
 %{!?with_rdma: %global with_rdma 1}
 %endif
+%{!?with_pcp: %global with_pcp 1}
 Summary: Performance Application Programming Interface
 Name: papi
-Version: 5.6.0
-Release: 6%{?dist}
+Version: 6.0.0
+Release: 5%{?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
+Patch1: papi-python3.patch
+Patch2: papi-a64fx.patch
+Patch3: papi-no-iozone.patch
 BuildRequires: autoconf
 BuildRequires: doxygen
 BuildRequires: ncurses-devel
@@ -33,6 +35,9 @@ BuildRequires: net-tools
 BuildRequires: rdma-core-devel
 BuildRequires: infiniband-diags-devel
 %endif
+%if %{with_pcp}
+BuildRequires: pcp-libs-devel
+%endif
 BuildRequires: perl-generators
 #Right now libpfm does not know anything about s390 and will fail
 ExcludeArch: s390 s390x
@@ -43,15 +48,14 @@ 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: papi-libs = %{version}-%{release}
 Requires: pkgconfig
 %description devel
 PAPI-devel includes the C header files that specify the PAPI user-space
@@ -60,15 +64,14 @@ that uses PAPI.
 
 %package testsuite
 Summary: Set of tests for checking PAPI functionality
-Group: Development/System
 Requires: papi = %{version}-%{release}
+Requires: papi-libs = %{version}-%{release}
 %description testsuite
-PAPI-testuiste includes compiled versions of papi tests to ensure
+PAPI-testsuite 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
@@ -76,37 +79,46 @@ the PAPI user-space libraries and interfaces.
 
 %prep
 %setup -q
-%patch1 -p1 -b .ldflags
+%patch1 -p1 -b .python3
+%patch2 -p1 -b .a64fx
+%patch3 -p1
 
 %build
+# This package fails to build with LTO due to undefined symbols.  LTO
+# was disabled in OpenSuSE as well, but with no real explanation why
+# beyond the undefined symbols.  It really shold be investigated further.
+# Disable LTO
+%define _lto_cflags %{nil}
+
 %if %{without bundled_libpfm}
 # Build our own copy of libpfm.
 %global libpfm_config --with-pfm-incdir=%{_includedir} --with-pfm-libdir=%{_libdir}
 %endif
 
+# set up environment variable for the various components
+# cuda
+# host_micpower
+%if  %{with_rdma}
+  export PAPI_INFINIBAND_UMAD_ROOT=/usr
+%endif
+# lmsensors
+export PAPI_LMSENSORS_ROOT=/usr
+#pushd vmware; ./configure; popd
+%if %{with_pcp}
+%global pcp_enable pcp
+export PAPI_PCP_ROOT=/usr
+%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"
+--with-components="appio coretemp example infiniband lmsensors lustre micpower mx net %{?pcp_enable} rapl sde 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"
 
-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}
 
@@ -128,15 +140,14 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so*
 %{_bindir}/*
 %dir /usr/share/papi
 /usr/share/papi/papi_events.csv
-%doc INSTALL.txt README LICENSE.txt RELEASENOTES.txt
+%doc INSTALL.txt README.md LICENSE.txt RELEASENOTES.txt
 %doc %{_mandir}/man1/*
 
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%ldconfig_scriptlets libs
 
 %files libs
 %{_libdir}/*.so.*
-%doc INSTALL.txt README LICENSE.txt RELEASENOTES.txt
+%doc INSTALL.txt README.md LICENSE.txt RELEASENOTES.txt
 
 %files devel
 %{_includedir}/*.h
@@ -159,6 +170,46 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so*
 %{_libdir}/*.a
 
 %changelog
+* Thu Dec 17 2020 William Cohen <wcohen@redhat.com> - 6.0.0-5
+- Remove iozone source code. (#1901077)
+
+* Mon Nov 09 2020 William Cohen <wcohen@redhat.com> - 6.0.0-4
+- Add Fujitsu A64FX presets.
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 01 2020 Jeff Law <law@redhat.com> - 6.0.0-2
+- Disable LTO
+
+* Wed Mar 04 2020 William Cohen <wcohen@redhat.com> - 6.0.0-1
+- Rebase to official papi-6.0.0.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Mar 04 2019 William Cohen <wcohen@redhat.com> - 5.7.0-2
+- Rebase to official papi-5.7.0.
+
+* Mon Feb 18 2019 William Cohen <wcohen@redhat.com> - 5.7.0-1
+- Rebase to papi-5.7.0.
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jan 7 2019 William Cohen <wcohen@redhat.com> - 5.6.0-9
+- Correct typo in papi-testsuite description.
+- Add papi-libs for papi-testsuite and papi-devel.
+
+* Fri Nov 2 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.0-8
+- Pull in patch to avoid division-by-0.
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Thu May 17 2018 William Cohen <wcohen@redhat.com> - 5.6.0-6
 - Dynamically link utilities and tests to papi libraries.
 

sources

@@ -1 +1 @@
-SHA512 (papi-5.6.0.tar.gz) = b2a1536f220081d08ee9bc94fddbf422e36c60c55b0536bc43dec074bdaf23afaedbdd755b7e6af25c4c0ce582cc7ad4c59e2adc1801e75c482d472b080439be
+SHA512 (papi-6.0.0.tar.gz) = 2a4a245d64c3ac05ca9664194ac406cfb360fc0935afdee115ca0fc3f24b6051d1130426ed959fac2f711a2239100b37a4dfe8e0885697f4f4c049554c95258a