Use inc_spr_if_cond() to count instructions of all other PMCs that are capable of counting instructions (all PMCs but PMC6).
Signed-off-by: Daniel Henrique Barboza <danielhb...@gmail.com> --- target/ppc/power8-pmu-insn-cnt.c.inc | 62 ++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/target/ppc/power8-pmu-insn-cnt.c.inc b/target/ppc/power8-pmu-insn-cnt.c.inc index 3cfb801c69..a5a0d42e71 100644 --- a/target/ppc/power8-pmu-insn-cnt.c.inc +++ b/target/ppc/power8-pmu-insn-cnt.c.inc @@ -11,6 +11,13 @@ */ #if defined(TARGET_PPC64) && !defined(CONFIG_USER_ONLY) +#define MMCR1_PMC1_INS_CNT 0x02000000 +#define MMCR1_PMC1_INS_CNT2 0xFE000000 +#define MMCR1_PMC2_INS_CNT 0x00020000 +#define MMCR1_PMC3_INS_CNT 0x00000200 +#define MMCR1_PMC4_INS_CNT 0x00000002 +#define MMCR1_PMC4_INS_LATCH_CNT 0x000000FA + /* * This function increments a SPR 'spr' by 'inc_val' if a given * register 'reg' has a bitmask 'mask' set (cond = TCG_COND_EQ) or @@ -54,8 +61,63 @@ static void pmu_count_insns(DisasContext *ctx) } #if !defined(CONFIG_USER_ONLY) + TCGv t_mmcr0, t_mmcr1, t_ctrl; + TCGLabel *l_skip_pmc14; + inc_spr_if_cond(SPR_POWER_MMCR0, MMCR0_FC56, TCG_COND_NE, SPR_POWER_PMC5, ctx->base.num_insns); + + /* + * Skip PMC1-4 increment if: + * - MMCR0_FC14 is set OR + * - MMCR1 is cleared + */ + l_skip_pmc14 = gen_new_label(); + + t_mmcr0 = tcg_temp_new(); + gen_load_spr(t_mmcr0, SPR_POWER_MMCR0); + tcg_gen_andi_tl(t_mmcr0, t_mmcr0, MMCR0_FC14); + tcg_gen_brcondi_tl(TCG_COND_EQ, t_mmcr0, MMCR0_FC14, l_skip_pmc14); + + t_mmcr1 = tcg_temp_new(); + gen_load_spr(t_mmcr1, SPR_POWER_MMCR1); + tcg_gen_brcondi_tl(TCG_COND_EQ, t_mmcr1, 0x0, l_skip_pmc14); + + /* PMC1 is incremented if PMC1SEL = 0x02 or 0xFE */ + inc_spr_if_cond(SPR_POWER_MMCR1, MMCR1_PMC1_INS_CNT, TCG_COND_EQ, + SPR_POWER_PMC1, ctx->base.num_insns); + inc_spr_if_cond(SPR_POWER_MMCR1, MMCR1_PMC1_INS_CNT2, TCG_COND_EQ, + SPR_POWER_PMC1, ctx->base.num_insns); + + /* PMC2 is incremented if PMC2SEL = 0x02 */ + inc_spr_if_cond(SPR_POWER_MMCR1, MMCR1_PMC2_INS_CNT, TCG_COND_EQ, + SPR_POWER_PMC2, ctx->base.num_insns); + + /* PMC3 is incremented if PMC3SEL = 0x02 */ + inc_spr_if_cond(SPR_POWER_MMCR1, MMCR1_PMC3_INS_CNT, TCG_COND_EQ, + SPR_POWER_PMC3, ctx->base.num_insns); + + /* + * PMC4 is incremented if PMC4SEL = 0x02 or 0xFA. 0xFA depends on the + * run latch (SPR_CTRL & CTRL_RUN). Check for the run latch before + * checking for PMC4SEL = 0xFA. + */ + inc_spr_if_cond(SPR_POWER_MMCR1, MMCR1_PMC4_INS_CNT, TCG_COND_EQ, + SPR_POWER_PMC4, ctx->base.num_insns); + + t_ctrl = tcg_temp_new(); + gen_load_spr(t_ctrl, SPR_CTRL); + tcg_gen_andi_tl(t_ctrl, t_ctrl, CTRL_RUN); + tcg_gen_brcondi_tl(TCG_COND_NE, t_ctrl, CTRL_RUN, l_skip_pmc14); + + inc_spr_if_cond(SPR_POWER_MMCR1, MMCR1_PMC4_INS_LATCH_CNT, TCG_COND_EQ, + SPR_POWER_PMC4, ctx->base.num_insns); + + gen_set_label(l_skip_pmc14); + + tcg_temp_free(t_mmcr0); + tcg_temp_free(t_mmcr1); + tcg_temp_free(t_ctrl); #else /* * User mode can read (but not write) PMC5 and start/stop -- 2.33.1