Skip to content

Commit 8989f5f

Browse files
ThinkOpenlyacmel
ThinkOpenly
authored and
acmel
committed
perf stat: Update POWER9 metrics to utilize other metrics
These changes take advantage of the new capability added in merge commit 00e4db5 "Allow using computed metrics in calculating other metrics". The net is a simplification of the expressions for a handful of metrics, but no functional change. Signed-off-by: Paul Clarke <[email protected]> Reviewed-by: Kajol Jain <[email protected]> Acked-by: Ian Rogers <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Madhavan Srinivasan <[email protected]> Link: http://lore.kernel.org/lkml/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 0094024 commit 8989f5f

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

‎tools/perf/pmu-events/arch/powerpc/power9/metrics.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
},
6161
{
6262
"BriefDescription": "Stalls due to short latency decimal floating ops.",
63-
"MetricExpr": "(PM_CMPLU_STALL_DFU - PM_CMPLU_STALL_DFLONG)/PM_RUN_INST_CMPL",
63+
"MetricExpr": "dfu_stall_cpi - dflong_stall_cpi",
6464
"MetricGroup": "cpi_breakdown",
6565
"MetricName": "dfu_other_stall_cpi"
6666
},
@@ -72,7 +72,7 @@
7272
},
7373
{
7474
"BriefDescription": "Completion stall by Dcache miss which resolved off node memory/cache",
75-
"MetricExpr": "(PM_CMPLU_STALL_DMISS_L3MISS - PM_CMPLU_STALL_DMISS_L21_L31 - PM_CMPLU_STALL_DMISS_LMEM - PM_CMPLU_STALL_DMISS_REMOTE)/PM_RUN_INST_CMPL",
75+
"MetricExpr": "dmiss_non_local_stall_cpi - dmiss_remote_stall_cpi",
7676
"MetricGroup": "cpi_breakdown",
7777
"MetricName": "dmiss_distant_stall_cpi"
7878
},
@@ -90,7 +90,7 @@
9090
},
9191
{
9292
"BriefDescription": "Completion stall due to cache miss that resolves in the L2 or L3 without conflict",
93-
"MetricExpr": "(PM_CMPLU_STALL_DMISS_L2L3 - PM_CMPLU_STALL_DMISS_L2L3_CONFLICT)/PM_RUN_INST_CMPL",
93+
"MetricExpr": "dmiss_l2l3_stall_cpi - dmiss_l2l3_conflict_stall_cpi",
9494
"MetricGroup": "cpi_breakdown",
9595
"MetricName": "dmiss_l2l3_noconflict_stall_cpi"
9696
},
@@ -114,7 +114,7 @@
114114
},
115115
{
116116
"BriefDescription": "Completion stall by Dcache miss which resolved outside of local memory",
117-
"MetricExpr": "(PM_CMPLU_STALL_DMISS_L3MISS - PM_CMPLU_STALL_DMISS_L21_L31 - PM_CMPLU_STALL_DMISS_LMEM)/PM_RUN_INST_CMPL",
117+
"MetricExpr": "dmiss_l3miss_stall_cpi - dmiss_l21_l31_stall_cpi - dmiss_lmem_stall_cpi",
118118
"MetricGroup": "cpi_breakdown",
119119
"MetricName": "dmiss_non_local_stall_cpi"
120120
},
@@ -126,7 +126,7 @@
126126
},
127127
{
128128
"BriefDescription": "Stalls due to short latency double precision ops.",
129-
"MetricExpr": "(PM_CMPLU_STALL_DP - PM_CMPLU_STALL_DPLONG)/PM_RUN_INST_CMPL",
129+
"MetricExpr": "dp_stall_cpi - dplong_stall_cpi",
130130
"MetricGroup": "cpi_breakdown",
131131
"MetricName": "dp_other_stall_cpi"
132132
},
@@ -155,7 +155,7 @@
155155
"MetricName": "emq_full_stall_cpi"
156156
},
157157
{
158-
"MetricExpr": "(PM_CMPLU_STALL_ERAT_MISS + PM_CMPLU_STALL_EMQ_FULL)/PM_RUN_INST_CMPL",
158+
"MetricExpr": "erat_miss_stall_cpi + emq_full_stall_cpi",
159159
"MetricGroup": "cpi_breakdown",
160160
"MetricName": "emq_stall_cpi"
161161
},
@@ -173,7 +173,7 @@
173173
},
174174
{
175175
"BriefDescription": "Completion stall due to execution units for other reasons.",
176-
"MetricExpr": "(PM_CMPLU_STALL_EXEC_UNIT - PM_CMPLU_STALL_FXU - PM_CMPLU_STALL_DP - PM_CMPLU_STALL_DFU - PM_CMPLU_STALL_PM - PM_CMPLU_STALL_CRYPTO - PM_CMPLU_STALL_VFXU - PM_CMPLU_STALL_VDP)/PM_RUN_INST_CMPL",
176+
"MetricExpr": "exec_unit_stall_cpi - scalar_stall_cpi - vector_stall_cpi",
177177
"MetricGroup": "cpi_breakdown",
178178
"MetricName": "exec_unit_other_stall_cpi"
179179
},
@@ -197,7 +197,7 @@
197197
},
198198
{
199199
"BriefDescription": "Stalls due to short latency integer ops",
200-
"MetricExpr": "(PM_CMPLU_STALL_FXU - PM_CMPLU_STALL_FXLONG)/PM_RUN_INST_CMPL",
200+
"MetricExpr": "fxu_stall_cpi - fxlong_stall_cpi",
201201
"MetricGroup": "cpi_breakdown",
202202
"MetricName": "fxu_other_stall_cpi"
203203
},
@@ -221,7 +221,7 @@
221221
},
222222
{
223223
"BriefDescription": "Instruction Completion Table other stalls",
224-
"MetricExpr": "(PM_ICT_NOSLOT_CYC - PM_ICT_NOSLOT_IC_MISS - PM_ICT_NOSLOT_BR_MPRED_ICMISS - PM_ICT_NOSLOT_BR_MPRED - PM_ICT_NOSLOT_DISP_HELD)/PM_RUN_INST_CMPL",
224+
"MetricExpr": "nothing_dispatched_cpi - ict_noslot_ic_miss_cpi - ict_noslot_br_mpred_icmiss_cpi - ict_noslot_br_mpred_cpi - ict_noslot_disp_held_cpi",
225225
"MetricGroup": "cpi_breakdown",
226226
"MetricName": "ict_noslot_cyc_other_cpi"
227227
},
@@ -245,7 +245,7 @@
245245
},
246246
{
247247
"BriefDescription": "ICT_NOSLOT_DISP_HELD_OTHER_CPI",
248-
"MetricExpr": "(PM_ICT_NOSLOT_DISP_HELD - PM_ICT_NOSLOT_DISP_HELD_HB_FULL - PM_ICT_NOSLOT_DISP_HELD_SYNC - PM_ICT_NOSLOT_DISP_HELD_TBEGIN - PM_ICT_NOSLOT_DISP_HELD_ISSQ)/PM_RUN_INST_CMPL",
248+
"MetricExpr": "ict_noslot_disp_held_cpi - ict_noslot_disp_held_hb_full_cpi - ict_noslot_disp_held_sync_cpi - ict_noslot_disp_held_tbegin_cpi - ict_noslot_disp_held_issq_cpi",
249249
"MetricGroup": "cpi_breakdown",
250250
"MetricName": "ict_noslot_disp_held_other_cpi"
251251
},
@@ -263,7 +263,7 @@
263263
},
264264
{
265265
"BriefDescription": "ICT_NOSLOT_IC_L2_CPI",
266-
"MetricExpr": "(PM_ICT_NOSLOT_IC_MISS - PM_ICT_NOSLOT_IC_L3 - PM_ICT_NOSLOT_IC_L3MISS)/PM_RUN_INST_CMPL",
266+
"MetricExpr": "ict_noslot_ic_miss_cpi - ict_noslot_ic_l3_cpi - ict_noslot_ic_l3miss_cpi",
267267
"MetricGroup": "cpi_breakdown",
268268
"MetricName": "ict_noslot_ic_l2_cpi"
269269
},
@@ -286,7 +286,7 @@
286286
"MetricName": "ict_noslot_ic_miss_cpi"
287287
},
288288
{
289-
"MetricExpr": "(PM_NTC_ISSUE_HELD_DARQ_FULL + PM_NTC_ISSUE_HELD_ARB + PM_NTC_ISSUE_HELD_OTHER)/PM_RUN_INST_CMPL",
289+
"MetricExpr": "ntc_issue_held_darq_full_cpi + ntc_issue_held_arb_cpi + ntc_issue_held_other_cpi",
290290
"MetricGroup": "cpi_breakdown",
291291
"MetricName": "issue_hold_cpi"
292292
},
@@ -327,7 +327,7 @@
327327
"MetricName": "lrq_other_stall_cpi"
328328
},
329329
{
330-
"MetricExpr": "(PM_CMPLU_STALL_LMQ_FULL + PM_CMPLU_STALL_ST_FWD + PM_CMPLU_STALL_LHS + PM_CMPLU_STALL_LSU_MFSPR + PM_CMPLU_STALL_LARX + PM_CMPLU_STALL_LRQ_OTHER)/PM_RUN_INST_CMPL",
330+
"MetricExpr": "lmq_full_stall_cpi + st_fwd_stall_cpi + lhs_stall_cpi + lsu_mfspr_stall_cpi + larx_stall_cpi + lrq_other_stall_cpi",
331331
"MetricGroup": "cpi_breakdown",
332332
"MetricName": "lrq_stall_cpi"
333333
},
@@ -338,7 +338,7 @@
338338
"MetricName": "lsaq_arb_stall_cpi"
339339
},
340340
{
341-
"MetricExpr": "(PM_CMPLU_STALL_LRQ_FULL + PM_CMPLU_STALL_SRQ_FULL + PM_CMPLU_STALL_LSAQ_ARB)/PM_RUN_INST_CMPL",
341+
"MetricExpr": "lrq_full_stall_cpi + srq_full_stall_cpi + lsaq_arb_stall_cpi",
342342
"MetricGroup": "cpi_breakdown",
343343
"MetricName": "lsaq_stall_cpi"
344344
},
@@ -362,7 +362,7 @@
362362
},
363363
{
364364
"BriefDescription": "Completion LSU stall for other reasons",
365-
"MetricExpr": "(PM_CMPLU_STALL_LSU - PM_CMPLU_STALL_LSU_FIN - PM_CMPLU_STALL_STORE_FINISH - PM_CMPLU_STALL_STORE_DATA - PM_CMPLU_STALL_EIEIO - PM_CMPLU_STALL_STCX - PM_CMPLU_STALL_SLB - PM_CMPLU_STALL_TEND - PM_CMPLU_STALL_PASTE - PM_CMPLU_STALL_TLBIE - PM_CMPLU_STALL_STORE_PIPE_ARB - PM_CMPLU_STALL_STORE_FIN_ARB - PM_CMPLU_STALL_LOAD_FINISH + PM_CMPLU_STALL_DCACHE_MISS - PM_CMPLU_STALL_LMQ_FULL - PM_CMPLU_STALL_ST_FWD - PM_CMPLU_STALL_LHS - PM_CMPLU_STALL_LSU_MFSPR - PM_CMPLU_STALL_LARX - PM_CMPLU_STALL_LRQ_OTHER + PM_CMPLU_STALL_ERAT_MISS + PM_CMPLU_STALL_EMQ_FULL - PM_CMPLU_STALL_LRQ_FULL - PM_CMPLU_STALL_SRQ_FULL - PM_CMPLU_STALL_LSAQ_ARB) / PM_RUN_INST_CMPL",
365+
"MetricExpr": "lsu_stall_cpi - lsu_fin_stall_cpi - store_finish_stall_cpi - srq_stall_cpi - load_finish_stall_cpi + lsu_stall_dcache_miss_cpi - lrq_stall_cpi + emq_stall_cpi - lsaq_stall_cpi",
366366
"MetricGroup": "cpi_breakdown",
367367
"MetricName": "lsu_other_stall_cpi"
368368
},
@@ -434,13 +434,13 @@
434434
},
435435
{
436436
"BriefDescription": "Cycles unaccounted for.",
437-
"MetricExpr": "(PM_RUN_CYC - PM_1PLUS_PPC_CMPL - PM_CMPLU_STALL_THRD - PM_CMPLU_STALL - PM_ICT_NOSLOT_CYC)/PM_RUN_INST_CMPL",
437+
"MetricExpr": "run_cpi - completion_cpi - thread_block_stall_cpi - stall_cpi - nothing_dispatched_cpi",
438438
"MetricGroup": "cpi_breakdown",
439439
"MetricName": "other_cpi"
440440
},
441441
{
442442
"BriefDescription": "Completion stall for other reasons",
443-
"MetricExpr": "(PM_CMPLU_STALL - PM_CMPLU_STALL_NTC_DISP_FIN - PM_CMPLU_STALL_NTC_FLUSH - PM_CMPLU_STALL_LSU - PM_CMPLU_STALL_EXEC_UNIT - PM_CMPLU_STALL_BRU)/PM_RUN_INST_CMPL",
443+
"MetricExpr": "stall_cpi - ntc_disp_fin_stall_cpi - ntc_flush_stall_cpi - lsu_stall_cpi - exec_unit_stall_cpi - bru_stall_cpi",
444444
"MetricGroup": "cpi_breakdown",
445445
"MetricName": "other_stall_cpi"
446446
},
@@ -469,7 +469,7 @@
469469
"MetricName": "run_cyc_cpi"
470470
},
471471
{
472-
"MetricExpr": "(PM_CMPLU_STALL_FXU + PM_CMPLU_STALL_DP + PM_CMPLU_STALL_DFU + PM_CMPLU_STALL_PM + PM_CMPLU_STALL_CRYPTO)/PM_RUN_INST_CMPL",
472+
"MetricExpr": "fxu_stall_cpi + dp_stall_cpi + dfu_stall_cpi + pm_stall_cpi + crypto_stall_cpi",
473473
"MetricGroup": "cpi_breakdown",
474474
"MetricName": "scalar_stall_cpi"
475475
},
@@ -492,7 +492,7 @@
492492
"MetricName": "srq_full_stall_cpi"
493493
},
494494
{
495-
"MetricExpr": "(PM_CMPLU_STALL_STORE_DATA + PM_CMPLU_STALL_EIEIO + PM_CMPLU_STALL_STCX + PM_CMPLU_STALL_SLB + PM_CMPLU_STALL_TEND + PM_CMPLU_STALL_PASTE + PM_CMPLU_STALL_TLBIE + PM_CMPLU_STALL_STORE_PIPE_ARB + PM_CMPLU_STALL_STORE_FIN_ARB)/PM_RUN_INST_CMPL",
495+
"MetricExpr": "store_data_stall_cpi + eieio_stall_cpi + stcx_stall_cpi + slb_stall_cpi + tend_stall_cpi + paste_stall_cpi + tlbie_stall_cpi + store_pipe_arb_stall_cpi + store_fin_arb_stall_cpi",
496496
"MetricGroup": "cpi_breakdown",
497497
"MetricName": "srq_stall_cpi"
498498
},
@@ -558,7 +558,7 @@
558558
},
559559
{
560560
"BriefDescription": "Vector stalls due to small latency double precision ops",
561-
"MetricExpr": "(PM_CMPLU_STALL_VDP - PM_CMPLU_STALL_VDPLONG)/PM_RUN_INST_CMPL",
561+
"MetricExpr": "vdp_stall_cpi - vdplong_stall_cpi",
562562
"MetricGroup": "cpi_breakdown",
563563
"MetricName": "vdp_other_stall_cpi"
564564
},
@@ -575,7 +575,7 @@
575575
"MetricName": "vdplong_stall_cpi"
576576
},
577577
{
578-
"MetricExpr": "(PM_CMPLU_STALL_VFXU + PM_CMPLU_STALL_VDP)/PM_RUN_INST_CMPL",
578+
"MetricExpr": "vfxu_stall_cpi + vdp_stall_cpi",
579579
"MetricGroup": "cpi_breakdown",
580580
"MetricName": "vector_stall_cpi"
581581
},
@@ -587,7 +587,7 @@
587587
},
588588
{
589589
"BriefDescription": "Vector stalls due to small latency integer ops",
590-
"MetricExpr": "(PM_CMPLU_STALL_VFXU - PM_CMPLU_STALL_VFXLONG)/PM_RUN_INST_CMPL",
590+
"MetricExpr": "vfxu_stall_cpi - vfxlong_stall_cpi",
591591
"MetricGroup": "cpi_breakdown",
592592
"MetricName": "vfxu_other_stall_cpi"
593593
},
@@ -1844,7 +1844,7 @@
18441844
},
18451845
{
18461846
"BriefDescription": "% of DL1 reloads from Private L3, other core per Inst",
1847-
"MetricExpr": "(PM_DATA_FROM_L31_MOD + PM_DATA_FROM_L31_SHR) * 100 / PM_RUN_INST_CMPL",
1847+
"MetricExpr": "dl1_reload_from_l31_mod_rate_percent + dl1_reload_from_l31_shr_rate_percent",
18481848
"MetricName": "dl1_reload_from_l31_rate_percent"
18491849
},
18501850
{
@@ -1979,7 +1979,7 @@
19791979
},
19801980
{
19811981
"BriefDescription": "Completion stall because a different thread was using the completion pipe",
1982-
"MetricExpr": "(PM_CMPLU_STALL_THRD - PM_CMPLU_STALL_EXCEPTION - PM_CMPLU_STALL_ANY_SYNC - PM_CMPLU_STALL_SYNC_PMU_INT - PM_CMPLU_STALL_SPEC_FINISH - PM_CMPLU_STALL_FLUSH_ANY_THREAD - PM_CMPLU_STALL_LSU_FLUSH_NEXT - PM_CMPLU_STALL_NESTED_TBEGIN - PM_CMPLU_STALL_NESTED_TEND - PM_CMPLU_STALL_MTFPSCR)/PM_RUN_INST_CMPL",
1982+
"MetricExpr": "thread_block_stall_cpi - exception_stall_cpi - any_sync_stall_cpi - sync_pmu_int_stall_cpi - spec_finish_stall_cpi - flush_any_thread_stall_cpi - lsu_flush_next_stall_cpi - nested_tbegin_stall_cpi - nested_tend_stall_cpi - mtfpscr_stall_cpi",
19831983
"MetricName": "other_thread_cmpl_stall"
19841984
},
19851985
{

0 commit comments

Comments
 (0)