From 8a8cb7bf798b29050906f02dd1931f2ae27e4ac1 Mon Sep 17 00:00:00 2001 From: jonesz Date: Tue, 1 Oct 2024 12:01:46 -0700 Subject: [PATCH] Update json_events included in BuiltinMetricsLight Summary: Update json_events to include metrics in BuiltinMetricsLight that are used by Dynolog. Differential Revision: D62405387 --- .../generated/intel/broadwell_core.cpp | 3 +- .../generated/intel/broadwellde_core.cpp | 3 +- .../generated/intel/broadwellde_uncore.cpp | 6 ++-- .../generated/intel/broadwellx_core.cpp | 3 +- .../generated/intel/broadwellx_uncore.cpp | 6 ++-- .../generated/intel/cascadelakex_uncore.cpp | 21 ++++-------- .../generated/intel/goldmont_core.cpp | 3 +- .../generated/intel/haswellx_core.cpp | 3 +- .../generated/intel/haswellx_uncore.cpp | 6 ++-- .../generated/intel/icelakex_uncore.cpp | 33 +++++++------------ .../intel/icelakex_uncore_experimental.cpp | 6 ++-- .../generated/intel/ivybridge_core.cpp | 3 +- .../generated/intel/knightslanding_core.cpp | 3 +- .../generated/intel/knightslanding_uncore.cpp | 6 ++-- .../generated/intel/sandybridge_core.cpp | 3 +- .../generated/intel/sapphirerapids_uncore.cpp | 33 +++++++------------ .../sapphirerapids_uncore_experimental.cpp | 6 ++-- .../generated/intel/sierraforest_core.cpp | 9 ++--- .../generated/intel/sierraforest_uncore.cpp | 30 ++++++----------- .../sierraforest_uncore_experimental.cpp | 3 +- .../generated/intel/skylakex_uncore.cpp | 21 ++++-------- .../generated/intel/snowridgex_core.cpp | 3 +- .../generated/intel/snowridgex_uncore.cpp | 25 ++++++-------- 23 files changed, 81 insertions(+), 157 deletions(-) diff --git a/hbt/src/perf_event/json_events/generated/intel/broadwell_core.cpp b/hbt/src/perf_event/json_events/generated/intel/broadwell_core.cpp index e401e4a3..dd15f860 100644 --- a/hbt/src/perf_event/json_events/generated/intel/broadwell_core.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/broadwell_core.cpp @@ -1849,7 +1849,7 @@ Note: A prefetch promoted to Demand is counted from the promotion point.)", )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event ICACHE.MISSES is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::cpu, "ICACHE.MISSES", @@ -1862,7 +1862,6 @@ Note: A prefetch promoted to Demand is counted from the promotion point.)", EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS // Event ICACHE.IFDATA_STALL is allowlisted pmu_manager.addEvent(std::make_shared( diff --git a/hbt/src/perf_event/json_events/generated/intel/broadwellde_core.cpp b/hbt/src/perf_event/json_events/generated/intel/broadwellde_core.cpp index d09d1074..4c9a3f3c 100644 --- a/hbt/src/perf_event/json_events/generated/intel/broadwellde_core.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/broadwellde_core.cpp @@ -1848,7 +1848,7 @@ Note: A prefetch promoted to Demand is counted from the promotion point.)", )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event ICACHE.MISSES is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::cpu, "ICACHE.MISSES", @@ -1861,7 +1861,6 @@ Note: A prefetch promoted to Demand is counted from the promotion point.)", EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS // Event ICACHE.IFDATA_STALL is allowlisted pmu_manager.addEvent(std::make_shared( diff --git a/hbt/src/perf_event/json_events/generated/intel/broadwellde_uncore.cpp b/hbt/src/perf_event/json_events/generated/intel/broadwellde_uncore.cpp index 3052ea10..59dd50ed 100644 --- a/hbt/src/perf_event/json_events/generated/intel/broadwellde_uncore.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/broadwellde_uncore.cpp @@ -8223,7 +8223,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_M_CAS_COUNT.RD is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_imc, "UNC_M_CAS_COUNT.RD", @@ -8235,7 +8235,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -8265,7 +8264,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_M_CAS_COUNT.WR is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_imc, "UNC_M_CAS_COUNT.WR", @@ -8277,7 +8276,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( diff --git a/hbt/src/perf_event/json_events/generated/intel/broadwellx_core.cpp b/hbt/src/perf_event/json_events/generated/intel/broadwellx_core.cpp index f7945b4d..efe66e4e 100644 --- a/hbt/src/perf_event/json_events/generated/intel/broadwellx_core.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/broadwellx_core.cpp @@ -1848,7 +1848,7 @@ Note: A prefetch promoted to Demand is counted from the promotion point.)", )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event ICACHE.MISSES is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::cpu, "ICACHE.MISSES", @@ -1861,7 +1861,6 @@ Note: A prefetch promoted to Demand is counted from the promotion point.)", EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS // Event ICACHE.IFDATA_STALL is allowlisted pmu_manager.addEvent(std::make_shared( diff --git a/hbt/src/perf_event/json_events/generated/intel/broadwellx_uncore.cpp b/hbt/src/perf_event/json_events/generated/intel/broadwellx_uncore.cpp index 4bea9098..53485823 100644 --- a/hbt/src/perf_event/json_events/generated/intel/broadwellx_uncore.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/broadwellx_uncore.cpp @@ -11415,7 +11415,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_M_CAS_COUNT.RD is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_imc, "UNC_M_CAS_COUNT.RD", @@ -11427,7 +11427,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -11457,7 +11456,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_M_CAS_COUNT.WR is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_imc, "UNC_M_CAS_COUNT.WR", @@ -11469,7 +11468,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( diff --git a/hbt/src/perf_event/json_events/generated/intel/cascadelakex_uncore.cpp b/hbt/src/perf_event/json_events/generated/intel/cascadelakex_uncore.cpp index af239e64..0f3d7850 100644 --- a/hbt/src/perf_event/json_events/generated/intel/cascadelakex_uncore.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/cascadelakex_uncore.cpp @@ -650,7 +650,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_M_CAS_COUNT.RD is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_imc, "UNC_M_CAS_COUNT.RD", @@ -663,7 +663,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -680,7 +679,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_M_CAS_COUNT.WR is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_imc, "UNC_M_CAS_COUNT.WR", @@ -693,7 +692,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -1265,7 +1263,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_CLOCKTICKS is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_CLOCKTICKS", @@ -1278,7 +1276,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -1445,7 +1442,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_REQUESTS.READS_LOCAL is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_REQUESTS.READS_LOCAL", @@ -1458,9 +1455,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_REQUESTS.READS_REMOTE is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_REQUESTS.READS_REMOTE", @@ -1473,9 +1469,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_REQUESTS.WRITES_LOCAL is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_REQUESTS.WRITES_LOCAL", @@ -1488,9 +1483,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_REQUESTS.WRITES_REMOTE is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_REQUESTS.WRITES_REMOTE", @@ -1503,7 +1497,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( diff --git a/hbt/src/perf_event/json_events/generated/intel/goldmont_core.cpp b/hbt/src/perf_event/json_events/generated/intel/goldmont_core.cpp index f6e199ff..e318a46c 100644 --- a/hbt/src/perf_event/json_events/generated/intel/goldmont_core.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/goldmont_core.cpp @@ -325,7 +325,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { R"(0)")); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event ICACHE.MISSES is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::cpu, "ICACHE.MISSES", @@ -337,7 +337,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { std::nullopt, // ScaleUnit EventDef::IntelFeatures{}, R"(0)")); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( diff --git a/hbt/src/perf_event/json_events/generated/intel/haswellx_core.cpp b/hbt/src/perf_event/json_events/generated/intel/haswellx_core.cpp index 225efb5d..4501817e 100644 --- a/hbt/src/perf_event/json_events/generated/intel/haswellx_core.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/haswellx_core.cpp @@ -1886,7 +1886,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event ICACHE.MISSES is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::cpu, "ICACHE.MISSES", @@ -1899,7 +1899,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( diff --git a/hbt/src/perf_event/json_events/generated/intel/haswellx_uncore.cpp b/hbt/src/perf_event/json_events/generated/intel/haswellx_uncore.cpp index 412641f0..f3de19cc 100644 --- a/hbt/src/perf_event/json_events/generated/intel/haswellx_uncore.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/haswellx_uncore.cpp @@ -13375,7 +13375,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_M_CAS_COUNT.RD is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_imc, "UNC_M_CAS_COUNT.RD", @@ -13387,7 +13387,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -13417,7 +13416,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_M_CAS_COUNT.WR is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_imc, "UNC_M_CAS_COUNT.WR", @@ -13429,7 +13428,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( diff --git a/hbt/src/perf_event/json_events/generated/intel/icelakex_uncore.cpp b/hbt/src/perf_event/json_events/generated/intel/icelakex_uncore.cpp index 3fc7ad51..419256da 100644 --- a/hbt/src/perf_event/json_events/generated/intel/icelakex_uncore.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/icelakex_uncore.cpp @@ -76,7 +76,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_REQUESTS.READS_LOCAL is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_REQUESTS.READS_LOCAL", @@ -88,9 +88,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_REQUESTS.READS_REMOTE is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_REQUESTS.READS_REMOTE", @@ -102,9 +101,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_REQUESTS.WRITES_LOCAL is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_REQUESTS.WRITES_LOCAL", @@ -116,9 +114,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_REQUESTS.WRITES_REMOTE is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_REQUESTS.WRITES_REMOTE", @@ -130,9 +127,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_CLOCKTICKS is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_CLOCKTICKS", @@ -144,7 +140,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -1308,7 +1303,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_M_CAS_COUNT.RD is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_imc, "UNC_M_CAS_COUNT.RD", @@ -1320,9 +1315,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_M_CAS_COUNT.WR is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_imc, "UNC_M_CAS_COUNT.WR", @@ -1334,7 +1328,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -2820,7 +2813,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_TOR_OCCUPANCY.IA_MISS_DRD_LOCAL is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_TOR_OCCUPANCY.IA_MISS_DRD_LOCAL", @@ -2832,9 +2825,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_TOR_OCCUPANCY.IA_MISS_DRD_REMOTE is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_TOR_OCCUPANCY.IA_MISS_DRD_REMOTE", @@ -2846,9 +2838,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_TOR_INSERTS.IA_MISS_DRD_LOCAL is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_TOR_INSERTS.IA_MISS_DRD_LOCAL", @@ -2860,9 +2851,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_TOR_INSERTS.IA_MISS_DRD_REMOTE is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_TOR_INSERTS.IA_MISS_DRD_REMOTE", @@ -2874,7 +2864,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( diff --git a/hbt/src/perf_event/json_events/generated/intel/icelakex_uncore_experimental.cpp b/hbt/src/perf_event/json_events/generated/intel/icelakex_uncore_experimental.cpp index 78baefea..0efc4a1d 100644 --- a/hbt/src/perf_event/json_events/generated/intel/icelakex_uncore_experimental.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/icelakex_uncore_experimental.cpp @@ -45352,7 +45352,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_TOR_INSERTS.IA_MISS_DRD_OPT is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_TOR_INSERTS.IA_MISS_DRD_OPT", @@ -45364,7 +45364,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -45478,7 +45477,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_TOR_OCCUPANCY.IA_MISS_DRD_OPT is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_TOR_OCCUPANCY.IA_MISS_DRD_OPT", @@ -45490,7 +45489,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( diff --git a/hbt/src/perf_event/json_events/generated/intel/ivybridge_core.cpp b/hbt/src/perf_event/json_events/generated/intel/ivybridge_core.cpp index 2623927d..ca1f0579 100644 --- a/hbt/src/perf_event/json_events/generated/intel/ivybridge_core.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/ivybridge_core.cpp @@ -1607,7 +1607,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { R"(0)")); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event ICACHE.MISSES is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::cpu, "ICACHE.MISSES", @@ -1619,7 +1619,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { std::nullopt, // ScaleUnit EventDef::IntelFeatures{}, R"(0)")); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( diff --git a/hbt/src/perf_event/json_events/generated/intel/knightslanding_core.cpp b/hbt/src/perf_event/json_events/generated/intel/knightslanding_core.cpp index ea380630..9e4f4229 100644 --- a/hbt/src/perf_event/json_events/generated/intel/knightslanding_core.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/knightslanding_core.cpp @@ -526,7 +526,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event ICACHE.MISSES is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::cpu, "ICACHE.MISSES", @@ -539,7 +539,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( diff --git a/hbt/src/perf_event/json_events/generated/intel/knightslanding_uncore.cpp b/hbt/src/perf_event/json_events/generated/intel/knightslanding_uncore.cpp index cffadf2e..2967c3ca 100644 --- a/hbt/src/perf_event/json_events/generated/intel/knightslanding_uncore.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/knightslanding_uncore.cpp @@ -6054,7 +6054,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_M_CAS_COUNT.RD is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_imc_dclk, "UNC_M_CAS_COUNT.RD", @@ -6066,9 +6066,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_M_CAS_COUNT.WR is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_imc_dclk, "UNC_M_CAS_COUNT.WR", @@ -6080,7 +6079,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( diff --git a/hbt/src/perf_event/json_events/generated/intel/sandybridge_core.cpp b/hbt/src/perf_event/json_events/generated/intel/sandybridge_core.cpp index 1af89882..5236d2b6 100644 --- a/hbt/src/perf_event/json_events/generated/intel/sandybridge_core.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/sandybridge_core.cpp @@ -1733,7 +1733,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { R"(0)")); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event ICACHE.MISSES is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::cpu, "ICACHE.MISSES", @@ -1745,7 +1745,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { std::nullopt, // ScaleUnit EventDef::IntelFeatures{}, R"(0)")); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( diff --git a/hbt/src/perf_event/json_events/generated/intel/sapphirerapids_uncore.cpp b/hbt/src/perf_event/json_events/generated/intel/sapphirerapids_uncore.cpp index 61ab1f4e..f7594022 100644 --- a/hbt/src/perf_event/json_events/generated/intel/sapphirerapids_uncore.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/sapphirerapids_uncore.cpp @@ -1167,7 +1167,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_M_CAS_COUNT.RD is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_imc, "UNC_M_CAS_COUNT.RD", @@ -1179,9 +1179,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_M_CAS_COUNT.WR is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_imc, "UNC_M_CAS_COUNT.WR", @@ -1193,7 +1192,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -1643,7 +1641,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_REQUESTS.READS_LOCAL is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_REQUESTS.READS_LOCAL", @@ -1655,9 +1653,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_REQUESTS.READS_REMOTE is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_REQUESTS.READS_REMOTE", @@ -1669,9 +1666,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_REQUESTS.WRITES_LOCAL is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_REQUESTS.WRITES_LOCAL", @@ -1683,9 +1679,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_REQUESTS.WRITES_REMOTE is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_REQUESTS.WRITES_REMOTE", @@ -1697,7 +1692,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -1797,7 +1791,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_CLOCKTICKS is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_CLOCKTICKS", @@ -1809,7 +1803,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -2259,7 +2252,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_TOR_INSERTS.IA_MISS_DRD_LOCAL is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_TOR_INSERTS.IA_MISS_DRD_LOCAL", @@ -2271,9 +2264,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_TOR_INSERTS.IA_MISS_DRD_REMOTE is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_TOR_INSERTS.IA_MISS_DRD_REMOTE", @@ -2285,7 +2277,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -2791,7 +2782,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_TOR_OCCUPANCY.IA_MISS_DRD_LOCAL is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_TOR_OCCUPANCY.IA_MISS_DRD_LOCAL", @@ -2803,9 +2794,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_TOR_OCCUPANCY.IA_MISS_DRD_REMOTE is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_TOR_OCCUPANCY.IA_MISS_DRD_REMOTE", @@ -2817,7 +2807,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( diff --git a/hbt/src/perf_event/json_events/generated/intel/sapphirerapids_uncore_experimental.cpp b/hbt/src/perf_event/json_events/generated/intel/sapphirerapids_uncore_experimental.cpp index dfc72acf..98de9b2e 100644 --- a/hbt/src/perf_event/json_events/generated/intel/sapphirerapids_uncore_experimental.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/sapphirerapids_uncore_experimental.cpp @@ -8308,7 +8308,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_TOR_INSERTS.IA_MISS_DRD_OPT is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_TOR_INSERTS.IA_MISS_DRD_OPT", @@ -8320,7 +8320,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -8840,7 +8839,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_TOR_OCCUPANCY.IA_MISS_DRD_OPT is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_TOR_OCCUPANCY.IA_MISS_DRD_OPT", @@ -8852,7 +8851,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( diff --git a/hbt/src/perf_event/json_events/generated/intel/sierraforest_core.cpp b/hbt/src/perf_event/json_events/generated/intel/sierraforest_core.cpp index 328606f6..6e7cbf82 100644 --- a/hbt/src/perf_event/json_events/generated/intel/sierraforest_core.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/sierraforest_core.cpp @@ -1111,7 +1111,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event ICACHE.MISSES is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::cpu, "ICACHE.MISSES", @@ -1124,7 +1124,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -1647,7 +1646,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event FP_FLOPS_RETIRED.FP64 is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::cpu, "FP_FLOPS_RETIRED.FP64", @@ -1660,9 +1659,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{.pebs = 1}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event FP_FLOPS_RETIRED.FP32 is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::cpu, "FP_FLOPS_RETIRED.FP32", @@ -1675,7 +1673,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{.pebs = 1}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( diff --git a/hbt/src/perf_event/json_events/generated/intel/sierraforest_uncore.cpp b/hbt/src/perf_event/json_events/generated/intel/sierraforest_uncore.cpp index 308f6faa..5a3f74c3 100644 --- a/hbt/src/perf_event/json_events/generated/intel/sierraforest_uncore.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/sierraforest_uncore.cpp @@ -20,7 +20,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { - Arch: x86, Model: SRF id: 175 */ -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_CLOCKTICKS is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_CLOCKTICKS", @@ -32,7 +32,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -230,7 +229,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_TOR_INSERTS.IA_MISS_DRD_OPT is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_TOR_INSERTS.IA_MISS_DRD_OPT", @@ -242,7 +241,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -2190,7 +2188,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_REQUESTS.READS_LOCAL is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_REQUESTS.READS_LOCAL", @@ -2202,9 +2200,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_REQUESTS.READS_REMOTE is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_REQUESTS.READS_REMOTE", @@ -2216,9 +2213,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_REQUESTS.WRITES_LOCAL is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_REQUESTS.WRITES_LOCAL", @@ -2230,9 +2226,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_REQUESTS.WRITES_REMOTE is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_REQUESTS.WRITES_REMOTE", @@ -2244,7 +2239,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -2400,7 +2394,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_M_CAS_COUNT_SCH0.RD is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_imc, "UNC_M_CAS_COUNT_SCH0.RD", @@ -2412,9 +2406,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_M_CAS_COUNT_SCH0.WR is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_imc, "UNC_M_CAS_COUNT_SCH0.WR", @@ -2426,7 +2419,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -2470,7 +2462,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_M_CAS_COUNT_SCH1.RD is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_imc, "UNC_M_CAS_COUNT_SCH1.RD", @@ -2482,9 +2474,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_M_CAS_COUNT_SCH1.WR is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_imc, "UNC_M_CAS_COUNT_SCH1.WR", @@ -2496,7 +2487,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( diff --git a/hbt/src/perf_event/json_events/generated/intel/sierraforest_uncore_experimental.cpp b/hbt/src/perf_event/json_events/generated/intel/sierraforest_uncore_experimental.cpp index e56eea7e..9b6110b3 100644 --- a/hbt/src/perf_event/json_events/generated/intel/sierraforest_uncore_experimental.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/sierraforest_uncore_experimental.cpp @@ -1084,7 +1084,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_TOR_OCCUPANCY.IA_MISS_DRD_OPT is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_TOR_OCCUPANCY.IA_MISS_DRD_OPT", @@ -1096,7 +1096,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( diff --git a/hbt/src/perf_event/json_events/generated/intel/skylakex_uncore.cpp b/hbt/src/perf_event/json_events/generated/intel/skylakex_uncore.cpp index fb23a14f..7748ae5e 100644 --- a/hbt/src/perf_event/json_events/generated/intel/skylakex_uncore.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/skylakex_uncore.cpp @@ -649,7 +649,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_M_CAS_COUNT.RD is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_imc, "UNC_M_CAS_COUNT.RD", @@ -662,7 +662,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -679,7 +678,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_M_CAS_COUNT.WR is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_imc, "UNC_M_CAS_COUNT.WR", @@ -692,7 +691,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -1219,7 +1217,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_CLOCKTICKS is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_CLOCKTICKS", @@ -1232,7 +1230,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -1399,7 +1396,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_REQUESTS.READS_LOCAL is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_REQUESTS.READS_LOCAL", @@ -1412,9 +1409,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_REQUESTS.READS_REMOTE is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_REQUESTS.READS_REMOTE", @@ -1427,9 +1423,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_REQUESTS.WRITES_LOCAL is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_REQUESTS.WRITES_LOCAL", @@ -1442,9 +1437,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_REQUESTS.WRITES_REMOTE is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_REQUESTS.WRITES_REMOTE", @@ -1457,7 +1451,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( diff --git a/hbt/src/perf_event/json_events/generated/intel/snowridgex_core.cpp b/hbt/src/perf_event/json_events/generated/intel/snowridgex_core.cpp index a4b23321..0e6c43c9 100644 --- a/hbt/src/perf_event/json_events/generated/intel/snowridgex_core.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/snowridgex_core.cpp @@ -1145,7 +1145,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event ICACHE.MISSES is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::cpu, "ICACHE.MISSES", @@ -1158,7 +1158,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( diff --git a/hbt/src/perf_event/json_events/generated/intel/snowridgex_uncore.cpp b/hbt/src/perf_event/json_events/generated/intel/snowridgex_uncore.cpp index a9481b7d..d3323734 100644 --- a/hbt/src/perf_event/json_events/generated/intel/snowridgex_uncore.cpp +++ b/hbt/src/perf_event/json_events/generated/intel/snowridgex_uncore.cpp @@ -13,13 +13,13 @@ namespace facebook::hbt::perf_event::generated { namespace snowridgex_uncore { void addEvents(PmuDeviceManager& pmu_manager) { -/* - Events from snowridgex_uncore.json (207 events). + /* + Events from snowridgex_uncore.json (207 events). - Supported SKUs: - - Arch: x86, Model: SNR id: 134 -*/ -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + Supported SKUs: + - Arch: x86, Model: SNR id: 134 + */ + // Event UNC_CHA_CLOCKTICKS is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_CLOCKTICKS", @@ -31,7 +31,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -1055,7 +1054,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_M_CAS_COUNT.RD is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_imc, "UNC_M_CAS_COUNT.RD", @@ -1067,9 +1066,8 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_M_CAS_COUNT.WR is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_imc, "UNC_M_CAS_COUNT.WR", @@ -1081,7 +1079,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -2063,7 +2060,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_TOR_INSERTS.IA_MISS_DRD_OPT is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_TOR_INSERTS.IA_MISS_DRD_OPT", @@ -2075,7 +2072,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared( @@ -2133,7 +2129,7 @@ void addEvents(PmuDeviceManager& pmu_manager) { )); #endif // HBT_ADD_ALL_GENERATED_EVENTS -#ifdef HBT_ADD_ALL_GENERATED_EVENTS + // Event UNC_CHA_TOR_OCCUPANCY.IA_MISS_DRD_OPT is allowlisted pmu_manager.addEvent(std::make_shared( PmuType::uncore_cha, "UNC_CHA_TOR_OCCUPANCY.IA_MISS_DRD_OPT", @@ -2145,7 +2141,6 @@ void addEvents(PmuDeviceManager& pmu_manager) { EventDef::IntelFeatures{}, std::nullopt // Errata )); -#endif // HBT_ADD_ALL_GENERATED_EVENTS #ifdef HBT_ADD_ALL_GENERATED_EVENTS pmu_manager.addEvent(std::make_shared(