4 files changed, 52 insertions, 33 deletions

diff --git a/tools/perf/arch/arm64/annotate/instructions.c b/tools/perf/arch/arm64/annotate/instructions.c
index 76c6345a57d5..8f70a1b282df 100644
--- a/tools/perf/arch/arm64/annotate/instructions.c
+++ b/tools/perf/arch/arm64/annotate/instructions.c
@@ -58,7 +58,7 @@ out_free_source:
 }
 
 static int mov__scnprintf(struct ins *ins, char *bf, size_t size,
-                          struct ins_operands *ops);
+                          struct ins_operands *ops, int max_ins_name);
 
 static struct ins_ops arm64_mov_ops = {
         .parse     = arm64_mov__parse,
diff --git a/tools/perf/arch/s390/annotate/instructions.c b/tools/perf/arch/s390/annotate/instructions.c
index de0dd66dbb48..89bb8f2c54ce 100644
--- a/tools/perf/arch/s390/annotate/instructions.c
+++ b/tools/perf/arch/s390/annotate/instructions.c
@@ -46,7 +46,7 @@ static int s390_call__parse(struct arch *arch, struct ins_operands *ops,
 }
 
 static int call__scnprintf(struct ins *ins, char *bf, size_t size,
-                           struct ins_operands *ops);
+                           struct ins_operands *ops, int max_ins_name);
 
 static struct ins_ops s390_call_ops = {
         .parse     = s390_call__parse,
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 11a8a447a3af..5f6dbbf5d749 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -198,18 +198,18 @@ static void ins__delete(struct ins_operands *ops)
 }
 
 static int ins__raw_scnprintf(struct ins *ins, char *bf, size_t size,
-                              struct ins_operands *ops)
+                              struct ins_operands *ops, int max_ins_name)
 {
-        return scnprintf(bf, size, "%-6s %s", ins->name, ops->raw);
+        return scnprintf(bf, size, "%-*s %s", max_ins_name, ins->name, ops->raw);
 }
 
 int ins__scnprintf(struct ins *ins, char *bf, size_t size,
-                  struct ins_operands *ops)
+                   struct ins_operands *ops, int max_ins_name)
 {
         if (ins->ops->scnprintf)
-                return ins->ops->scnprintf(ins, bf, size, ops);
+                return ins->ops->scnprintf(ins, bf, size, ops, max_ins_name);
 
-        return ins__raw_scnprintf(ins, bf, size, ops);
+        return ins__raw_scnprintf(ins, bf, size, ops, max_ins_name);
 }
 
 bool ins__is_fused(struct arch *arch, const char *ins1, const char *ins2)
