Accepting request 517255 from devel:libraries:c_c++

1

OBS-URL: https://build.opensuse.org/request/show/517255
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libpfm?expand=0&rev=14

libpfm.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Aug 16 17:06:19 UTC 2017 - tonyj@suse.com
+
+- Add Power9 support (FATE#322257) 
+  New patch: libpfm_enable-ibm-power9-core-pmu-support-beta.patch
+  New patch: libpfm_fix-power9-event-file-header.patch
+  New patch: libpfm_power9-event-list-update-for-perfmon2.patch
+  New patch: libpfm_add-power9-entries-to-validate_power-c.patch
+
 -------------------------------------------------------------------
 Sat Jan 14 14:53:05 UTC 2017 - mpluskal@suse.com
 

libpfm.spec

@@ -26,6 +26,11 @@ Group:          Development/Libraries/C and C++
 Url:            http://perfmon2.sourceforge.net/
 Source:         http://downloads.sourceforge.net/project/perfmon2/libpfm4/%{name}-%{version}.tar.gz
 Source1:        baselibs.conf
+Patch1:         libpfm_enable-ibm-power9-core-pmu-support-beta.patch
+Patch2:         libpfm_fix-power9-event-file-header.patch
+Patch3:         libpfm_power9-event-list-update-for-perfmon2.patch
+Patch4:         libpfm_add-power9-entries-to-validate_power-c.patch
+
 BuildRequires:  python-devel
 BuildRequires:  swig >= 2.0.5
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -75,6 +80,10 @@ This package provides python bindings for the libpfm4 package and the perf_event
 
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 # disable werror
 sed -i \
     -e 's:-Werror::g' \

libpfm_add-power9-entries-to-validate_power-c.patch

@@ -0,0 +1,59 @@
+From: Will Schmidt <will_schmidt@vnet.ibm.com>
+Date: Tue, 6 Jun 2017 11:09:17 -0500
+Subject: add power9 entries to validate_power.c
+Git-repo: git://git.code.sf.net/p/perfmon2/libpfm4
+Git-commit: ce5b320031f75f9a9881333c13902d5541f91cc8
+References: FATE#322254
+Signed-off-by: Tony Jones <tonyj@suse.de>
+
+Hi,
+
+Update the validate_power test to include power9 entries.
+
+sniff-test run output:
+$ ./validate
+Libpfm structure tests:
+	libpfm ABI version : 0
+	pfm_pmu_info_t : Passed
+	pfm_event_info_t : Passed
+	pfm_event_attr_info_t : Passed
+	pfm_pmu_encode_arg_t : Passed
+	pfm_perf_encode_arg_t : Passed
+Libpfm internal table tests:
+	<snip...>
+	checking power9 (946 events): Passed
+Architecture specific tests:
+	 20 PowerPC events: 0 errors
+All tests passed
+
+Signed-off-by:  Will Schmidt <will_schmidt@vnet.ibm.com>
+---
+ tests/validate_power.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/tests/validate_power.c b/tests/validate_power.c
+index 74ab30c..617efca 100644
+--- a/tests/validate_power.c
++++ b/tests/validate_power.c
+@@ -157,6 +157,20 @@ static const test_event_t ppc_test_events[]={
+ 	  .codes[0] = 0xde200201e6ull,
+ 	  .fstr = "power8::PM_RC_LIFETIME_EXC_32",
+ 	},
++	{ SRC_LINE,
++	  .name = "power9::PM_CYC",
++	  .ret  = PFM_SUCCESS,
++	  .count = 1,
++	  .codes[0] = 0x1001e,
++	  .fstr = "power9::PM_CYC",
++	},
++	{ SRC_LINE,
++	  .name = "power9::PM_INST_DISP",
++	  .ret  = PFM_SUCCESS,
++	  .count = 1,
++	  .codes[0] = 0x200f2,
++	  .fstr = "power9::PM_INST_DISP",
++	},
+     { SRC_LINE,
+       .name = "powerpc_nest_mcs_read::MCS_00",
+       .ret = PFM_SUCCESS,
+

libpfm_fix-power9-event-file-header.patch

@@ -0,0 +1,29 @@
+From: Stephane Eranian <eranian@gmail.com>
+Date: Fri, 2 Jun 2017 12:10:17 -0700
+Subject: fix Power9 event file header
+Git-repo: git://git.code.sf.net/p/perfmon2/libpfm4
+Git-commit: 930ef5dbcc5d0d663979e16079aac12a7872d44d
+References: FATE#322254
+Signed-off-by: Tony Jones <tonyj@suse.de>
+
+Had __POWER8_EVENTS_H__ instead of __POWER9_EVENTS_H__
+
+Signed-off-by: Stephane Eranian <eranian@gmail.com>
+---
+ lib/events/power9_events.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/events/power9_events.h b/lib/events/power9_events.h
+index 7414687..765e9bd 100644
+--- a/lib/events/power9_events.h
++++ b/lib/events/power9_events.h
+@@ -20,7 +20,7 @@
+ */
+ 
+ #ifndef __POWER9_EVENTS_H__
+-#define __POWER8_EVENTS_H__
++#define __POWER9_EVENTS_H__
+ 
+ #define POWER9_PME_PM_IERAT_RELOAD 0
+ #define POWER9_PME_PM_TM_OUTER_TEND 1
+