Skip to content

Commit 36bf4ec

Browse files
ilumsdenilumsden
committed
Removes topdown counters options
1 parent bb4606c commit 36bf4ec

File tree

1 file changed

+0
-216
lines changed

1 file changed

+0
-216
lines changed

‎src/caliper/controllers/controllers.cpp

-216
Original file line numberDiff line numberDiff line change
@@ -1260,90 +1260,6 @@ const char* builtin_papi_skl_option_specs = R"json(
12601260
]
12611261
}
12621262
]
1263-
},
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":
1279-
[
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"
1285-
]
1286-
},
1287-
{ "level": "cross", "select":
1288-
[
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"
1344-
]
1345-
}
1346-
]
13471263
}
13481264
]
13491265
)json";
@@ -1420,60 +1336,6 @@ const char* builtin_papi_spr_option_specs = R"json(
14201336
]
14211337
}
14221338
]
1423-
},
1424-
{
1425-
"name" : "topdown-counters.toplevel",
1426-
"description" : "Raw counter values for Intel top-down analysis (top level)",
1427-
"type" : "bool",
1428-
"category" : "metric",
1429-
"services" : [ "papi" ],
1430-
"config" :
1431-
{
1432-
"CALI_PAPI_COUNTERS":
1433-
"perf::slots,perf::topdown-retiring"
1434-
},
1435-
"query" :
1436-
[
1437-
{ "level": "local", "select":
1438-
[
1439-
"inclusive_sum(sum#papi.slots) as slots",
1440-
"inclusive_sum(sum#papi.perf::topdown-retiring) as topdown_retiring"
1441-
]
1442-
},
1443-
{ "level": "cross", "select":
1444-
[
1445-
"sum(inclusive#sum#papi.slots) as slots",
1446-
"sum(inclusive#sum#papi.perf::topdown-retiring) as topdown_retiring"
1447-
]
1448-
}
1449-
]
1450-
},
1451-
{
1452-
"name" : "topdown-counters.all",
1453-
"description" : "Raw counter values for Intel top-down analysis (all levels)",
1454-
"type" : "bool",
1455-
"category" : "metric",
1456-
"services" : [ "papi" ],
1457-
"config" :
1458-
{
1459-
"CALI_PAPI_COUNTERS":
1460-
"perf::slots,perf::topdown-retiring"
1461-
},
1462-
"query" :
1463-
[
1464-
{ "level": "local", "select":
1465-
[
1466-
"inclusive_sum(sum#papi.slots) as slots",
1467-
"inclusive_sum(sum#papi.perf::topdown-retiring) as topdown_retiring"
1468-
]
1469-
},
1470-
{ "level": "cross", "select":
1471-
[
1472-
"sum(inclusive#sum#papi.slots) as slots",
1473-
"sum(inclusive#sum#papi.perf::topdown-retiring) as topdown_retiring"
1474-
]
1475-
}
1476-
]
14771339
}
14781340
]
14791341
)json";
@@ -1549,84 +1411,6 @@ const char* builtin_papi_spr_option_specs = R"json(
15491411
]
15501412
}
15511413
]
1552-
},
1553-
{
1554-
"name" : "topdown-counters.toplevel",
1555-
"description" : "Raw counter values for Intel top-down analysis (top level)",
1556-
"type" : "bool",
1557-
"category" : "metric",
1558-
"services" : [ "papi" ],
1559-
"config" :
1560-
{
1561-
"CALI_PAPI_COUNTERS":
1562-
"perf::slots,perf::topdown-retiring,perf::topdown-bad-spec,perf::topdown-fe-bound,perf::topdown-be-bound,INT_MISC:UOP_DROPPING"
1563-
},
1564-
"query" :
1565-
[
1566-
{ "level": "local", "select":
1567-
[
1568-
"inclusive_sum(sum#papi.perf::slots) as slots",
1569-
"inclusive_sum(sum#papi.perf::topdown-retiring) as topdown_retiring",
1570-
"inclusive_sum(sum#papi.perf::topdown-bad-spec) as topdown_bad_spec",
1571-
"inclusive_sum(sum#papi.perf::topdown-fe-bound) as topdown_fe_bound",
1572-
"inclusive_sum(sum#papi.perf::topdown-be-bound) as topdown_be_bound",
1573-
"inclusive_sum(sum#papi.INT_MISC:UOP_DROPPING) as int_mist:uop_dropping"
1574-
]
1575-
},
1576-
{ "level": "cross", "select":
1577-
[
1578-
"sum(inclusive#sum#papi.perf::slots) as slots",
1579-
"sum(inclusive#sum#papi.perf::topdown-retiring) as topdown_retiring",
1580-
"sum(inclusive#sum#papi.perf::topdown-bad-spec) as topdown_bad_spec",
1581-
"sum(inclusive#sum#papi.perf::topdown-fe-bound) as topdown_fe_bound",
1582-
"sum(inclusive#sum#papi.perf::topdown-be-bound) as topdown_be_bound",
1583-
"sum(inclusive#sum#papi.INT_MISC:UOP_DROPPING) as int_mist:uop_dropping"
1584-
]
1585-
}
1586-
]
1587-
},
1588-
{
1589-
"name" : "topdown-counters.all",
1590-
"description" : "Raw counter values for Intel top-down analysis (all levels)",
1591-
"type" : "bool",
1592-
"category" : "metric",
1593-
"services" : [ "papi" ],
1594-
"config" :
1595-
{
1596-
"CALI_PAPI_COUNTERS":
1597-
"perf::slots,perf::topdown-retiring,perf::topdown-bad-spec,perf::topdown-fe-bound,perf::topdown-be-bound,INT_MISC:UOP_DROPPING,perf_raw::r8400,perf_raw::r8500,perf_raw::r8600,perf_raw::r8700"
1598-
},
1599-
"query" :
1600-
[
1601-
{ "level": "local", "select":
1602-
[
1603-
"inclusive_sum(sum#papi.perf::slots) as slots",
1604-
"inclusive_sum(sum#papi.perf::topdown-retiring) as topdown_retiring",
1605-
"inclusive_sum(sum#papi.perf::topdown-bad-spec) as topdown_bad_spec",
1606-
"inclusive_sum(sum#papi.perf::topdown-fe-bound) as topdown_fe_bound",
1607-
"inclusive_sum(sum#papi.perf::topdown-be-bound) as topdown_be_bound",
1608-
"inclusive_sum(sum#papi.INT_MISC:UOP_DROPPING) as int_mist:uop_dropping",
1609-
"inclusive_sum(sum#papi.perf_raw::r8400) as topdown_heavy_ops",
1610-
"inclusive_sum(sum#papi.perf_raw::r8500) as topdown_br_mispredict",
1611-
"inclusive_sum(sum#papi.perf_raw::r8600) as topdown_fetch_lat",
1612-
"inclusive_sum(sum#papi.perf_raw::r8700) as topdown_mem_bound"
1613-
]
1614-
},
1615-
{ "level": "cross", "select":
1616-
[
1617-
"sum(inclusive#sum#papi.perf::slots) as slots",
1618-
"sum(inclusive#sum#papi.perf::topdown-retiring) as topdown_retiring",
1619-
"sum(inclusive#sum#papi.perf::topdown-bad-spec) as topdown_bad_spec",
1620-
"sum(inclusive#sum#papi.perf::topdown-fe-bound) as topdown_fe_bound",
1621-
"sum(inclusive#sum#papi.perf::topdown-be-bound) as topdown_be_bound",
1622-
"sum(inclusive#sum#papi.INT_MISC:UOP_DROPPING) as int_mist:uop_dropping",
1623-
"sum(inclusive#sum#papi.perf_raw::r8400) as topdown_heavy_ops",
1624-
"sum(inclusive#sum#papi.perf_raw::r8500) as topdown_br_mispredict",
1625-
"sum(inclusive#sum#papi.perf_raw::r8600) as topdown_fetch_lat",
1626-
"sum(inclusive#sum#papi.perf_raw::r8700) as topdown_mem_bound"
1627-
]
1628-
}
1629-
]
16301414
}
16311415
]
16321416
)json";

0 commit comments

Comments
 (0)