Re: [RFC PATCH v2 28/29] target/ppc: unify cpu->has_work based on cs->interrupt_request

[Fabiano Rosas]

Matheus Ferst <matheus.ferst@eldorado.org.br> writes:

> Now that cs->interrupt_request indicates if there is any unmasked
> interrupt, checking if the CPU has work to do can be simplified to a
> single check that works for all CPU models.
>
> Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br>

Reviewed-by: Fabiano Rosas <farosas@linux.ibm.com>

> ---
>  target/ppc/cpu_init.c | 94 +------------------------------------------
>  1 file changed, 1 insertion(+), 93 deletions(-)
>
> diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
> index 26686d1557..4d0064c7a5 100644
> --- a/target/ppc/cpu_init.c
> +++ b/target/ppc/cpu_init.c
> @@ -5984,27 +5984,10 @@ int p7_interrupt_powersave(CPUPPCState *env)
>      return 0;
>  }
>  
> -static bool cpu_has_work_POWER7(CPUState *cs)
> -{
> -    PowerPCCPU *cpu = POWERPC_CPU(cs);
> -    CPUPPCState *env = &cpu->env;
> -
> -    if (cs->halted) {
> -        if (!(cs->interrupt_request & CPU_INTERRUPT_HARD)) {
> -            return false;
> -        }
> -        return p7_interrupt_powersave(env) != 0;
> -    } else {
> -        return FIELD_EX64(env->msr, MSR, EE) &&
> -               (cs->interrupt_request & CPU_INTERRUPT_HARD);
> -    }
> -}
> -
>  POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data)
>  {
>      DeviceClass *dc = DEVICE_CLASS(oc);
>      PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc);
> -    CPUClass *cc = CPU_CLASS(oc);
>  
>      dc->fw_name = "PowerPC,POWER7";
>      dc->desc = "POWER7";
> @@ -6013,7 +5996,6 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data)
>      pcc->pcr_supported = PCR_COMPAT_2_06 | PCR_COMPAT_2_05;
>      pcc->init_proc = init_proc_POWER7;
>      pcc->check_pow = check_pow_nocheck;
> -    cc->has_work = cpu_has_work_POWER7;
>      pcc->insns_flags = PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB |
>                         PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES |
>                         PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE |
> @@ -6170,27 +6152,10 @@ int p8_interrupt_powersave(CPUPPCState *env)
>      return 0;
>  }
>  
> -static bool cpu_has_work_POWER8(CPUState *cs)
> -{
> -    PowerPCCPU *cpu = POWERPC_CPU(cs);
> -    CPUPPCState *env = &cpu->env;
> -
> -    if (cs->halted) {
> -        if (!(cs->interrupt_request & CPU_INTERRUPT_HARD)) {
> -            return false;
> -        }
> -        return p8_interrupt_powersave(env) != 0;
> -    } else {
> -        return FIELD_EX64(env->msr, MSR, EE) &&
> -               (cs->interrupt_request & CPU_INTERRUPT_HARD);
> -    }
> -}
> -
>  POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data)
>  {
>      DeviceClass *dc = DEVICE_CLASS(oc);
>      PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc);
> -    CPUClass *cc = CPU_CLASS(oc);
>  
>      dc->fw_name = "PowerPC,POWER8";
>      dc->desc = "POWER8";
> @@ -6199,7 +6164,6 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data)
>      pcc->pcr_supported = PCR_COMPAT_2_07 | PCR_COMPAT_2_06 | PCR_COMPAT_2_05;
>      pcc->init_proc = init_proc_POWER8;
>      pcc->check_pow = check_pow_nocheck;
> -    cc->has_work = cpu_has_work_POWER8;
>      pcc->insns_flags = PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB |
>                         PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES |
>                         PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE |
> @@ -6407,35 +6371,10 @@ int p9_interrupt_powersave(CPUPPCState *env)
>      return 0;
>  }
>  
> -static bool cpu_has_work_POWER9(CPUState *cs)
> -{
> -    PowerPCCPU *cpu = POWERPC_CPU(cs);
> -    CPUPPCState *env = &cpu->env;
> -
> -    if (cs->halted) {
> -        uint64_t psscr = env->spr[SPR_PSSCR];
> -
> -        if (!(cs->interrupt_request & CPU_INTERRUPT_HARD)) {
> -            return false;
> -        }
> -
> -        /* If EC is clear, just return true on any pending interrupt */
> -        if (!(psscr & PSSCR_EC)) {
> -            return true;
> -        }
> -
> -        return p9_interrupt_powersave(env) != 0;
> -    } else {
> -        return FIELD_EX64(env->msr, MSR, EE) &&
> -               (cs->interrupt_request & CPU_INTERRUPT_HARD);
> -    }
> -}
> -
>  POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data)
>  {
>      DeviceClass *dc = DEVICE_CLASS(oc);
>      PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc);
> -    CPUClass *cc = CPU_CLASS(oc);
>  
>      dc->fw_name = "PowerPC,POWER9";
>      dc->desc = "POWER9";
> @@ -6445,7 +6384,6 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data)
>                           PCR_COMPAT_2_05;
>      pcc->init_proc = init_proc_POWER9;
>      pcc->check_pow = check_pow_nocheck;
> -    cc->has_work = cpu_has_work_POWER9;
>      pcc->insns_flags = PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB |
>                         PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES |
>                         PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE |
> @@ -6604,35 +6542,10 @@ static bool ppc_pvr_match_power10(PowerPCCPUClass 
> *pcc, uint32_t pvr, bool best)
>      return false;
>  }
>  
> -static bool cpu_has_work_POWER10(CPUState *cs)
> -{
> -    PowerPCCPU *cpu = POWERPC_CPU(cs);
> -    CPUPPCState *env = &cpu->env;
> -
> -    if (cs->halted) {
> -        uint64_t psscr = env->spr[SPR_PSSCR];
> -
> -        if (!(cs->interrupt_request & CPU_INTERRUPT_HARD)) {
> -            return false;
> -        }
> -
> -        /* If EC is clear, just return true on any pending interrupt */
> -        if (!(psscr & PSSCR_EC)) {
> -            return true;
> -        }
> -
> -        return p9_interrupt_powersave(env) != 0;
> -    } else {
> -        return FIELD_EX64(env->msr, MSR, EE) &&
> -               (cs->interrupt_request & CPU_INTERRUPT_HARD);
> -    }
> -}
> -
>  POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data)
>  {
>      DeviceClass *dc = DEVICE_CLASS(oc);
>      PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc);
> -    CPUClass *cc = CPU_CLASS(oc);
>  
>      dc->fw_name = "PowerPC,POWER10";
>      dc->desc = "POWER10";
> @@ -6643,7 +6556,6 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data)
>                           PCR_COMPAT_2_06 | PCR_COMPAT_2_05;
>      pcc->init_proc = init_proc_POWER10;
>      pcc->check_pow = check_pow_nocheck;
> -    cc->has_work = cpu_has_work_POWER10;
>      pcc->insns_flags = PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB |
>                         PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES |
>                         PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE |
> @@ -7200,11 +7112,7 @@ static void ppc_cpu_set_pc(CPUState *cs, vaddr value)
>  
>  static bool ppc_cpu_has_work(CPUState *cs)
>  {
> -    PowerPCCPU *cpu = POWERPC_CPU(cs);
> -    CPUPPCState *env = &cpu->env;
> -
> -    return FIELD_EX64(env->msr, MSR, EE) &&
> -           (cs->interrupt_request & CPU_INTERRUPT_HARD);
> +    return cs->interrupt_request & CPU_INTERRUPT_HARD;
>  }
>  
>  static void ppc_cpu_reset(DeviceState *dev)