c7ea89
commit adbae8cd948234539d3ad63363878011e5a59949
c7ea89
Author: Heike McCraw <mccraw@icl.utk.edu>
c7ea89
Date:   Thu Dec 11 12:07:38 2014 -0500
c7ea89
c7ea89
    Update presets for Intel Haswell and Haswell-EP
c7ea89
    (according to the updates of the libpfm4 event table
c7ea89
    for Intel Haswell and Haswell-EP).
c7ea89
    These mods have not been tested due to lacking access
c7ea89
    to an Intel Haswell system.
c7ea89
c7ea89
diff --git a/src/papi_events.csv b/src/papi_events.csv
c7ea89
index d27a41d..0a17ab3 100644
c7ea89
--- a/src/papi_events.csv
c7ea89
+++ b/src/papi_events.csv
c7ea89
@@ -634,7 +634,7 @@ PRESET,PAPI_TLB_DM,DERIVED_ADD,DTLB_LOAD_MISSES:DEMAND_LD_MISS_CAUSES_A_WALK,DTL
c7ea89
 # Intel Haswell events (and most likely also Sandy Bridge)
c7ea89
 CPU,hsw
c7ea89
 CPU,hsw_ep
c7ea89
-PRESET,PAPI_TOT_CYC,NOT_DERIVED,CPU_CLK_UNHALTED:THREAD_P
c7ea89
+PRESET,PAPI_TOT_CYC,NOT_DERIVED,CPU_CLK_THREAD_UNHALTED:THREAD_P
c7ea89
 PRESET,PAPI_TOT_INS,NOT_DERIVED,INST_RETIRED:ANY_P
c7ea89
 PRESET,PAPI_REF_CYC,NOT_DERIVED,CPU_CLK_THREAD_UNHALTED:REF_XCLK
c7ea89
 # Loads and stores
c7ea89
@@ -692,7 +692,7 @@ PRESET,PAPI_L3_TCW,NOT_DERIVED,L2_RQSTS:DEMAND_RFO_MISS
c7ea89
 PRESET,PAPI_CA_SNP,NOT_DERIVED,OFFCORE_RESPONSE_0:SNP_ANY
c7ea89
 PRESET,PAPI_CA_SHR,NOT_DERIVED,OFFCORE_REQUESTS:ALL_DATA_RD
c7ea89
 PRESET,PAPI_CA_CLN,NOT_DERIVED,OFFCORE_REQUESTS:DEMAND_RFO
c7ea89
-PRESET,PAPI_CA_INV,NOT_DERIVED,OFFCORE_RESPONSE_0:HITM
c7ea89
+PRESET,PAPI_CA_INV,NOT_DERIVED,OFFCORE_RESPONSE_0:SNP_HITM
c7ea89
 PRESET,PAPI_CA_ITV,NOT_DERIVED,OFFCORE_RESPONSE_0:SNP_FWD
c7ea89
 # TLB
c7ea89
 PRESET,PAPI_TLB_DM,DERIVED_ADD,DTLB_LOAD_MISSES:MISS_CAUSES_A_WALK,DTLB_STORE_MISSES:MISS_CAUSES_A_WALK
c7ea89
c7ea89
commit 1dbc7038450d53c7e8724f9e2cb0eb773bdc97bf
c7ea89
Author: Heike McCraw <mccraw@icl.utk.edu>
c7ea89
Date:   Thu May 28 13:46:52 2015 -0400
c7ea89
c7ea89
    Temporary workaround: exclude_guest and exclude_host bits have to be
c7ea89
    zero in the attribute structure (via :mg=1:mh=1).
c7ea89
    
c7ea89
    exclude_guest wasn't introduced until Linux 3.2, and so, running newer
c7ea89
    PAPI versions with libpfm4 that allows exclude_guest to be set on older
c7ea89
    kernels completely breaks all events unless :mg=1:mh=1 is passed.
c7ea89
    
c7ea89
    PAPI code passes the attribute block created by libpfm4 to the kernel
c7ea89
    without modifying its contents. It would be better if libpfm4 provides
c7ea89
    different defaults for these attribute bits.
c7ea89
    This commit, however, enforces mg=1 and mh=1 for all Xeon Phi
c7ea89
    predefined events.  A problem with always enforcding mg=1 (i.e.
c7ea89
    exclude_guest=0) is that if exclude_guest=1 (mg=0) is needed (e.g.,
c7ea89
    to use PEBS) users have to fall back to using native events with the
c7ea89
    appropriate qualifier settings.
c7ea89
    
