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