perf annotate: Get rid of local annotation options

It doesn't need the option in the struct annotation which is allocated
for each symbol.  It can directly use the global options and save 8
bytes per symbol.

Reviewed-by: Ian Rogers <irogers@google.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20231128175441.721579-9-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 09c399ab03843b6fc28228cc15bad044f47e4f75..c81fa0791918e8266a9e4f2dbbf1ea619de3b0b5 100644 (file)
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -3333,8 +3333,6 @@ int symbol__annotate2(struct map_symbol *ms, struct evsel *evsel,
        if (err)
                goto out_free_offsets;
 
-       notes->options = &annotate_opts;
-
        symbol__calc_percent(sym, evsel);
 
        annotation__set_offsets(notes, size);

diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index 6d5a6bb49a9759171e136e30c1008a4c7e01a4ad..589f8aaf023664621465487b7d76dc6950c612b7 100644 (file)
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -294,7 +294,6 @@ struct annotated_branch {
 
 struct LOCKABLE annotation {
        u64                     start;
-       struct annotation_options *options;
        int                     nr_events;
        int                     max_jump_sources;
        struct {