On Mon, Jul 01, 2024 at 10:04:16AM +0530, Athira Rajeev wrote: > Add TYPE_STATE_MAX_REGS_X86 and TYPE_STATE_MAX_REGS_PPC. Define > TYPE_STATE_MAX_REGS to be 32 which is max size of the array. While > checking if reg is valid using has_reg_type, use the max value > depending on the architecture. For x86, use TYPE_STATE_MAX_REGS_X86 > since max number of regs is 16. Update has_reg_type to > pass "struct arch" also as one of the parameters. > > Signed-off-by: Athira Rajeev<atraj...@linux.vnet.ibm.com> > --- > tools/perf/arch/x86/annotate/instructions.c | 20 ++++++++++---------- > tools/perf/util/annotate-data.c | 13 +++++++++---- > tools/perf/util/annotate-data.h | 6 ++++-- > 3 files changed, 23 insertions(+), 16 deletions(-) > > diff --git a/tools/perf/arch/x86/annotate/instructions.c > b/tools/perf/arch/x86/annotate/instructions.c > index 7b7d462c6c6b..ea1dc686e7b4 100644 > --- a/tools/perf/arch/x86/annotate/instructions.c > +++ b/tools/perf/arch/x86/annotate/instructions.c > @@ -263,14 +263,14 @@ static void update_insn_state_x86(struct type_state > *state, > struct map_symbol *ms = dloc->ms; > u64 ip = ms->sym->start + dl->al.offset; > > - if (!has_reg_type(state, dst->reg1)) > + if (!has_reg_type(state, dst->reg1, dloc->arch)) > return; > > tsr = &state->regs[dst->reg1]; > > if (src->imm) > imm_value = src->offset; > - else if (has_reg_type(state, src->reg1) && > + else if (has_reg_type(state, src->reg1, dloc->arch) && > state->regs[src->reg1].kind == TSR_KIND_CONST) > imm_value = state->regs[src->reg1].imm_value; > else if (src->reg1 == DWARF_REG_PC) { > @@ -321,7 +321,7 @@ static void update_insn_state_x86(struct type_state > *state, > > /* Case 1. register to register or segment:offset to register transfers > */ > if (!src->mem_ref && !dst->mem_ref) { > - if (!has_reg_type(state, dst->reg1)) > + if (!has_reg_type(state, dst->reg1, dloc->arch)) > return; > > tsr = &state->regs[dst->reg1]; > @@ -374,7 +374,7 @@ static void update_insn_state_x86(struct type_state > *state, > return; > } > > - if (!has_reg_type(state, src->reg1) || > + if (!has_reg_type(state, src->reg1, dloc->arch) || > !state->regs[src->reg1].ok) { > tsr->ok = false; > return; > @@ -392,7 +392,7 @@ static void update_insn_state_x86(struct type_state > *state, > if (src->mem_ref && !dst->mem_ref) { > int sreg = src->reg1; > > - if (!has_reg_type(state, dst->reg1)) > + if (!has_reg_type(state, dst->reg1, dloc->arch)) > return; > > tsr = &state->regs[dst->reg1]; > @@ -427,7 +427,7 @@ static void update_insn_state_x86(struct type_state > *state, > pr_debug_type_name(&tsr->type, tsr->kind); > } > /* And then dereference the pointer if it has one */ > - else if (has_reg_type(state, sreg) && state->regs[sreg].ok && > + else if (has_reg_type(state, sreg, dloc->arch) && > state->regs[sreg].ok && > state->regs[sreg].kind == TSR_KIND_TYPE && > die_deref_ptr_type(&state->regs[sreg].type, > src->offset, &type_die)) { > @@ -464,7 +464,7 @@ static void update_insn_state_x86(struct type_state > *state, > pr_debug_type_name(&type_die, tsr->kind); > } > /* And check percpu access with base register */ > - else if (has_reg_type(state, sreg) && > + else if (has_reg_type(state, sreg, dloc->arch) && > state->regs[sreg].kind == TSR_KIND_PERCPU_BASE) { > u64 ip = dloc->ms->sym->start + dl->al.offset; > u64 var_addr = src->offset; > @@ -473,7 +473,7 @@ static void update_insn_state_x86(struct type_state > *state, > if (src->multi_regs) { > int reg2 = (sreg == src->reg1) ? src->reg2 : > src->reg1; > > - if (has_reg_type(state, reg2) && > state->regs[reg2].ok && > + if (has_reg_type(state, reg2, dloc->arch) && > state->regs[reg2].ok && > state->regs[reg2].kind == TSR_KIND_CONST) > var_addr += state->regs[reg2].imm_value; > } > @@ -504,7 +504,7 @@ static void update_insn_state_x86(struct type_state > *state, > } > } > /* And then dereference the calculated pointer if it has one */ > - else if (has_reg_type(state, sreg) && state->regs[sreg].ok && > + else if (has_reg_type(state, sreg, dloc->arch) && > state->regs[sreg].ok && > state->regs[sreg].kind == TSR_KIND_POINTER && > die_get_member_type(&state->regs[sreg].type, > src->offset, &type_die)) { > @@ -543,7 +543,7 @@ static void update_insn_state_x86(struct type_state > *state, > } > /* Case 3. register to memory transfers */ > if (!src->mem_ref && dst->mem_ref) { > - if (!has_reg_type(state, src->reg1) || > + if (!has_reg_type(state, src->reg1, dloc->arch) || > !state->regs[src->reg1].ok) > return; > > diff --git a/tools/perf/util/annotate-data.c b/tools/perf/util/annotate-data.c > index 7a48c3d72b89..fac9d3cdd318 100644 > --- a/tools/perf/util/annotate-data.c > +++ b/tools/perf/util/annotate-data.c > @@ -131,9 +131,14 @@ static void pr_debug_location(Dwarf_Die *die, u64 pc, > int reg) > } > } > > -bool has_reg_type(struct type_state *state, int reg) > +bool has_reg_type(struct type_state *state, int reg, struct arch *arch) > { > - return (unsigned)reg < ARRAY_SIZE(state->regs); > + if (arch__is(arch, "x86")) > + return (unsigned)reg < TYPE_STATE_MAX_REGS_x86; > + else if (arch__is(arch, "powerpc")) > + return (unsigned)reg < TYPE_STATE_MAX_REGS_PPC; > + else > + return (unsigned)reg < ARRAY_SIZE(state->regs); > } > > static void init_type_state(struct type_state *state, struct arch *arch) > @@ -707,7 +712,7 @@ static void update_var_state(struct type_state *state, > struct data_loc_info *dlo > pr_debug_dtp("var [%"PRIx64"] -%#x(stack)", > insn_offset, -var->offset + fb_offset); > pr_debug_type_name(&mem_die, TSR_KIND_TYPE); > - } else if (has_reg_type(state, var->reg) && var->offset == 0) { > + } else if (has_reg_type(state, var->reg, dloc->arch) && > var->offset == 0) { > struct type_state_reg *reg; > > reg = &state->regs[var->reg]; > @@ -943,7 +948,7 @@ static int check_matching_type(struct type_state *state, > if (dloc->op->reg2 == reg) > reg2 = dloc->op->reg1; > > - if (has_reg_type(state, reg2) && state->regs[reg2].ok && > + if (has_reg_type(state, reg2, dloc->arch) && > state->regs[reg2].ok && > state->regs[reg2].kind == TSR_KIND_CONST) > var_addr += state->regs[reg2].imm_value; > } > diff --git a/tools/perf/util/annotate-data.h b/tools/perf/util/annotate-data.h > index 6fe8ee8b8410..4d8682cdc53c 100644 > --- a/tools/perf/util/annotate-data.h > +++ b/tools/perf/util/annotate-data.h > @@ -189,7 +189,9 @@ struct type_state_stack { > }; > > /* FIXME: This should be arch-dependent */ > -#define TYPE_STATE_MAX_REGS 16 > +#define TYPE_STATE_MAX_REGS 32 > +#define TYPE_STATE_MAX_REGS_x86 16 > +#define TYPE_STATE_MAX_REGS_PPC 32
How about this? #ifdef __powerpc__ // or something # define TYPE_STATE_MAX_REGS 32 #else # define TYPE_STATE_MAX_REGS 16 #endif Thanks, Namhyung > > /* > * State table to maintain type info in each register and stack location. > @@ -224,7 +226,7 @@ void global_var_type__tree_delete(struct rb_root *root); > > int hist_entry__annotate_data_tty(struct hist_entry *he, struct evsel > *evsel); > > -bool has_reg_type(struct type_state *state, int reg); > +bool has_reg_type(struct type_state *state, int reg, struct arch *arch); > struct type_state_stack *findnew_stack_state(struct type_state *state, > int offset, u8 kind, > Dwarf_Die *type_die); > -- > 2.43.0 >