perf annotate: Move raw_comment and raw_func_start fields out of 'struct ins_operands'

Thoese two fields are used only for the jump_ops, so move them into the
union to save some bytes.  Also add jump__delete() callback not to free
the fields as they didn't allocate new strings.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: WANG Rui <wangrui@loongson.cn>
Cc: linux-toolchains@vger.kernel.org
Cc: linux-trace-devel@vger.kernel.org
Link: https://lore.kernel.org/r/20231110000012.3538610-3-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/arch/loongarch/annotate/instructions.c b/tools/perf/arch/loongarch/annotate/instructions.c
index 98e19c5366acfd628fb7cf979e295f01119114a8..21cc7e4149f721d7d0a28f715df89a991fc3d606 100644 (file)
--- a/tools/perf/arch/loongarch/annotate/instructions.c
+++ b/tools/perf/arch/loongarch/annotate/instructions.c
@@ -61,10 +61,10 @@ static int loongarch_jump__parse(struct arch *arch, struct ins_operands *ops, st
        const char *c = strchr(ops->raw, '#');
        u64 start, end;
 
-       ops->raw_comment = strchr(ops->raw, arch->objdump.comment_char);
-       ops->raw_func_start = strchr(ops->raw, '<');
+       ops->jump.raw_comment = strchr(ops->raw, arch->objdump.comment_char);
+       ops->jump.raw_func_start = strchr(ops->raw, '<');
 
-       if (ops->raw_func_start && c > ops->raw_func_start)
+       if (ops->jump.raw_func_start && c > ops->jump.raw_func_start)
                c = NULL;
 
        if (c++ != NULL)

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 118195c787b940155dd10ff68bb3b7e2ce4351e9..3364edf30f50e84a10f760d9941dd97438235a30 100644 (file)
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -340,10 +340,10 @@ bool ins__is_call(const struct ins *ins)
  */
 static inline const char *validate_comma(const char *c, struct ins_operands *ops)
 {
-       if (ops->raw_comment && c > ops->raw_comment)
+       if (ops->jump.raw_comment && c > ops->jump.raw_comment)
                return NULL;
 
-       if (ops->raw_func_start && c > ops->raw_func_start)
+       if (ops->jump.raw_func_start && c > ops->jump.raw_func_start)
                return NULL;
 
        return c;
@@ -359,8 +359,8 @@ static int jump__parse(struct arch *arch, struct ins_operands *ops, struct map_s
        const char *c = strchr(ops->raw, ',');
        u64 start, end;
 
-       ops->raw_comment = strchr(ops->raw, arch->objdump.comment_char);
-       ops->raw_func_start = strchr(ops->raw, '<');
+       ops->jump.raw_comment = strchr(ops->raw, arch->objdump.comment_char);
+       ops->jump.raw_func_start = strchr(ops->raw, '<');
 
        c = validate_comma(c, ops);
 
@@ -462,7 +462,16 @@ static int jump__scnprintf(struct ins *ins, char *bf, size_t size,
                         ops->target.offset);
 }
 
+static void jump__delete(struct ins_operands *ops __maybe_unused)
+{
+       /*
+        * The ops->jump.raw_comment and ops->jump.raw_func_start belong to the
+        * raw string, don't free them.
+        */
+}
+
 static struct ins_ops jump_ops = {
+       .free      = jump__delete,
        .parse     = jump__parse,
        .scnprintf = jump__scnprintf,
 };

diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index de59c1aff08e8f21e08a5c7cb7a3b92622249303..bc8b95e8b1be1e43d379b2f1a5f015eb69f25216 100644 (file)
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -31,8 +31,6 @@ struct ins {
 
 struct ins_operands {
        char    *raw;
-       char    *raw_comment;
-       char    *raw_func_start;
        struct {
                char    *raw;
                char    *name;
@@ -52,6 +50,10 @@ struct ins_operands {
                        struct ins          ins;
                        struct ins_operands *ops;
                } locked;
+               struct {
+                       char    *raw_comment;
+                       char    *raw_func_start;
+               } jump;
        };
 };