rpms
/
papi
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Back port fixes for Intel Ivy Bridge event presets.

This commit is contained in:
William Cohen 2012-09-10 11:53:02 -04:00
parent 600459f55c
commit 3ee29737de
2 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
papi-ivb.patch Normal file
View File

@ -0,0 +1,50 @@
commit 5ad4e41e693e976a49d61bada0d690075e1f2681
Author: Dan Terpstra <terpstra@eecs.utk.edu>
Date: Sun Sep 9 16:57:42 2012 -0400
Remove doubly defined events from the combined Sandy / Ivy Bridge event table to fix my previous commit.
diff --git a/src/papi_events.csv b/src/papi_events.csv
index 36630f6..27b6ba9 100644
--- a/src/papi_events.csv
+++ b/src/papi_events.csv
@@ -565,8 +565,6 @@ PRESET,PAPI_L3_TCW,NOT_DERIVED,L2_RQSTS:RFO_MISS
PRESET,PAPI_BR_TKN,DERIVED_SUB,BR_INST_RETIRED:ALL_BRANCHES,BR_INST_RETIRED:NOT_TAKEN
PRESET,PAPI_BR_NTK,NOT_DERIVED,BR_INST_RETIRED:NOT_TAKEN
PRESET,PAPI_BR_INS,NOT_DERIVED,BR_INST_RETIRED:ALL_BRANCHES
-PRESET,PAPI_BR_CN,NOT_DERIVED,BR_INST_RETIRED:CONDITIONAL
-PRESET,PAPI_BR_UCN,DERIVED_SUB,BR_INST_RETIRED:ALL_BRANCHES,BR_INST_RETIRED:CONDITIONAL
PRESET,PAPI_BR_MSP,NOT_DERIVED,BR_MISP_RETIRED:ALL_BRANCHES
PRESET,PAPI_BR_PRC,DERIVED_SUB,BR_INST_RETIRED:ALL_BRANCHES,BR_MISP_RETIRED:ALL_BRANCHES
#
commit 7bcb741fa6797efd8c2932e9dba44fcc90c50124
Author: Dan Terpstra <terpstra@eecs.utk.edu>
Date: Thu Sep 6 16:50:15 2012 -0400
Fix event name issue for Ivy Bridge that surfaced in a recent libpfm4 commit.
diff --git a/src/papi_events.csv b/src/papi_events.csv
index c42f693..36630f6 100644
--- a/src/papi_events.csv
+++ b/src/papi_events.csv
@@ -583,6 +583,8 @@ CPU,snb_ep
#
PRESET,PAPI_L2_TCW,NOT_DERIVED,L2_RQSTS:RFO_ANY
PRESET,PAPI_L2_DCH,DERIVED_ADD,L2_RQSTS:ALL_DEMAND_RD_HIT,L2_RQSTS:RFO_HITS
+PRESET,PAPI_BR_CN,NOT_DERIVED,BR_INST_RETIRED:CONDITIONAL
+PRESET,PAPI_BR_UCN,DERIVED_SUB,BR_INST_RETIRED:ALL_BRANCHES,BR_INST_RETIRED:CONDITIONAL
PRESET,PAPI_TLB_DM,DERIVED_ADD,DTLB_LOAD_MISSES:CAUSES_A_WALK,DTLB_STORE_MISSES:CAUSES_A_WALK
#
# Counts scalars only; no SSE or AVX is counted; includes speculative
@@ -598,7 +600,9 @@ PRESET,PAPI_VEC_DP,DERIVED_POSTFIX,N0|2|*|N1|4|*|+|,FP_COMP_OPS_EXE:SSE_FP_PACKE
CPU,ivb
#
PRESET,PAPI_L2_TCW,NOT_DERIVED,L2_RQSTS:ALL_RFO
-PRESET,PAPI_L2_DCH,DERIVED_ADD,L2_RQSTS:DEMAND_DATA_RD_HIT,L2_RQSTS:RFO_HITS
+PRESET,PAPI_L2_DCH,DERIVED_ADD,L2_RQSTS:DEMAND_DATA_RD_HIT,L2_RQSTS:RFO_HIT
+PRESET,PAPI_BR_CN,NOT_DERIVED,BR_INST_RETIRED:COND
+PRESET,PAPI_BR_UCN,DERIVED_SUB,BR_INST_RETIRED:ALL_BRANCHES,BR_INST_RETIRED:COND
PRESET,PAPI_TLB_DM,DERIVED_ADD,DTLB_LOAD_MISSES:DEMAND_LD_MISS_CAUSES_A_WALK,DTLB_STORE_MISSES:CAUSES_A_WALK
#
CPU,Intel Core2

7
papi.spec
View File

@ -2,12 +2,13 @@
Summary: Performance Application Programming Interface
Name: papi
Version: 5.0.0
Release: 5%{?dist}
Release: 6%{?dist}
License: BSD
Group: Development/System
URL: http://icl.cs.utk.edu/papi/
Source0: http://icl.cs.utk.edu/projects/papi/downloads/%{name}-%{version}.tar.gz
Patch5: papi-unbundled-libpfm4.patch
Patch6: papi-ivb.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: ncurses-devel
BuildRequires: gcc-gfortran
@ -50,6 +51,7 @@ the PAPI user-space libraries and interfaces.
%setup -q
%patch5 -p1
%patch6 -p1
%build
%if %{without bundled_libpfm}
@ -112,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/*.a
%changelog
* Mon Sep 10 2012 William Cohen <wcohen@redhat.com> - 5.0.0-6
- Back port fixes for Intel Ivy Bridge event presets.
* Thu Aug 30 2012 William Cohen <wcohen@redhat.com> - 5.0.0-5
- Fixes to make papi with unbundled libpfm.