Commit 6f157d9a authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo

perf annotate: Introduce annotated_source__get_line()

It's a helper function to get annotation_line at the given offset
without using the offsets array.  The goal is to get rid of the
offsets array altogether.  It just does the linear search but I
think it's better to save memory as it won't be called in a hot
path.
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20240404175716.1225482-4-namhyung@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent bfd98ceb
...@@ -186,7 +186,7 @@ static void annotate_browser__draw_current_jump(struct ui_browser *browser) ...@@ -186,7 +186,7 @@ static void annotate_browser__draw_current_jump(struct ui_browser *browser)
* name right after the '<' token and probably treating this like a * name right after the '<' token and probably treating this like a
* 'call' instruction. * 'call' instruction.
*/ */
target = notes->src->offsets[cursor->ops.target.offset]; target = annotated_source__get_line(notes->src, cursor->ops.target.offset);
if (target == NULL) { if (target == NULL) {
ui_helpline__printf("WARN: jump target inconsistency, press 'o', notes->offsets[%#x] = NULL\n", ui_helpline__printf("WARN: jump target inconsistency, press 'o', notes->offsets[%#x] = NULL\n",
cursor->ops.target.offset); cursor->ops.target.offset);
......
...@@ -369,13 +369,25 @@ int addr_map_symbol__account_cycles(struct addr_map_symbol *ams, ...@@ -369,13 +369,25 @@ int addr_map_symbol__account_cycles(struct addr_map_symbol *ams,
return err; return err;
} }
struct annotation_line *annotated_source__get_line(struct annotated_source *src,
s64 offset)
{
struct annotation_line *al;
list_for_each_entry(al, &src->source, node) {
if (al->offset == offset)
return al;
}
return NULL;
}
static unsigned annotation__count_insn(struct annotation *notes, u64 start, u64 end) static unsigned annotation__count_insn(struct annotation *notes, u64 start, u64 end)
{ {
unsigned n_insn = 0; unsigned n_insn = 0;
u64 offset; u64 offset;
for (offset = start; offset <= end; offset++) { for (offset = start; offset <= end; offset++) {
if (notes->src->offsets[offset]) if (annotated_source__get_line(notes->src, offset))
n_insn++; n_insn++;
} }
return n_insn; return n_insn;
...@@ -405,8 +417,9 @@ static void annotation__count_and_fill(struct annotation *notes, u64 start, u64 ...@@ -405,8 +417,9 @@ static void annotation__count_and_fill(struct annotation *notes, u64 start, u64
return; return;
for (offset = start; offset <= end; offset++) { for (offset = start; offset <= end; offset++) {
struct annotation_line *al = notes->src->offsets[offset]; struct annotation_line *al;
al = annotated_source__get_line(notes->src, offset);
if (al && al->cycles && al->cycles->ipc == 0.0) { if (al && al->cycles && al->cycles->ipc == 0.0) {
al->cycles->ipc = ipc; al->cycles->ipc = ipc;
cover_insn++; cover_insn++;
...@@ -443,7 +456,7 @@ static int annotation__compute_ipc(struct annotation *notes, size_t size) ...@@ -443,7 +456,7 @@ static int annotation__compute_ipc(struct annotation *notes, size_t size)
if (ch && ch->cycles) { if (ch && ch->cycles) {
struct annotation_line *al; struct annotation_line *al;
al = notes->src->offsets[offset]; al = annotated_source__get_line(notes->src, offset);
if (al && al->cycles == NULL) { if (al && al->cycles == NULL) {
al->cycles = zalloc(sizeof(*al->cycles)); al->cycles = zalloc(sizeof(*al->cycles));
if (al->cycles == NULL) { if (al->cycles == NULL) {
...@@ -466,7 +479,9 @@ static int annotation__compute_ipc(struct annotation *notes, size_t size) ...@@ -466,7 +479,9 @@ static int annotation__compute_ipc(struct annotation *notes, size_t size)
struct cyc_hist *ch = &notes->branch->cycles_hist[offset]; struct cyc_hist *ch = &notes->branch->cycles_hist[offset];
if (ch && ch->cycles) { if (ch && ch->cycles) {
struct annotation_line *al = notes->src->offsets[offset]; struct annotation_line *al;
al = annotated_source__get_line(notes->src, offset);
if (al) if (al)
zfree(&al->cycles); zfree(&al->cycles);
} }
...@@ -1326,9 +1341,10 @@ annotation__mark_jump_targets(struct annotation *notes, struct symbol *sym) ...@@ -1326,9 +1341,10 @@ annotation__mark_jump_targets(struct annotation *notes, struct symbol *sym)
return; return;
for (offset = 0; offset < size; ++offset) { for (offset = 0; offset < size; ++offset) {
struct annotation_line *al = notes->src->offsets[offset]; struct annotation_line *al;
struct disasm_line *dl; struct disasm_line *dl;
al = annotated_source__get_line(notes->src, offset);
dl = disasm_line(al); dl = disasm_line(al);
if (!disasm_line__is_valid_local_jump(dl, sym)) if (!disasm_line__is_valid_local_jump(dl, sym))
......
...@@ -270,6 +270,9 @@ struct annotated_source { ...@@ -270,6 +270,9 @@ struct annotated_source {
u16 max_line_len; u16 max_line_len;
}; };
struct annotation_line *annotated_source__get_line(struct annotated_source *src,
s64 offset);
/** /**
* struct annotated_branch - basic block and IPC information for a symbol. * struct annotated_branch - basic block and IPC information for a symbol.
* *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment