Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/papi.git#63e57c54e805ae498b9d3d8e5a76114c20323a85

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.spec

@@ -9,12 +9,13 @@
 Summary: Performance Application Programming Interface
 Name: papi
 Version: 6.0.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 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-python3.patch
+Patch2: papi-a64fx.patch
 BuildRequires: autoconf
 BuildRequires: doxygen
 BuildRequires: ncurses-devel
@@ -78,6 +79,7 @@ the PAPI user-space libraries and interfaces.
 %prep
 %setup -q
 %patch1 -p1 -b .python3
+%patch2 -p1 -b .a64fx
 
 %build
 # This package fails to build with LTO due to undefined symbols.  LTO
@@ -166,6 +168,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so*
 %{_libdir}/*.a
 
 %changelog
+* 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