c7ea89
    This issue has been extensively discussed on the mailing list (Subject
c7ea89
    “KNC events", discussion started on 11/26/14) where more details can be
c7ea89
    found.
c7ea89
c7ea89
diff --git a/src/papi_events.csv b/src/papi_events.csv
c7ea89
index 8fe0ae1..74da53c 100644
c7ea89
--- a/src/papi_events.csv
c7ea89
+++ b/src/papi_events.csv
c7ea89
@@ -1761,20 +1761,20 @@ PRESET,PAPI_TLB_TL,DERIVED_POSTFIX,N0|N1|+|N2|+|,PEVT_MMU_TLB_MISS_DIRECT_DERAT,
c7ea89
 # Intel MIC / Xeon-Phi / Knights Corner
c7ea89
 CPU,knc
c7ea89
 #
c7ea89
-PRESET,PAPI_BR_INS,NOT_DERIVED,BRANCHES
c7ea89
-PRESET,PAPI_BR_MSP,NOT_DERIVED,BRANCHES_MISPREDICTED
c7ea89
-PRESET,PAPI_L1_ICM,NOT_DERIVED,CODE_CACHE_MISS
c7ea89
-PRESET,PAPI_TLB_IM,NOT_DERIVED,CODE_PAGE_WALK
c7ea89
-PRESET,PAPI_L1_ICA,NOT_DERIVED,CODE_READ
c7ea89
-PRESET,PAPI_TOT_CYC,NOT_DERIVED,CPU_CLK_UNHALTED
c7ea89
-PRESET,PAPI_TLB_DM,NOT_DERIVED,DATA_PAGE_WALK
c7ea89
-PRESET,PAPI_LD_INS,NOT_DERIVED,DATA_READ
c7ea89
-PRESET,PAPI_SR_INS,NOT_DERIVED,DATA_WRITE
c7ea89
-PRESET,PAPI_L1_DCM,NOT_DERIVED,DATA_READ_MISS_OR_WRITE_MISS
c7ea89
-PRESET,PAPI_L1_DCA,NOT_DERIVED,DATA_READ_OR_WRITE
c7ea89
-PRESET,PAPI_TOT_INS,NOT_DERIVED,INSTRUCTIONS_EXECUTED
c7ea89
-PRESET,PAPI_L2_LDM,NOT_DERIVED,L2_READ_MISS
c7ea89
-PRESET,PAPI_VEC_INS,NOT_DERIVED,VPU_INSTRUCTIONS_EXECUTED
c7ea89
+PRESET,PAPI_BR_INS,NOT_DERIVED,BRANCHES:mg=1:mh=1
c7ea89
+PRESET,PAPI_BR_MSP,NOT_DERIVED,BRANCHES_MISPREDICTED:mg=1:mh=1
c7ea89
+PRESET,PAPI_L1_ICM,NOT_DERIVED,CODE_CACHE_MISS:mg=1:mh=1
c7ea89
+PRESET,PAPI_TLB_IM,NOT_DERIVED,CODE_PAGE_WALK:mg=1:mh=1
c7ea89
+PRESET,PAPI_L1_ICA,NOT_DERIVED,CODE_READ:mg=1:mh=1
c7ea89
+PRESET,PAPI_TOT_CYC,NOT_DERIVED,CPU_CLK_UNHALTED:mg=1:mh=1
c7ea89
+PRESET,PAPI_TLB_DM,NOT_DERIVED,DATA_PAGE_WALK:mg=1:mh=1
c7ea89
+PRESET,PAPI_LD_INS,NOT_DERIVED,DATA_READ:mg=1:mh=1
c7ea89
+PRESET,PAPI_SR_INS,NOT_DERIVED,DATA_WRITE:mg=1:mh=1
c7ea89
+PRESET,PAPI_L1_DCM,NOT_DERIVED,DATA_READ_MISS_OR_WRITE_MISS:mg=1:mh=1
c7ea89
+PRESET,PAPI_L1_DCA,NOT_DERIVED,DATA_READ_OR_WRITE:mg=1:mh=1
c7ea89
+PRESET,PAPI_TOT_INS,NOT_DERIVED,INSTRUCTIONS_EXECUTED:mg=1:mh=1
c7ea89
+PRESET,PAPI_L2_LDM,NOT_DERIVED,L2_READ_MISS:mg=1:mh=1
c7ea89
+PRESET,PAPI_VEC_INS,NOT_DERIVED,VPU_INSTRUCTIONS_EXECUTED:mg=1:mh=1
c7ea89
 
c7ea89
 CPU,BGP
c7ea89
 # The following PAPI presets are accurate for all application nodes
c7ea89
c7ea89
commit f42eda64e7c3cc0784b3ce8b8a71f88647a61640
c7ea89
Author: Heike McCraw <mccraw@icl.utk.edu>
c7ea89
Date:   Thu Jun 25 15:05:53 2015 -0400
c7ea89
c7ea89
    Added definitions to Power8 for PAPI_SP_OPS, PAPI_DP_OPS.
c7ea89
c7ea89
diff --git a/src/papi_events.csv b/src/papi_events.csv
c7ea89
index 74da53c..40c562b 100644
c7ea89
--- a/src/papi_events.csv
c7ea89
+++ b/src/papi_events.csv
c7ea89
@@ -1378,6 +1378,8 @@ PRESET,PAPI_TOT_INS,NOT_DERIVED,PM_INST_CMPL
c7ea89
 #n/aPRESET,PAPI_INT_INS,DERIVED_ADD,PM_FXU0_FIN,PM_FXU1_FIN
c7ea89
 PRESET,PAPI_FP_OPS,NOT_DERIVED,PM_FLOP
c7ea89
 PRESET,PAPI_FP_INS,NOT_DERIVED,PM_FLOP
c7ea89
+PRESET,PAPI_DP_OPS,DERIVED_POSTFIX,N0|4|*|N1|8|*|N2|16|*|N3|32|*|+|+|+|,PM_VSU0_2FLOP,PM_VSU0_4FLOP,PM_VSU0_8FLOP,PM_VSU0_16FLOP
c7ea89
+PRESET,PAPI_SP_OPS,DERIVED_POSTFIX,N0|4|*|N1|8|*|N2|16|*|N3|32|*|+|+|+|,PM_VSU0_2FLOP,PM_VSU0_4FLOP,PM_VSU0_8FLOP,PM_VSU0_16FLOP
c7ea89
 PRESET,PAPI_TOT_CYC,NOT_DERIVED,PM_RUN_CYC
c7ea89
 PRESET,PAPI_HW_INT,NOT_DERIVED,PM_EXT_INT
c7ea89
 PRESET,PAPI_STL_ICY,DERIVED_POSTFIX,N0|N1|-|,PM_RUN_CYC,PM_1PLUS_PPC_DISP
c7ea89
c7ea89
commit 36c5b5b6b9bc90142743e4b62fa6cc8f99b3e46c
c7ea89
Author: Vince Weaver <vincent.weaver@maine.edu>
c7ea89
Date:   Thu Jun 25 22:20:17 2015 -0400
c7ea89
c7ea89
    add broadwell predefined events
c7ea89
    
c7ea89
    For now they are the same as Haswell, as that's what the Linux kernel
c7ea89
    does.
c7ea89
c7ea89
diff --git a/src/papi_events.csv b/src/papi_events.csv
c7ea89
index 74da53c..2ffb6f2 100644
c7ea89
--- a/src/papi_events.csv
c7ea89
+++ b/src/papi_events.csv
c7ea89
@@ -631,9 +631,11 @@ PRESET,PAPI_TLB_DM,DERIVED_ADD,DTLB_LOAD_MISSES:DEMAND_LD_MISS_CAUSES_A_WALK,DTL
c7ea89
 #PRESET,PAPI_HW_INT,NOT_DERIVED,HW_INTERRUPTS
c7ea89
 #
c7ea89
 
c7ea89
-# Intel Haswell events (and most likely also Sandy Bridge)
c7ea89
+# Intel Haswell events
c7ea89
+# Using also for Broadwell events, this is what the Linux kernel does
c7ea89
 CPU,hsw
c7ea89
 CPU,hsw_ep
c7ea89
+CPU,bdw
c7ea89
 PRESET,PAPI_TOT_CYC,NOT_DERIVED,CPU_CLK_THREAD_UNHALTED:THREAD_P
c7ea89
 PRESET,PAPI_TOT_INS,NOT_DERIVED,INST_RETIRED:ANY_P
c7ea89
 PRESET,PAPI_REF_CYC,NOT_DERIVED,CPU_CLK_THREAD_UNHALTED:REF_XCLK
c7ea89
@@ -692,7 +694,6 @@ PRESET,PAPI_L3_TCW,NOT_DERIVED,L2_RQSTS:DEMAND_RFO_MISS
c7ea89
 PRESET,PAPI_CA_SNP,NOT_DERIVED,OFFCORE_RESPONSE_0:SNP_ANY
c7ea89
 PRESET,PAPI_CA_SHR,NOT_DERIVED,OFFCORE_REQUESTS:ALL_DATA_RD
c7ea89
 PRESET,PAPI_CA_CLN,NOT_DERIVED,OFFCORE_REQUESTS:DEMAND_RFO
c7ea89
-PRESET,PAPI_CA_INV,NOT_DERIVED,OFFCORE_RESPONSE_0:SNP_HITM
c7ea89
 PRESET,PAPI_CA_ITV,NOT_DERIVED,OFFCORE_RESPONSE_0:SNP_FWD
c7ea89
 # TLB
c7ea89
 PRESET,PAPI_TLB_DM,DERIVED_ADD,DTLB_LOAD_MISSES:MISS_CAUSES_A_WALK,DTLB_STORE_MISSES:MISS_CAUSES_A_WALK
c7ea89
@@ -714,6 +715,13 @@ PRESET,PAPI_BR_NTK,NOT_DERIVED,BR_INST_RETIRED:NOT_TAKEN
c7ea89
 PRESET,PAPI_BR_MSP,NOT_DERIVED,BR_MISP_RETIRED:CONDITIONAL
c7ea89
 PRESET,PAPI_BR_PRC,DERIVED_SUB,BR_INST_RETIRED:CONDITIONAL,BR_MISP_RETIRED:CONDITIONAL
c7ea89
 PRESET,PAPI_BR_INS,NOT_DERIVED,BR_INST_RETIRED:ALL_BRANCHES
c7ea89
+
c7ea89
+CPU,hsw
c7ea89
+CPU,hsw_ep
c7ea89
+PRESET,PAPI_CA_INV,NOT_DERIVED,OFFCORE_RESPONSE_0:SNP_HITM
c7ea89
+CPU,bdw
c7ea89
+PRESET,PAPI_CA_INV,NOT_DERIVED,OFFCORE_RESPONSE_0:HITM
c7ea89
+
c7ea89
 # End of hsw list
c7ea89
 #
c7ea89
 CPU,Intel Core2
c7ea89
c7ea89
commit 71dcdb92c477bf5d2f419c03f94783098a991214
c7ea89
Merge: 36c5b5b f42eda6
c7ea89
Author: Vince Weaver <vince@deater.net>
c7ea89
Date:   Thu Jun 25 22:21:06 2015 -0400
c7ea89
c7ea89
    Merge branch 'master' of https://icl.cs.utk.edu/git/papi
c7ea89
c7ea89
commit 0829a4f51b3de92de72f6c6185b99ece15e20254
c7ea89
Author: Vince Weaver <vincent.weaver@maine.edu>
c7ea89
Date:   Fri Jun 26 11:41:42 2015 -0400
c7ea89
c7ea89
    Add future broadwell-ep support.
c7ea89
    
c7ea89
    libpfm4 doesn't support it yet, but add it for when it appears.
c7ea89
c7ea89
diff --git a/src/papi_events.csv b/src/papi_events.csv
c7ea89
index ca556c9..c38a892 100644
c7ea89
--- a/src/papi_events.csv
c7ea89
+++ b/src/papi_events.csv
c7ea89
@@ -636,6 +636,7 @@ PRESET,PAPI_TLB_DM,DERIVED_ADD,DTLB_LOAD_MISSES:DEMAND_LD_MISS_CAUSES_A_WALK,DTL
c7ea89
 CPU,hsw
c7ea89
 CPU,hsw_ep
c7ea89
 CPU,bdw
c7ea89
+CPU,bdw_ep
c7ea89
 PRESET,PAPI_TOT_CYC,NOT_DERIVED,CPU_CLK_THREAD_UNHALTED:THREAD_P
c7ea89
 PRESET,PAPI_TOT_INS,NOT_DERIVED,INST_RETIRED:ANY_P
c7ea89
 PRESET,PAPI_REF_CYC,NOT_DERIVED,CPU_CLK_THREAD_UNHALTED:REF_XCLK
c7ea89
@@ -720,6 +721,7 @@ CPU,hsw
c7ea89
 CPU,hsw_ep
c7ea89
 PRESET,PAPI_CA_INV,NOT_DERIVED,OFFCORE_RESPONSE_0:SNP_HITM
c7ea89
 CPU,bdw
c7ea89
+CPU,bdw_ep
c7ea89
 PRESET,PAPI_CA_INV,NOT_DERIVED,OFFCORE_RESPONSE_0:HITM
c7ea89
 
c7ea89
 # End of hsw list
c7ea89
c7ea89
commit a10e8331ced0173ead9982c3f78c2e5238b04d66
c7ea89
Author: Vince Weaver <vincent.weaver@maine.edu>
c7ea89
Date:   Wed Oct 21 08:58:20 2015 -0400
c7ea89
c7ea89
    papi_events: add Intel Skylake presets
c7ea89
    
c7ea89
    This just shares all of teh broadwell events with skylake.
c7ea89
    Some quick tests show that this probably works.
c7ea89
    Someone with skylake hardware should validate this at some point.
c7ea89
c7ea89
diff --git a/src/papi_events.csv b/src/papi_events.csv
c7ea89
index c38a892..2865560 100644
c7ea89
--- a/src/papi_events.csv
c7ea89
+++ b/src/papi_events.csv
c7ea89
@@ -637,6 +637,7 @@ CPU,hsw
c7ea89
 CPU,hsw_ep
c7ea89
 CPU,bdw
c7ea89
 CPU,bdw_ep
c7ea89
+CPU,skl
c7ea89
 PRESET,PAPI_TOT_CYC,NOT_DERIVED,CPU_CLK_THREAD_UNHALTED:THREAD_P
c7ea89
 PRESET,PAPI_TOT_INS,NOT_DERIVED,INST_RETIRED:ANY_P
c7ea89
 PRESET,PAPI_REF_CYC,NOT_DERIVED,CPU_CLK_THREAD_UNHALTED:REF_XCLK
c7ea89
c7ea89
commit db9c70f517aae119145ef7ec5cded597b70b0437
c7ea89
Author: Heike McCraw <mccraw@icl.utk.edu>
c7ea89
Date:   Fri Jun 17 18:11:07 2016 -0400
c7ea89
c7ea89
    Added FP (SP, DP) presets for Skylake. Corrected L1_LDM|STM, L2_DCW|TCW, PRF_DM, STL_ICY presets for Skylake.
c7ea89
c7ea89
diff --git a/src/papi_events.csv b/src/papi_events.csv
c7ea89
index 2865560..114149d 100644
c7ea89
--- a/src/papi_events.csv
c7ea89
+++ b/src/papi_events.csv
c7ea89
@@ -651,8 +651,6 @@ PRESET,PAPI_LST_INS,DERIVED_ADD,MEM_UOPS_RETIRED:ALL_LOADS,MEM_UOPS_RETIRED:ALL_
c7ea89
 PRESET,PAPI_L1_ICM,NOT_DERIVED,L2_RQSTS:ALL_CODE_RD
c7ea89
 # Added by FMB
c7ea89
 PRESET,PAPI_L1_DCM,NOT_DERIVED,L1D:REPLACEMENT
c7ea89
-PRESET,PAPI_L1_LDM,NOT_DERIVED,L2_TRANS:DEMAND_DATA_RD
c7ea89
-PRESET,PAPI_L1_STM,NOT_DERIVED,L2_TRANS:L1D_WB
c7ea89
 PRESET,PAPI_L1_TCM,DERIVED_ADD,L1D:REPLACEMENT,L2_RQSTS:ALL_CODE_RD
c7ea89
 # L2 cache
c7ea89
 PRESET,PAPI_L2_DCA,NOT_DERIVED,L2_RQSTS:ALL_DEMAND_REFERENCES
c7ea89
@@ -667,7 +665,6 @@ PRESET,PAPI_L2_ICR,NOT_DERIVED,L2_RQSTS:ALL_CODE_RD
c7ea89
 #PRESET,PAPI_L2_TCM,NOT_DERIVED,MEM_LOAD_UOPS_RETIRED:L2_MISS
c7ea89
 # Added by FMB
c7ea89
 PRESET,PAPI_L2_DCM,DERIVED_SUB,LLC_REFERENCES,L2_RQSTS:CODE_RD_MISS
c7ea89
-PRESET,PAPI_L2_DCW,NOT_DERIVED,L2_TRANS:RFO
c7ea89
 PRESET,PAPI_L2_ICA,NOT_DERIVED,L2_RQSTS:ALL_CODE_RD
c7ea89
 #PRESET,PAPI_L2_LDH,NOT_DERIVED,L2_RQSTS:DEMAND_DATA_RD_HIT
c7ea89
 PRESET,PAPI_L2_LDM,NOT_DERIVED,L2_RQSTS:DEMAND_DATA_RD_MISS
c7ea89
@@ -675,7 +672,6 @@ PRESET,PAPI_L2_STM,NOT_DERIVED,L2_RQSTS:DEMAND_RFO_MISS
c7ea89
 PRESET,PAPI_L2_TCA,DERIVED_ADD,L2_RQSTS:ALL_DEMAND_REFERENCES,L2_RQSTS:ALL_CODE_RD
c7ea89
 PRESET,PAPI_L2_TCM,NOT_DERIVED,LLC_REFERENCES
c7ea89
 PRESET,PAPI_L2_TCR,DERIVED_ADD,L2_RQSTS:ALL_DEMAND_DATA_RD,L2_RQSTS:ALL_CODE_RD
c7ea89
-PRESET,PAPI_L2_TCW,NOT_DERIVED,L2_TRANS:RFO
c7ea89
 # L3 cache
c7ea89
 #PRESET,PAPI_L3_TCA,NOT_DERIVED,LONGEST_LAT_CACHE:REFERENCE
c7ea89
 #PRESET,PAPI_L3_TCH,NOT_DERIVED,MEM_LOAD_UOPS_RETIRED:L3_HIT
c7ea89
@@ -700,12 +696,9 @@ PRESET,PAPI_CA_ITV,NOT_DERIVED,OFFCORE_RESPONSE_0:SNP_FWD
c7ea89
 # TLB
c7ea89
 PRESET,PAPI_TLB_DM,DERIVED_ADD,DTLB_LOAD_MISSES:MISS_CAUSES_A_WALK,DTLB_STORE_MISSES:MISS_CAUSES_A_WALK
c7ea89
 PRESET,PAPI_TLB_IM,NOT_DERIVED,ITLB_MISSES:MISS_CAUSES_A_WALK
c7ea89
-# Prefetcher
c7ea89
-PRESET,PAPI_PRF_DM,NOT_DERIVED,L2_RQSTS:L2_PF_MISS
c7ea89
 # Stalls
c7ea89
 PRESET,PAPI_MEM_WCY,NOT_DERIVED,RESOURCE_STALLS:SB
c7ea89
 PRESET,PAPI_RES_STL,NOT_DERIVED,RESOURCE_STALLS:ANY
c7ea89
-PRESET,PAPI_STL_ICY,NOT_DERIVED,IDQ:EMPTY
c7ea89
 PRESET,PAPI_STL_CCY,NOT_DERIVED,UOPS_RETIRED:ALL:c=1:i=1
c7ea89
 PRESET,PAPI_FUL_ICY,DERIVED_ADD,IDQ:ALL_DSB_CYCLES_4_UOPS,IDQ:ALL_MITE_CYCLES_4_UOPS
c7ea89
 PRESET,PAPI_FUL_CCY,NOT_DERIVED,UOPS_RETIRED:ALL:c=4
c7ea89
@@ -720,13 +713,41 @@ PRESET,PAPI_BR_INS,NOT_DERIVED,BR_INST_RETIRED:ALL_BRANCHES
c7ea89
 
c7ea89
 CPU,hsw
c7ea89
 CPU,hsw_ep
c7ea89
+CPU,bdw
c7ea89
+CPU,bdw_ep
c7ea89
+PRESET,PAPI_L1_LDM,NOT_DERIVED,L2_TRANS:DEMAND_DATA_RD
c7ea89
+PRESET,PAPI_L1_STM,NOT_DERIVED,L2_TRANS:L1D_WB
c7ea89
+PRESET,PAPI_L2_DCW,NOT_DERIVED,L2_TRANS:RFO
c7ea89
+PRESET,PAPI_L2_TCW,NOT_DERIVED,L2_TRANS:RFO
c7ea89
+PRESET,PAPI_PRF_DM,NOT_DERIVED,L2_RQSTS:L2_PF_MISS
c7ea89
+PRESET,PAPI_STL_ICY,NOT_DERIVED,IDQ:EMPTY
c7ea89
+
c7ea89
+CPU,hsw
c7ea89
+CPU,hsw_ep
c7ea89
 PRESET,PAPI_CA_INV,NOT_DERIVED,OFFCORE_RESPONSE_0:SNP_HITM
c7ea89
 CPU,bdw
c7ea89
 CPU,bdw_ep
c7ea89
 PRESET,PAPI_CA_INV,NOT_DERIVED,OFFCORE_RESPONSE_0:HITM
c7ea89
 
c7ea89
-# End of hsw list
c7ea89
+CPU,skl
c7ea89
+# PAPI_DP_OPS = FP_ARITH:SCALAR_DOUBLE + 2*FP_ARITH:128B_PACKED_DOUBLE + 4*256B_PACKED_DOUBLE + 8*512B_PACKED_DOUBLE
c7ea89
+PRESET,PAPI_DP_OPS,DERIVED_POSTFIX,N0|N1|2|*|+|N2|4|*|+|N3|8|*|+|,FP_ARITH:SCALAR_DOUBLE,FP_ARITH:128B_PACKED_DOUBLE,FP_ARITH:256B_PACKED_DOUBLE,FP_ARITH:512B_PACKED_DOUBLE
c7ea89
+# PAPI_SP_OPS = FP_ARITH:SCALAR_SINGLE + 4*FP_ARITH:128B_PACKED_SINGLE + 8*256B_PACKED_SINGLE + 16*512B_PACKED_SINGLE
c7ea89
+PRESET,PAPI_SP_OPS,DERIVED_POSTFIX,N0|N1|4|*|+|N2|8|*|+|N3|16|*|+|,FP_ARITH:SCALAR_SINGLE,FP_ARITH:128B_PACKED_SINGLE,FP_ARITH:256B_PACKED_SINGLE,FP_ARITH:512B_PACKED_SINGLE
c7ea89
+PRESET,PAPI_VEC_DP,DERIVED_POSTFIX,N0|N1|N2|N3|+|+|+|,FP_ARITH:SCALAR_DOUBLE,FP_ARITH:128B_PACKED_DOUBLE,FP_ARITH:256B_PACKED_DOUBLE,FP_ARITH:512B_PACKED_DOUBLE
c7ea89
+PRESET,PAPI_VEC_SP,DERIVED_POSTFIX,N0|N1|N2|N3|+|+|+|,FP_ARITH:SCALAR_SINGLE,FP_ARITH:128B_PACKED_SINGLE,FP_ARITH:256B_PACKED_SINGLE,FP_ARITH:512B_PACKED_SINGLE
c7ea89
+
c7ea89
+PRESET,PAPI_L1_LDM,NOT_DERIVED,L2_RQSTS:ALL_DEMAND_DATA_RD
c7ea89
+PRESET,PAPI_L1_STM,NOT_DERIVED,L2_RQSTS:ALL_RFO
c7ea89
+PRESET,PAPI_L2_DCW,DERIVED_ADD,L2_RQSTS:DEMAND_RFO_HIT,L2_RQSTS:RFO_HIT
c7ea89
+PRESET,PAPI_L2_TCW,DERIVED_ADD,L2_RQSTS:DEMAND_RFO_HIT,L2_RQSTS:RFO_HIT
c7ea89
+PRESET,PAPI_PRF_DM,NOT_DERIVED,L2_RQSTS:PF_MISS
c7ea89
+PRESET,PAPI_STL_ICY,NOT_DERIVED,IDQ_UOPS_NOT_DELIVERED:CYCLES_0_UOPS_DELIV_CORE
c7ea89
+
c7ea89
+# End of hsw,bdw,skl list
c7ea89
 #
c7ea89
+
c7ea89
+
c7ea89
 CPU,Intel Core2
c7ea89
 CPU,Intel Core
c7ea89
 CPU,core
c7ea89
c7ea89
commit 1c64bfc0d4aa17aa36b8ab542c841203518e6df7
c7ea89
Author: Heike Jagode <jagode@icl.utk.edu>
c7ea89
Date:   Thu Jun 23 15:26:26 2016 -0400
c7ea89
c7ea89
    Added FP (SP, DP) presets for Broadwell. NOT TESTED yet due to lack of access to bdw hardware
c7ea89
c7ea89
diff --git a/src/papi_events.csv b/src/papi_events.csv
c7ea89
index 114149d..5c04442 100644
c7ea89
--- a/src/papi_events.csv
c7ea89
+++ b/src/papi_events.csv
c7ea89
@@ -725,10 +725,18 @@ PRESET,PAPI_STL_ICY,NOT_DERIVED,IDQ:EMPTY
c7ea89
 CPU,hsw
c7ea89
 CPU,hsw_ep
c7ea89
 PRESET,PAPI_CA_INV,NOT_DERIVED,OFFCORE_RESPONSE_0:SNP_HITM
c7ea89
+
c7ea89
 CPU,bdw
c7ea89
 CPU,bdw_ep
c7ea89
 PRESET,PAPI_CA_INV,NOT_DERIVED,OFFCORE_RESPONSE_0:HITM
c7ea89
 
c7ea89
+# PAPI_DP_OPS = FP_ARITH:SCALAR_DOUBLE + 2*FP_ARITH:128B_PACKED_DOUBLE + 4*256B_PACKED_DOUBLE
c7ea89
+PRESET,PAPI_DP_OPS,DERIVED_POSTFIX,N0|N1|2|*|+|N2|4|*|+|,FP_ARITH:SCALAR_DOUBLE,FP_ARITH:128B_PACKED_DOUBLE,FP_ARITH:256B_PACKED_DOUBLE
c7ea89
+# PAPI_SP_OPS = FP_ARITH:SCALAR_SINGLE + 4*FP_ARITH:128B_PACKED_SINGLE + 8*256B_PACKED_SINGLE
c7ea89
+PRESET,PAPI_SP_OPS,DERIVED_POSTFIX,N0|N1|4|*|+|N2|8|*|+|,FP_ARITH:SCALAR_SINGLE,FP_ARITH:128B_PACKED_SINGLE,FP_ARITH:256B_PACKED_SINGLE
c7ea89
+PRESET,PAPI_VEC_DP,DERIVED_POSTFIX,N0|N1|N2|+|+|,FP_ARITH:SCALAR_DOUBLE,FP_ARITH:128B_PACKED_DOUBLE,FP_ARITH:256B_PACKED_DOUBLE
c7ea89
+PRESET,PAPI_VEC_SP,DERIVED_POSTFIX,N0|N1|N2|+|+|,FP_ARITH:SCALAR_SINGLE,FP_ARITH:128B_PACKED_SINGLE,FP_ARITH:256B_PACKED_SINGLE
c7ea89
+
c7ea89
 CPU,skl
c7ea89
 # PAPI_DP_OPS = FP_ARITH:SCALAR_DOUBLE + 2*FP_ARITH:128B_PACKED_DOUBLE + 4*256B_PACKED_DOUBLE + 8*512B_PACKED_DOUBLE
c7ea89
 PRESET,PAPI_DP_OPS,DERIVED_POSTFIX,N0|N1|2|*|+|N2|4|*|+|N3|8|*|+|,FP_ARITH:SCALAR_DOUBLE,FP_ARITH:128B_PACKED_DOUBLE,FP_ARITH:256B_PACKED_DOUBLE,FP_ARITH:512B_PACKED_DOUBLE
c7ea89
c7ea89
commit e9144b9bda355874a1cefd45285578f6c825cc31
c7ea89
Author: Heike Jagode <jagode@icl.utk.edu>
c7ea89
Date:   Thu Aug 18 16:34:54 2016 -0400
c7ea89
c7ea89
    Added preset definitions for KNL.
c7ea89
c7ea89
diff --git a/src/papi_events.csv b/src/papi_events.csv
c7ea89
index 2d2eca0..e3e80a4 100644
c7ea89
--- a/src/papi_events.csv
c7ea89
+++ b/src/papi_events.csv
c7ea89
@@ -754,7 +754,42 @@ PRESET,PAPI_STL_ICY,NOT_DERIVED,IDQ_UOPS_NOT_DELIVERED:CYCLES_0_UOPS_DELIV_CORE
c7ea89
 
c7ea89
 # End of hsw,bdw,skl list
c7ea89
 #
c7ea89
-
c7ea89
+#
c7ea89
+# Intel MIC / Xeon-Phi / Knights Landing
c7ea89
+#
c7ea89
+CPU,knl
c7ea89
+PRESET,PAPI_TOT_INS,NOT_DERIVED,INSTRUCTIONS_RETIRED
c7ea89
+PRESET,PAPI_TOT_CYC,NOT_DERIVED,UNHALTED_CORE_CYCLES
c7ea89
+PRESET,PAPI_REF_CYC,NOT_DERIVED,UNHALTED_REFERENCE_CYCLES
c7ea89
+PRESET,PAPI_L1_ICM,NOT_DERIVED,ICACHE:MISSES
c7ea89
+PRESET,PAPI_L1_ICA,NOT_DERIVED,ICACHE:ACCESSES
c7ea89
+PRESET,PAPI_L1_ICH,NOT_DERIVED,ICACHE:HIT
c7ea89
+#
c7ea89
+PRESET,PAPI_L1_DCA,DERIVED_ADD,MEM_UOPS_RETIRED:ANY_LD,MEM_UOPS_RETIRED:ANY_ST
c7ea89
+PRESET,PAPI_L1_DCM,NOT_DERIVED,MEM_UOPS_RETIRED:LD_DCU_MISS
c7ea89
+PRESET,PAPI_L1_TCM,DERIVED_ADD,MEM_UOPS_RETIRED:LD_DCU_MISS,ICACHE:MISSES
c7ea89
+PRESET,PAPI_L1_LDM,NOT_DERIVED,MEM_UOPS_RETIRED:LD_DCU_MISS
c7ea89
+#
c7ea89
+PRESET,PAPI_L2_TCA,NOT_DERIVED,LLC_REFERENCES
c7ea89
+PRESET,PAPI_L2_TCM,NOT_DERIVED,LLC_MISSES
c7ea89
+PRESET,PAPI_L2_TCH,DERIVED_SUB,LLC_REFERENCES,LLC_MISSES
c7ea89
+PRESET,PAPI_L2_LDM,NOT_DERIVED,MEM_UOPS_RETIRED:LD_L2_MISS
c7ea89
+PRESET,PAPI_LD_INS,NOT_DERIVED,MEM_UOPS_RETIRED:ANY_LD
c7ea89
+PRESET,PAPI_SR_INS,NOT_DERIVED,MEM_UOPS_RETIRED:ANY_ST
c7ea89
+PRESET,PAPI_LST_INS,DERIVED_ADD,MEM_UOPS_RETIRED:ANY_LD,MEM_UOPS_RETIRED:ANY_ST
c7ea89
+#
c7ea89
+PRESET,PAPI_TLB_DM,NOT_DERIVED,MEM_UOPS_RETIRED:LD_UTLB_MISS
c7ea89
+#
c7ea89
+PRESET,PAPI_BR_INS,NOT_DERIVED,BRANCH_INSTRUCTIONS_RETIRED
c7ea89
+PRESET,PAPI_BR_MSP,NOT_DERIVED,MISPREDICTED_BRANCH_RETIRED
c7ea89
+PRESET,PAPI_BR_CN,NOT_DERIVED,BR_INST_RETIRED:JCC
c7ea89
+PRESET,PAPI_BR_UCN,DERIVED_SUB,BRANCH_INSTRUCTIONS_RETIRED,BR_INST_RETIRED:JCC
c7ea89
+PRESET,PAPI_BR_TKN,NOT_DERIVED,BR_INST_RETIRED:TAKEN_JCC
c7ea89
+PRESET,PAPI_BR_NTK,DERIVED_SUB,BR_INST_RETIRED:JCC,BR_INST_RETIRED:TAKEN_JCC
c7ea89
+#
c7ea89
+PRESET,PAPI_RES_STL,NOT_DERIVED,RS_FULL_STALL:ANY
c7ea89
+PRESET,PAPI_STL_ICY,NOT_DERIVED,NO_ALLOC_CYCLES:ANY
c7ea89
+#
c7ea89
 
c7ea89
 CPU,Intel Core2
c7ea89
 CPU,Intel Core