From c0c1ac32cf4bb303a9610eb1b0f52273856b7759 Mon Sep 17 00:00:00 2001 From: William Cohen Date: Mon, 14 Jan 2013 10:31:41 -0500 Subject: [PATCH] * Mon Jan 14 2013 William Cohen - 5.0.1-5 - Add armv7 cortex a15 presets. --- papi-armv7a15.patch | 77 +++++++++++++++++++++++++++++++++++++++++++++ papi.spec | 7 ++++- 2 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 papi-armv7a15.patch diff --git a/papi-armv7a15.patch b/papi-armv7a15.patch new file mode 100644 index 0000000..d57da4d --- /dev/null +++ b/papi-armv7a15.patch @@ -0,0 +1,77 @@ +commit f65c9d9efce2df3658f66c99c92a7de8a510b004 +Author: William Cohen +Date: Mon Jan 7 14:00:20 2013 -0500 + + Add preset events for ARM Cortex A15 + +diff --git a/src/papi_events.csv b/src/papi_events.csv +index 44e4b65..286ee27 100644 +--- a/src/papi_events.csv ++++ b/src/papi_events.csv +@@ -1349,6 +1349,24 @@ PRESET,PAPI_L1_DCA,NOT_DERIVED,DCACHE_ACCESS + PRESET,PAPI_L1_DCM,NOT_DERIVED,DCACHE_REFILL + PRESET,PAPI_L1_ICM,NOT_DERIVED,IFETCH_MISS + # ++CPU,arm_ac15 ++# ++PRESET,PAPI_TOT_INS,NOT_DERIVED,INST_RETIRED ++PRESET,PAPI_TOT_IIS,NOT_DERIVED,INST_SPEC_EXEC ++PRESET,PAPI_TOT_CYC,NOT_DERIVED,CPU_CYCLES ++#PRESET,PAPI_HW_INT,NOT_DERIVED,EXT_INTERRUPTS ++PRESET,PAPI_FP_INS,NOT_DERIVED,INST_SPEC_EXEC_VFP ++PRESET,PAPI_VEC_INS,NOT_DERIVED,INST_SPEC_EXEC_SIMD ++PRESET,PAPI_BR_INS,NOT_DERIVED,INST_SPEC_EXEC_SOFT_PC ++PRESET,PAPI_BR_MSP,NOT_DERIVED,BRANCH_MISPRED ++PRESET,PAPI_LD_INS,NOT_DERIVED,DATA_MEM_READ_ACCESS ++PRESET,PAPI_SR_INS,NOT_DERIVED,DATA_MEM_WRITE_ACCESS ++#PRESET,PAPI_TLB_IM,NOT_DERIVED,ITLB_MISS ++#PRESET,PAPI_TLB_DM,NOT_DERIVED,DTLB_REFILL ++PRESET,PAPI_L1_DCA,DERIVED_ADD,L1D_READ_ACCESS,L1D_WRITE_ACCESS ++PRESET,PAPI_L1_DCM,DERIVED_ADD,L1D_READ_REFILL,L1D_WRITE_REFILL ++PRESET,PAPI_L1_ICM,NOT_DERIVED,L1I_CACHE_REFILL ++# + CPU,mips_74k + # + PRESET,PAPI_TOT_CYC,NOT_DERIVED,CYCLES +commit 57c520df4ca957a0b2550e1177d87f8b167c06a5 +Author: William Cohen +Date: Fri Jan 11 16:34:56 2013 -0500 + + Clean up armv7 cortex a15 presets + + Clean up armv7 cortex a15 presets and add presets for L1 and L2 cache + + Signed-off-by: William Cohen + +diff --git a/src/papi_events.csv b/src/papi_events.csv +index 286ee27..13260bc 100644 +--- a/src/papi_events.csv ++++ b/src/papi_events.csv +@@ -1354,18 +1354,24 @@ CPU,arm_ac15 + PRESET,PAPI_TOT_INS,NOT_DERIVED,INST_RETIRED + PRESET,PAPI_TOT_IIS,NOT_DERIVED,INST_SPEC_EXEC + PRESET,PAPI_TOT_CYC,NOT_DERIVED,CPU_CYCLES +-#PRESET,PAPI_HW_INT,NOT_DERIVED,EXT_INTERRUPTS + PRESET,PAPI_FP_INS,NOT_DERIVED,INST_SPEC_EXEC_VFP + PRESET,PAPI_VEC_INS,NOT_DERIVED,INST_SPEC_EXEC_SIMD + PRESET,PAPI_BR_INS,NOT_DERIVED,INST_SPEC_EXEC_SOFT_PC + PRESET,PAPI_BR_MSP,NOT_DERIVED,BRANCH_MISPRED + PRESET,PAPI_LD_INS,NOT_DERIVED,DATA_MEM_READ_ACCESS + PRESET,PAPI_SR_INS,NOT_DERIVED,DATA_MEM_WRITE_ACCESS +-#PRESET,PAPI_TLB_IM,NOT_DERIVED,ITLB_MISS +-#PRESET,PAPI_TLB_DM,NOT_DERIVED,DTLB_REFILL + PRESET,PAPI_L1_DCA,DERIVED_ADD,L1D_READ_ACCESS,L1D_WRITE_ACCESS + PRESET,PAPI_L1_DCM,DERIVED_ADD,L1D_READ_REFILL,L1D_WRITE_REFILL ++PRESET,PAPI_L1_DCR,NOT_DERIVED,L1D_READ_ACCESS ++PRESET,PAPI_L1_DCW,NOT_DERIVED,L1D_WRITE_ACCESS ++PRESET,PAPI_L1_ICA,NOT_DERIVED,L1I_CACHE_ACCESS + PRESET,PAPI_L1_ICM,NOT_DERIVED,L1I_CACHE_REFILL ++PRESET,PAPI_L2_DCH,NOT_DERIVED,L2D_CACHE_ACCESS ++PRESET,PAPI_L2_DCM,NOT_DERIVED,L2D_CACHE_REFILL ++PRESET,PAPI_L2_DCR,NOT_DERIVED,L2D_READ_ACCESS ++PRESET,PAPI_L2_DCW,NOT_DERIVED,L2D_WRITE_ACCESS ++PRESET,PAPI_L2_LDM,NOT_DERIVED,L2D_READ_REFILL ++PRESET,PAPI_L2_STM,NOT_DERIVED,L2D_WRITE_REFILL + # + CPU,mips_74k + # diff --git a/papi.spec b/papi.spec index 3c50d13..858c695 100644 --- a/papi.spec +++ b/papi.spec @@ -2,12 +2,13 @@ Summary: Performance Application Programming Interface Name: papi Version: 5.0.1 -Release: 4%{?dist} +Release: 5%{?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 Patch200: papi-libversion.patch +Patch201: papi-armv7a15.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 %patch200 -p1 -b .visible +%patch201 -p1 -b .armv7a15 %build %if %{without bundled_libpfm} @@ -112,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.a %changelog +* Mon Jan 14 2013 William Cohen - 5.0.1-5 +- Add armv7 cortex a15 presets. + * Tue Dec 04 2012 William Cohen - 5.0.1-4 - Disable ldconfig on install.