[papi/f20] Add presets for Intel Silvermont and rebuild with corrected libpfm.

[William Eden Cohen]

commit a2103b3ae7180521b8a41d397b6ee16ae2b221f0
Author: William Cohen <wcohen at redhat.com>
Date:   Wed Jan 15 09:49:17 2014 -0500

    Add presets for Intel Silvermont and rebuild with corrected libpfm.

 papi-intel.patch |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 papi.spec        |    9 +++++--
 2 files changed, 65 insertions(+), 3 deletions(-)
---
diff --git a/papi-intel.patch b/papi-intel.patch
index 4ac01c9..da2a8a1 100644
--- a/papi-intel.patch
+++ b/papi-intel.patch
@@ -156,3 +156,62 @@ index 01821a8..42c1da0 100644
  # Intel IvyBridge only
  CPU,ivb
  CPU,ivb_ep
+From 035fb0849fb84aa02b262b6abe67bc306c3a8600 Mon Sep 17 00:00:00 2001
+From: Vince Weaver <vincent.weaver at maine.edu>
+Date: Fri, 6 Dec 2013 13:03:39 -0500
+Subject: [PATCH 4/4] papi_events.csv : add initial atom silvermont support
+
+This is based on the manual, as I don't actually have one of these
+chips.
+
+The events available differ a lot from older atoms.  They also
+support offcore events and some sort of RAPL support.
+---
+ src/papi_events.csv | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+diff --git a/src/papi_events.csv b/src/papi_events.csv
+index 42c1da0..0e1163e 100644
+--- a/src/papi_events.csv
++++ b/src/papi_events.csv
+@@ -356,6 +356,7 @@ CPU,ix86arch
+ PRESET,PAPI_BR_INS,NOT_DERIVED,BRANCH_INSTRUCTIONS_RETIRED
+ PRESET,PAPI_BR_MSP,NOT_DERIVED,RETIRED_MISPREDICTED_BRANCH_INSTRUCTIONS
+ #
++# Intel Atom
+ CPU,Intel Atom
+ CPU,atom
+ #
+@@ -412,6 +413,29 @@ PRESET,PAPI_FML_INS,NOT_DERIVED,MUL:AR
+ PRESET,PAPI_FDV_INS,NOT_DERIVED,DIV:AR
+ PRESET,PAPI_VEC_INS,NOT_DERIVED,SIMD_INST_RETIRED:VECTOR
+ #
++# Intel Atom Silvermont
++CPU,slm
++PRESET,PAPI_TOT_INS,NOT_DERIVED,INSTRUCTIONS_RETIRED
++PRESET,PAPI_TOT_CYC,NOT_DERIVED,UNHALTED_CORE_CYCLES
++PRESET,PAPI_REF_CYC,NOT_DERIVED,UNHALTED_REFERENCE_CYCLES
++PRESET,PAPI_L1_ICM,NOT_DERIVED,ICACHE:MISSES
++PRESET,PAPI_L1_ICA,NOT_DERIVED,ICACHE:ACCESSES
++PRESET,PAPI_L1_ICH,DERIVED_SUB,ICACHE:ACCESSES,ICACHE:MISSES
++PRESET,PAPI_L1_TCM,NOT_DERIVED,LLC_REFERENCES
++PRESET,PAPI_L2_TCM,NOT_DERIVED,LLC_MISSES
++PRESET,PAPI_L2_TCH,DERIVED_SUB,LLC_REFERENCES,LLC_MISSES
++PRESET,PAPI_L2_TCA,NOT_DERIVED,LLC_REFERENCES
++#
++PRESET,PAPI_BR_CN,NOT_DERIVED,BR_INST_RETIRED:JCC
++PRESET,PAPI_BR_INS,NOT_DERIVED,BRANCH_INSTRUCTIONS_RETIRED
++PRESET,PAPI_BR_MSP,NOT_DERIVED,MISPREDICTED_BRANCH_RETIRED
++#
++PRESET,PAPI_RES_STL,NOT_DERIVED,UOPS_RETIRED:STALLS
++#
++#PRESET,PAPI_FP_INS,NOT_DERIVED,UOPS_RETIRED:X87
++PRESET,PAPI_FML_INS,NOT_DERIVED,UOPS_RETIRED:MUL
++PRESET,PAPI_FDV_INS,NOT_DERIVED,UOPS_RETIRED:DIV
++#
+ CPU,Intel Nehalem
+ CPU,Intel Westmere
+ CPU,nhm
+-- 
+1.8.3.1
+
diff --git a/papi.spec b/papi.spec
index a89cff0..6cb0e01 100644
--- a/papi.spec
+++ b/papi.spec
@@ -2,7 +2,7 @@
 Summary: Performance Application Programming Interface
 Name: papi
 Version: 5.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: Development/System
 URL: http://icl.cs.utk.edu/papi/
@@ -17,8 +17,8 @@ BuildRequires: kernel-headers >= 2.6.32
 BuildRequires: chrpath
 BuildRequires: lm_sensors-devel
 %if %{without bundled_libpfm}
-BuildRequires: libpfm-devel >= 4.3.0
-BuildRequires: libpfm-static >= 4.3.0
+BuildRequires: libpfm-devel >= 4.4.0-5
+BuildRequires: libpfm-static >= 4.4.0-5
 %endif
 # Following required for net component
 BuildRequires: net-tools
@@ -140,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Tue Jan 14 2014 William Cohen <wcohen at redhat.com> - 5.2.0-5
+- Add presets for Intel Silvermont.
+
 * Mon Jan 13 2014 William Cohen <wcohen at redhat.com> - 5.2.0-4
 - Add presets for Haswell and Ivy Bridge.