Skip to content

Commit 60043e6

Browse files
ilumsdenilumsden
committed
Adds some logging and makes some formatting fixes
1 parent 15a9ca4 commit 60043e6

File tree

2 files changed

+79
-76
lines changed

2 files changed

+79
-76
lines changed

‎src/caliper/ConfigManager.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -1413,6 +1413,7 @@ struct ConfigManager::ConfigManagerImpl {
14131413
#ifdef CALIPER_HAVE_PAPI
14141414
#ifdef CALIPER_HAVE_ARCH
14151415
std::string cali_arch = CALIPER_HAVE_ARCH;
1416+
Log(0).stream() << "ConfigManager: detected architecture " << cali_arch << std::endl;
14161417
if (cali_arch == "sapphirerapids") {
14171418
builtin_option_specs_list.push_back(builtin_papi_spr_option_specs);
14181419
} else if (cali_arch == "skylake" || cali_arch == "skylake_avx512" || cali_arch == "cascadelake") {

‎src/caliper/controllers/controllers.cpp

+78-76
Original file line numberDiff line numberDiff line change
@@ -1261,88 +1261,90 @@ const char* builtin_papi_skl_option_specs = R"json(
12611261
}
12621262
]
12631263
},
1264-
{
1265-
"name" : "topdown-counters.toplevel",
1266-
"description" : "Raw counter values for Intel top-down analysis (top level)",
1267-
"type" : "bool",
1268-
"category" : "metric",
1269-
"services" : [ "papi" ],
1270-
"config" :
1271-
{
1272-
"CALI_PAPI_COUNTERS":
1273-
"IDQ_UOPS_NOT_DELIVERED:CORE,UOPS_ISSUED:ANY,UOPS_RETIRED:RETIRE_SLOTS,INT_MISC:RECOVERY_CYCLES,CPU_CLK_UNHALTED:THREAD"
1274-
},
1275-
"query" :
1264+
{
1265+
"name" : "topdown-counters.toplevel",
1266+
"description" : "Raw counter values for Intel top-down analysis (top level)",
1267+
"type" : "bool",
1268+
"category" : "metric",
1269+
"services" : [ "papi" ],
1270+
"config" :
1271+
{
1272+
"CALI_PAPI_COUNTERS":
1273+
"IDQ_UOPS_NOT_DELIVERED:CORE,UOPS_ISSUED:ANY,UOPS_RETIRED:RETIRE_SLOTS,INT_MISC:RECOVERY_CYCLES,CPU_CLK_UNHALTED:THREAD",
1274+
"CALI_PAPI_ENABLE_MULTIPLEXING": "true"
1275+
},
1276+
"query" :
1277+
[
1278+
{ "level": "local", "select":
12761279
[
1277-
{ "level": "local", "select":
1278-
[
1279-
"inclusive_sum(sum#IDQ_UOPS_NOT_DELIVERED:CORE) as idq_uops_not_delivered",
1280-
"inclusive_sum(sum#UOPS_ISSUED:ANY) as uops_issued",
1281-
"inclusive_sum(sum#UOPS_RETIRED:RETIRE_SLOTS) as uops_retired_retire_slots",
1282-
"inclusive_sum(sum#INT_MISC:RECOVERY_CYCLES) as int_misc_recovery_cycles",
1283-
"inclusive_sum(sum#CPU_CLK_UNHALTED:THREAD) as cpu_clock_unhalted_thread"
1284-
]
1285-
},
1286-
{ "level": "cross", "select":
1287-
[
1288-
"sum(inclusive#sum#IDQ_UOPS_NOT_DELIVERED:CORE) as idq_uops_not_delivered",
1289-
"sum(inclusive#sum#UOPS_ISSUED:ANY) as uops_issued",
1290-
"sum(inclusive#sum#UOPS_RETIRED:RETIRE_SLOTS) as uops_retired_retire_slots",
1291-
"sum(inclusive#sum#INT_MISC:RECOVERY_CYCLES) as int_misc_recovery_cycles",
1292-
"sum(inclusive#sum#CPU_CLK_UNHALTED:THREAD) as cpu_clock_unhalted_thread"
1293-
]
1294-
}
1280+
"inclusive_sum(sum#IDQ_UOPS_NOT_DELIVERED:CORE) as idq_uops_not_delivered",
1281+
"inclusive_sum(sum#UOPS_ISSUED:ANY) as uops_issued",
1282+
"inclusive_sum(sum#UOPS_RETIRED:RETIRE_SLOTS) as uops_retired_retire_slots",
1283+
"inclusive_sum(sum#INT_MISC:RECOVERY_CYCLES) as int_misc_recovery_cycles",
1284+
"inclusive_sum(sum#CPU_CLK_UNHALTED:THREAD) as cpu_clock_unhalted_thread"
12951285
]
12961286
},
1297-
{
1298-
"name" : "topdown-counters.all",
1299-
"description" : "Raw counter values for Intel top-down analysis (all levels)",
1300-
"type" : "bool",
1301-
"category" : "metric",
1302-
"services" : [ "papi" ],
1303-
"config" :
1304-
{
1305-
"CALI_PAPI_COUNTERS":
1306-
"IDQ_UOPS_NOT_DELIVERED:CORE,UOPS_ISSUED:ANY,UOPS_RETIRED:RETIRE_SLOTS,INT_MISC:RECOVERY_CYCLES,CPU_CLK_UNHALTED:THREAD"
1307-
},
1308-
"query" :
1287+
{ "level": "cross", "select":
13091288
[
1310-
{ "level": "local", "select":
1311-
[
1312-
"inclusive_sum(sum#IDQ_UOPS_NOT_DELIVERED:CORE) as idq_uops_not_delivered",
1313-
"inclusive_sum(sum#UOPS_ISSUED:ANY) as uops_issued",
1314-
"inclusive_sum(sum#UOPS_RETIRED:RETIRE_SLOTS) as uops_retired_retire_slots",
1315-
"inclusive_sum(sum#INT_MISC:RECOVERY_CYCLES) as int_misc_recovery_cycles",
1316-
"inclusive_sum(sum#CPU_CLK_UNHALTED:THREAD) as cpu_clock_unhalted_thread",
1317-
"inclusive_sum(sum#IDQ_UOPS_NOT_DELIVERED:CYCLES_0_UOPS_DELIV_CORE) as idq_uops_not_delivered_cycles_0_uops_deliv_core",
1318-
"inclusive_sum(sum#BR_MISP_RETIRED:ALL_BRANCHES) as br_misp_retired_all_branches",
1319-
"inclusive_sum(sum#MACHINE_CLEARS:COUNT) as machine_clears_count",
1320-
"inclusive_sum(sum#CYCLE_ACTIVITY:STALLS_TOTAL) as cycle_activity_stalls_total",
1321-
"inclusive_sum(sum#EXE_ACTIVITY:1_PORTS_UTIL) as exe_activity_1_ports_util",
1322-
"inclusive_sum(sum#EXE_ACTIVITY:2_PORTS_UTIL) as exe_activity_2_ports_util",
1323-
"inclusive_sum(sum#UOPS_RETIRED:MACRO_FUSED) as uops_retired_macro_fused",
1324-
"inclusive_sum(sum#INST_RETIRED:ANY) as inst_retired_any"
1325-
]
1326-
},
1327-
{ "level": "cross", "select":
1328-
[
1329-
"sum(inclusive#sum#IDQ_UOPS_NOT_DELIVERED:CORE) as idq_uops_not_delivered",
1330-
"sum(inclusive#sum#UOPS_ISSUED:ANY) as uops_issued",
1331-
"sum(inclusive#sum#UOPS_RETIRED:RETIRE_SLOTS) as uops_retired_retire_slots",
1332-
"sum(inclusive#sum#INT_MISC:RECOVERY_CYCLES) as int_misc_recovery_cycles",
1333-
"sum(inclusive#sum#CPU_CLK_UNHALTED:THREAD) as cpu_clock_unhalted_thread",
1334-
"sum(inclusive#sum#IDQ_UOPS_NOT_DELIVERED:CYCLES_0_UOPS_DELIV_CORE) as idq_uops_not_delivered_cycles_0_uops_deliv_core",
1335-
"sum(inclusive#sum#BR_MISP_RETIRED:ALL_BRANCHES) as br_misp_retired_all_branches",
1336-
"sum(inclusive#sum#MACHINE_CLEARS:COUNT) as machine_clears_count",
1337-
"sum(inclusive#sum#CYCLE_ACTIVITY:STALLS_TOTAL) as cycle_activity_stalls_total",
1338-
"sum(inclusive#sum#EXE_ACTIVITY:1_PORTS_UTIL) as exe_activity_1_ports_util",
1339-
"sum(inclusive#sum#EXE_ACTIVITY:2_PORTS_UTIL) as exe_activity_2_ports_util",
1340-
"sum(inclusive#sum#UOPS_RETIRED:MACRO_FUSED) as uops_retired_macro_fused",
1341-
"sum(inclusive#sum#INST_RETIRED:ANY) as inst_retired_any"
1342-
]
1343-
}
1289+
"sum(inclusive#sum#IDQ_UOPS_NOT_DELIVERED:CORE) as idq_uops_not_delivered",
1290+
"sum(inclusive#sum#UOPS_ISSUED:ANY) as uops_issued",
1291+
"sum(inclusive#sum#UOPS_RETIRED:RETIRE_SLOTS) as uops_retired_retire_slots",
1292+
"sum(inclusive#sum#INT_MISC:RECOVERY_CYCLES) as int_misc_recovery_cycles",
1293+
"sum(inclusive#sum#CPU_CLK_UNHALTED:THREAD) as cpu_clock_unhalted_thread"
1294+
]
1295+
}
1296+
]
1297+
},
1298+
{
1299+
"name" : "topdown-counters.all",
1300+
"description" : "Raw counter values for Intel top-down analysis (all levels)",
1301+
"type" : "bool",
1302+
"category" : "metric",
1303+
"services" : [ "papi" ],
1304+
"config" :
1305+
{
1306+
"CALI_PAPI_COUNTERS":
1307+
"IDQ_UOPS_NOT_DELIVERED:CORE,UOPS_ISSUED:ANY,UOPS_RETIRED:RETIRE_SLOTS,INT_MISC:RECOVERY_CYCLES,CPU_CLK_UNHALTED:THREAD",
1308+
"CALI_PAPI_ENABLE_MULTIPLEXING": "true"
1309+
},
1310+
"query" :
1311+
[
1312+
{ "level": "local", "select":
1313+
[
1314+
"inclusive_sum(sum#IDQ_UOPS_NOT_DELIVERED:CORE) as idq_uops_not_delivered",
1315+
"inclusive_sum(sum#UOPS_ISSUED:ANY) as uops_issued",
1316+
"inclusive_sum(sum#UOPS_RETIRED:RETIRE_SLOTS) as uops_retired_retire_slots",
1317+
"inclusive_sum(sum#INT_MISC:RECOVERY_CYCLES) as int_misc_recovery_cycles",
1318+
"inclusive_sum(sum#CPU_CLK_UNHALTED:THREAD) as cpu_clock_unhalted_thread",
1319+
"inclusive_sum(sum#IDQ_UOPS_NOT_DELIVERED:CYCLES_0_UOPS_DELIV_CORE) as idq_uops_not_delivered_cycles_0_uops_deliv_core",
1320+
"inclusive_sum(sum#BR_MISP_RETIRED:ALL_BRANCHES) as br_misp_retired_all_branches",
1321+
"inclusive_sum(sum#MACHINE_CLEARS:COUNT) as machine_clears_count",
1322+
"inclusive_sum(sum#CYCLE_ACTIVITY:STALLS_TOTAL) as cycle_activity_stalls_total",
1323+
"inclusive_sum(sum#EXE_ACTIVITY:1_PORTS_UTIL) as exe_activity_1_ports_util",
1324+
"inclusive_sum(sum#EXE_ACTIVITY:2_PORTS_UTIL) as exe_activity_2_ports_util",
1325+
"inclusive_sum(sum#UOPS_RETIRED:MACRO_FUSED) as uops_retired_macro_fused",
1326+
"inclusive_sum(sum#INST_RETIRED:ANY) as inst_retired_any"
1327+
]
1328+
},
1329+
{ "level": "cross", "select":
1330+
[
1331+
"sum(inclusive#sum#IDQ_UOPS_NOT_DELIVERED:CORE) as idq_uops_not_delivered",
1332+
"sum(inclusive#sum#UOPS_ISSUED:ANY) as uops_issued",
1333+
"sum(inclusive#sum#UOPS_RETIRED:RETIRE_SLOTS) as uops_retired_retire_slots",
1334+
"sum(inclusive#sum#INT_MISC:RECOVERY_CYCLES) as int_misc_recovery_cycles",
1335+
"sum(inclusive#sum#CPU_CLK_UNHALTED:THREAD) as cpu_clock_unhalted_thread",
1336+
"sum(inclusive#sum#IDQ_UOPS_NOT_DELIVERED:CYCLES_0_UOPS_DELIV_CORE) as idq_uops_not_delivered_cycles_0_uops_deliv_core",
1337+
"sum(inclusive#sum#BR_MISP_RETIRED:ALL_BRANCHES) as br_misp_retired_all_branches",
1338+
"sum(inclusive#sum#MACHINE_CLEARS:COUNT) as machine_clears_count",
1339+
"sum(inclusive#sum#CYCLE_ACTIVITY:STALLS_TOTAL) as cycle_activity_stalls_total",
1340+
"sum(inclusive#sum#EXE_ACTIVITY:1_PORTS_UTIL) as exe_activity_1_ports_util",
1341+
"sum(inclusive#sum#EXE_ACTIVITY:2_PORTS_UTIL) as exe_activity_2_ports_util",
1342+
"sum(inclusive#sum#UOPS_RETIRED:MACRO_FUSED) as uops_retired_macro_fused",
1343+
"sum(inclusive#sum#INST_RETIRED:ANY) as inst_retired_any"
13441344
]
13451345
}
1346+
]
1347+
}
13461348
]
13471349
)json";
13481350

0 commit comments

Comments
 (0)