github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-26 16:12:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

perf annotate-data: Add invalidate_reg_state() helper for x86

Browse Source 
Add a helper function to consistently invalidate register state instead
of field assignments. This ensures kind, ok, and copied_from are all
properly cleared when a register becomes invalid.

The helper sets:
- kind = TSR_KIND_INVALID
- ok = false
- copied_from = -1

Replace all invalidation patterns with calls to this helper. No
functional change and this removes some incorrect annotations that were
caused by incomplete invalidation (e.g. a obsolete copied_from from an
invalidated register).

Signed-off-by: Zecheng Li <zli94@ncsu.edu>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
This commit is contained in:
Zecheng Li 2026-03-09 13:55:21 -04:00 committed by Namhyung Kim
parent 1b8db0c963
commit 22b320777c
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/perf/util/annotate-arch/annotate-x86.c
View File

@ -204,6 +204,13 @@ static int x86__cpuid_parse(struct arch *arch, const char *cpuid)
}
#ifdef HAVE_LIBDW_SUPPORT
static void invalidate_reg_state(struct type_state_reg *reg)
{
reg->kind = TSR_KIND_INVALID;
reg->ok = false;
reg->copied_from = -1;
}
static void update_insn_state_x86(struct type_state *state,
struct data_loc_info *dloc, Dwarf_Die *cu_die,
struct disasm_line *dl)
@ -235,7 +242,7 @@ static void update_insn_state_x86(struct type_state *state,
/* Otherwise invalidate caller-saved registers after call */
for (unsigned i = 0; i < ARRAY_SIZE(state->regs); i++) {
if (state->regs[i].caller_saved)
state->regs[i].ok = false;
invalidate_reg_state(&state->regs[i]);
}
/* Update register with the return type (if any) */
@ -364,8 +371,7 @@ static void update_insn_state_x86(struct type_state *state,
src_tsr = state->regs[sreg];
tsr = &state->regs[dst->reg1];
tsr->copied_from = -1;
tsr->ok = false;
invalidate_reg_state(tsr);
/* Case 1: Based on stack pointer or frame pointer */
if (sreg == fbreg || sreg == state->stack_reg) {
@ -433,8 +439,7 @@ static void update_insn_state_x86(struct type_state *state,
!strncmp(dl->ins.name, "inc", 3) || !strncmp(dl->ins.name, "dec", 3)) {
pr_debug_dtp("%s [%x] invalidate reg%d\n",
dl->ins.name, insn_offset, dst->reg1);
state->regs[dst->reg1].ok = false;
state->regs[dst->reg1].copied_from = -1;
invalidate_reg_state(&state->regs[dst->reg1]);
return;
}
@ -496,7 +501,7 @@ static void update_insn_state_x86(struct type_state *state,
if (!get_global_var_type(cu_die, dloc, ip, var_addr,
&offset, &type_die) ||
!die_get_member_type(&type_die, offset, &type_die)) {
tsr->ok = false;
invalidate_reg_state(tsr);
return;
}
@ -524,7 +529,7 @@ static void update_insn_state_x86(struct type_state *state,
if (!has_reg_type(state, src->reg1) ||
!state->regs[src->reg1].ok) {
tsr->ok = false;
invalidate_reg_state(tsr);
return;
}
@ -560,7 +565,7 @@ static void update_insn_state_x86(struct type_state *state,
stack = find_stack_state(state, offset);
if (stack == NULL) {
tsr->ok = false;
invalidate_reg_state(tsr);
return;
} else if (!stack->compound) {
tsr->type = stack->type;
@ -575,7 +580,7 @@ static void update_insn_state_x86(struct type_state *state,
tsr->offset = 0;
tsr->ok = true;
} else {
tsr->ok = false;
invalidate_reg_state(tsr);
return;
}
@ -628,7 +633,7 @@ static void update_insn_state_x86(struct type_state *state,
if (!get_global_var_type(cu_die, dloc, ip, addr, &offset,
&type_die) ||
!die_get_member_type(&type_die, offset, &type_die)) {
tsr->ok = false;
invalidate_reg_state(tsr);
return;
}
@ -679,7 +684,7 @@ static void update_insn_state_x86(struct type_state *state,
}
pr_debug_type_name(&tsr->type, tsr->kind);
} else {
tsr->ok = false;
invalidate_reg_state(tsr);
}
}
/* And then dereference the calculated pointer if it has one */
@ -721,7 +726,7 @@ static void update_insn_state_x86(struct type_state *state,
}
}
tsr->ok = false;
invalidate_reg_state(tsr);
}
}
/* Case 3. register to memory transfers */