From e80e9a486804912fb4a89b95cb29e626deb105e9 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 15 2022 06:44:30 +0000
Subject: import papi-6.0.0-12.el9


---

diff --git a/SOURCES/papi-rhbz1923967.patch b/SOURCES/papi-rhbz1923967.patch
new file mode 100644
index 0000000..9770f8e
--- /dev/null
+++ b/SOURCES/papi-rhbz1923967.patch
@@ -0,0 +1,23 @@
+diff -up papi-6.0.0/src/papi_events.csv.rhbz1923967 papi-6.0.0/src/papi_events.csv
+--- papi-6.0.0/src/papi_events.csv.rhbz1923967	2022-05-26 11:20:59.138469200 -0400
++++ papi-6.0.0/src/papi_events.csv	2022-05-26 11:23:30.686302618 -0400
+@@ -1588,8 +1588,8 @@ PRESET,PAPI_L1_DCR,DERIVED_SUB,PM_LD_REF
+ #PRESET,PAPI_L1_DCA,DERIVED_POSTFIX,N0|N1|-|N2|+|N3|-,PM_ST_FIN,PM_ST_MISS_L1,PM_LD_REF_L1,PM_LD_MISS_L1_ALT
+ PRESET,PAPI_L1_DCA,DERIVED_ADD,PM_LD_REF_L1,PM_ST_CMPL
+ PRESET,PAPI_L2_DCM,NOT_DERIVED,PM_DATA_FROM_L2MISS
+-PRESET,PAPI_L2_LDM,NOT_DERIVED,PM_L2_LD_MISS
+-PRESET,PAPI_L2_STM,NOT_DERIVED,PM_L2_ST_MISS
++#PRESET,PAPI_L2_LDM,NOT_DERIVED,PM_L2_LD_MISS
++#PRESET,PAPI_L2_STM,NOT_DERIVED,PM_L2_ST_MISS
+ PRESET,PAPI_L2_DCR,NOT_DERIVED,PM_DATA_FROM_L2
+ PRESET,PAPI_L2_DCW,NOT_DERIVED,PM_L2_ST_HIT
+ PRESET,PAPI_L3_DCR,NOT_DERIVED,PM_DATA_FROM_L2MISS
+@@ -1598,7 +1598,7 @@ PRESET,PAPI_L3_LDM,DERIVED_ADD,PM_DATA_F
+ PRESET,PAPI_L1_ICH,NOT_DERIVED,PM_INST_FROM_L1
+ PRESET,PAPI_L1_ICM,NOT_DERIVED,PM_L1_ICACHE_MISS
+ PRESET,PAPI_L2_ICM,NOT_DERIVED,PM_INST_FROM_L2MISS
+-PRESET,PAPI_L2_ICM,NOT_DERIVED,PM_L2_INST_MISS
++#PRESET,PAPI_L2_ICM,NOT_DERIVED,PM_L2_INST_MISS
+ PRESET,PAPI_L2_ICH,NOT_DERIVED,PM_INST_FROM_L2
+ PRESET,PAPI_L3_ICA,NOT_DERIVED,PM_INST_FROM_L2MISS
+ PRESET,PAPI_L3_ICH,NOT_DERIVED,PM_INST_FROM_L3
diff --git a/SPECS/papi.spec b/SPECS/papi.spec
index 01e037c..bb51b3b 100644
--- a/SPECS/papi.spec
+++ b/SPECS/papi.spec
@@ -11,7 +11,7 @@
 Summary: Performance Application Programming Interface
 Name: papi
 Version: 6.0.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: BSD
 Requires: papi-libs = %{version}-%{release}
 URL: http://icl.cs.utk.edu/papi/
@@ -26,6 +26,7 @@ Patch2: papi-a64fx.patch
 Patch4: papi-config.patch
 Patch5: papi-nostatic.patch
 Patch6: papi-lto.patch
+Patch7: papi-rhbz1923967.patch
 BuildRequires: make
 BuildRequires: autoconf
 BuildRequires: doxygen
@@ -98,6 +99,7 @@ the PAPI user-space libraries and interfaces.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 
@@ -190,6 +192,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so*
 %endif
 
 %changelog
+* Thu May 26 2022 William Cohen <wcohen@redhat.com> - 6.0.0-12
+- Disable problematic IBM Power9 events. (RHBZ#1923967)
+
 * Thu Nov 04 2021 William Cohen <wcohen@redhat.com> - 6.0.0-11
 - Allow build with LTO enable. rhbz#1986635