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: Namhyung 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.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index ec5e21932876038b99afbfa30560d856efd8afd5..e72583f37972350fd0e253cbe7736ce0755943ab 100644 (file)
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -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
         *  'call' instruction.
         */
-       target = notes->src->offsets[cursor->ops.target.offset];
+       target = annotated_source__get_line(notes->src, cursor->ops.target.offset);
        if (target == NULL) {
                ui_helpline__printf("WARN: jump target inconsistency, press 'o', notes->offsets[%#x] = NULL\n",
                                    cursor->ops.target.offset);

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index bbf4894b13095374396451086630a0825acbbf0b..2409d7424c714a92307b245abd37310cb0292290 100644 (file)
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -369,13 +369,25 @@ int addr_map_symbol__account_cycles(struct addr_map_symbol *ams,
        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)
 {
        unsigned n_insn = 0;
        u64 offset;
 
        for (offset = start; offset <= end; offset++) {
-               if (notes->src->offsets[offset])
+               if (annotated_source__get_line(notes->src, offset))
                        n_insn++;
        }
        return n_insn;
@@ -405,8 +417,9 @@ static void annotation__count_and_fill(struct annotation *notes, u64 start, u64
                        return;
 
                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) {
                                al->cycles->ipc = ipc;
                                cover_insn++;
@@ -443,7 +456,7 @@ static int annotation__compute_ipc(struct annotation *notes, size_t size)
                if (ch && ch->cycles) {
                        struct annotation_line *al;
 
-                       al = notes->src->offsets[offset];
+                       al = annotated_source__get_line(notes->src, offset);
                        if (al && al->cycles == NULL) {
                                al->cycles = zalloc(sizeof(*al->cycles));
                                if (al->cycles == NULL) {
@@ -466,7 +479,9 @@ static int annotation__compute_ipc(struct annotation *notes, size_t size)
                        struct cyc_hist *ch = &notes->branch->cycles_hist[offset];
 
                        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)
                                        zfree(&al->cycles);
                        }
@@ -1326,9 +1341,10 @@ annotation__mark_jump_targets(struct annotation *notes, struct symbol *sym)
                return;
 
        for (offset = 0; offset < size; ++offset) {
-               struct annotation_line *al = notes->src->offsets[offset];
+               struct annotation_line *al;
                struct disasm_line *dl;
 
+               al = annotated_source__get_line(notes->src, offset);
                dl = disasm_line(al);
 
                if (!disasm_line__is_valid_local_jump(dl, sym))

diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index 3f383f38f65f4907156314f3a3ad6a4755386eaa..aa3298c2030019e2f95bf589273f167fbd9835d0 100644 (file)
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -270,6 +270,9 @@ struct annotated_source {
        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.
  *