@@ -273,18 +273,18 @@ indirect_call:
 }
 
 static int call__scnprintf(struct ins *ins, char *bf, size_t size,
-                           struct ins_operands *ops)
+                           struct ins_operands *ops, int max_ins_name)
 {
         if (ops->target.sym)
-                return scnprintf(bf, size, "%-6s %s", ins->name, ops->target.sym->name);
+                return scnprintf(bf, size, "%-*s %s", max_ins_name, ins->name, ops->target.sym->name);
 
         if (ops->target.addr == 0)
-                return ins__raw_scnprintf(ins, bf, size, ops);
+                return ins__raw_scnprintf(ins, bf, size, ops, max_ins_name);
 
         if (ops->target.name)
-                return scnprintf(bf, size, "%-6s %s", ins->name, ops->target.name);
+                return scnprintf(bf, size, "%-*s %s", max_ins_name, ins->name, ops->target.name);
 
-        return scnprintf(bf, size, "%-6s *%" PRIx64, ins->name, ops->target.addr);
+        return scnprintf(bf, size, "%-*s *%" PRIx64, max_ins_name, ins->name, ops->target.addr);
 }
 
 static struct ins_ops call_ops = {
@@ -388,15 +388,15 @@ static int jump__parse(struct arch *arch, struct ins_operands *ops, struct map_s
 }
 
 static int jump__scnprintf(struct ins *ins, char *bf, size_t size,
-                           struct ins_operands *ops)
+                           struct ins_operands *ops, int max_ins_name)
 {
         const char *c;
 
         if (!ops->target.addr || ops->target.offset < 0)
-                return ins__raw_scnprintf(ins, bf, size, ops);
+                return ins__raw_scnprintf(ins, bf, size, ops, max_ins_name);
 
         if (ops->target.outside && ops->target.sym != NULL)
-                return scnprintf(bf, size, "%-6s %s", ins->name, ops->target.sym->name);
+                return scnprintf(bf, size, "%-*s %s", max_ins_name, ins->name, ops->target.sym->name);
 
         c = strchr(ops->raw, ',');
         c = validate_comma(c, ops);
@@ -415,7 +415,7 @@ static int jump__scnprintf(struct ins *ins, char *bf, size_t size,
                         c++;
         }
 
-        return scnprintf(bf, size, "%-6s %.*s%" PRIx64,
+        return scnprintf(bf, size, "%-*s %.*s%" PRIx64, max_ins_name,
                          ins->name, c ? c - ops->raw : 0, ops->raw,
                          ops->target.offset);
 }
@@ -483,16 +483,16 @@ out_free_ops:
 }
 
 static int lock__scnprintf(struct ins *ins, char *bf, size_t size,
-                           struct ins_operands *ops)
+                           struct ins_operands *ops, int max_ins_name)
 {
         int printed;
 
         if (ops->locked.ins.ops == NULL)
-                return ins__raw_scnprintf(ins, bf, size, ops);
+                return ins__raw_scnprintf(ins, bf, size, ops, max_ins_name);
 
-        printed = scnprintf(bf, size, "%-6s ", ins->name);
+        printed = scnprintf(bf, size, "%-*s ", max_ins_name, ins->name);
         return printed + ins__scnprintf(&ops->locked.ins, bf + printed,
-                                        size - printed, ops->locked.ops);
+                                        size - printed, ops->locked.ops, max_ins_name);
 }
 
 static void lock__delete(struct ins_operands *ops)
@@ -564,9 +564,9 @@ out_free_source:
 }
 
 static int mov__scnprintf(struct ins *ins, char *bf, size_t size,
-                           struct ins_operands *ops)
+                           struct ins_operands *ops, int max_ins_name)
 {
-        return scnprintf(bf, size, "%-6s %s,%s", ins->name,
+        return scnprintf(bf, size, "%-*s %s,%s", max_ins_name, ins->name,
                          ops->source.name ?: ops->source.raw,
                          ops->target.name ?: ops->target.raw);
 }
@@ -604,9 +604,9 @@ static int dec__parse(struct arch *arch __maybe_unused, struct ins_operands *ops
 }
 
 static int dec__scnprintf(struct ins *ins, char *bf, size_t size,
-                           struct ins_operands *ops)
+                           struct ins_operands *ops, int max_ins_name)
 {
-        return scnprintf(bf, size, "%-6s %s", ins->name,
+        return scnprintf(bf, size, "%-*s %s", max_ins_name, ins->name,
                          ops->target.name ?: ops->target.raw);
 }
 
@@ -616,9 +616,9 @@ static struct ins_ops dec_ops = {
 };
 
 static int nop__scnprintf(struct ins *ins __maybe_unused, char *bf, size_t size,
-                          struct ins_operands *ops __maybe_unused)
+                          struct ins_operands *ops __maybe_unused, int max_ins_name)
 {
-        return scnprintf(bf, size, "%-6s", "nop");
+        return scnprintf(bf, size, "%-*s", max_ins_name, "nop");
 }
 
 static struct ins_ops nop_ops = {
@@ -1232,12 +1232,12 @@ void disasm_line__free(struct disasm_line *dl)
         annotation_line__delete(&dl->al);
 }
 
-int disasm_line__scnprintf(struct disasm_line *dl, char *bf, size_t size, bool raw)
+int disasm_line__scnprintf(struct disasm_line *dl, char *bf, size_t size, bool raw, int max_ins_name)
 {
         if (raw || !dl->ins.ops)
-                return scnprintf(bf, size, "%-6s %s", dl->ins.name, dl->ops.raw);
+                return scnprintf(bf, size, "%-*s %s", max_ins_name, dl->ins.name, dl->ops.raw);
 
-        return ins__scnprintf(&dl->ins, bf, size, &dl->ops);
+        return ins__scnprintf(&dl->ins, bf, size, &dl->ops, max_ins_name);
 }
 
 static void annotation_line__add(struct annotation_line *al, struct list_head *head)
@@ -2414,12 +2414,30 @@ static inline int width_jumps(int n)
         return 1;
 }
 
+static int annotation__max_ins_name(struct annotation *notes)
+{
+        int max_name = 0, len;
+        struct annotation_line *al;
+
+        list_for_each_entry(al, &notes->src->source, node) {
+                if (al->offset == -1)
+                        continue;
+
+                len = strlen(disasm_line(al)->ins.name);
+                if (max_name < len)
+                        max_name = len;
+        }
+
+        return max_name;
+}
+
 void annotation__init_column_widths(struct annotation *notes, struct symbol *sym)
 {
         notes->widths.addr = notes->widths.target =
                 notes->widths.min_addr = hex_width(symbol__size(sym));
         notes->widths.max_addr = hex_width(sym->end);
         notes->widths.jumps = width_jumps(notes->max_jump_sources);
+        notes->widths.max_ins_name = annotation__max_ins_name(notes);
 }
 
 void annotation__update_column_widths(struct annotation *notes)
@@ -2583,7 +2601,7 @@ call_like:
                 obj__printf(obj, "  ");
         }
 
-        disasm_line__scnprintf(dl, bf, size, !notes->options->use_offset);
+        disasm_line__scnprintf(dl, bf, size, !notes->options->use_offset, notes->widths.max_ins_name);
 }
 
 static void ipc_coverage_string(char *bf, int size, struct annotation *notes)
diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index 95053cab41fe..df34fe483164 100644
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -59,14 +59,14 @@ struct ins_ops {
         void (*free)(struct ins_operands *ops);
         int (*parse)(struct arch *arch, struct ins_operands *ops, struct map_symbol *ms);
         int (*scnprintf)(struct ins *ins, char *bf, size_t size,
-                         struct ins_operands *ops);
+                         struct ins_operands *ops, int max_ins_name);
 };
 
 bool ins__is_jump(const struct ins *ins);
 bool ins__is_call(const struct ins *ins);
 bool ins__is_ret(const struct ins *ins);
 bool ins__is_lock(const struct ins *ins);
-int ins__scnprintf(struct ins *ins, char *bf, size_t size, struct ins_operands *ops);
+int ins__scnprintf(struct ins *ins, char *bf, size_t size, struct ins_operands *ops, int max_ins_name);
 bool ins__is_fused(struct arch *arch, const char *ins1, const char *ins2);
 
 #define ANNOTATION__IPC_WIDTH 6
@@ -219,7 +219,7 @@ int __annotation__scnprintf_samples_period(struct annotation *notes,
                                            struct perf_evsel *evsel,
                                            bool show_freq);
 
-int disasm_line__scnprintf(struct disasm_line *dl, char *bf, size_t size, bool raw);
+int disasm_line__scnprintf(struct disasm_line *dl, char *bf, size_t size, bool raw, int max_ins_name);
 size_t disasm__fprintf(struct list_head *head, FILE *fp);
 void symbol__calc_percent(struct symbol *sym, struct perf_evsel *evsel);
 
@@ -289,6 +289,7 @@ struct annotation {
                 u8              target;
                 u8              min_addr;
                 u8              max_addr;
+                u8              max_ins_name;
         } widths;
         bool                    have_cycles;
         struct annotated_source *src;