perf disasm: Constify use of 'struct ins'

The 'struct ins' holds variables that are read but not written, except
during some initialization.

Change most uses to be for a "const struct ins *" version to capture
this immutability.

So the x86__instructions can be const pre-sort it and make the sorted
variable true.

Reviewed-by: James Clark <james.clark@linaro.org>
Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Aditya Bodkhe <aditya.b1@linux.ibm.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: Athira Rajeev <atrajeev@linux.ibm.com>
Cc: Bill Wendling <morbo@google.com>
Cc: Dr. David Alan Gilbert <linux@treblig.org>
Cc: Guo Ren <guoren@kernel.org>
Cc: Howard Chu <howardchu95@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Julia Lawall <Julia.Lawall@inria.fr>
Cc: Justin Stitt <justinstitt@google.com>
Cc: Krzysztof Łopatowski <krzysztof.m.lopatowski@gmail.com>
Cc: Leo Yan <leo.yan@linux.dev>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <nick.desaulniers+lkml@gmail.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Walmsley <pjw@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sergei Trofimovich <slyich@gmail.com>
Cc: Shimin Guo <shimin.guo@skydio.com>
Cc: Suchit Karunakaran <suchitkarunakaran@gmail.com>
Cc: Thomas Falcon <thomas.falcon@intel.com>
Cc: Tianyou Li <tianyou.li@intel.com>
Cc: Will Deacon <will@kernel.org>
Cc: Zecheng Li <zecheng@google.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/arch/arm64/annotate/instructions.c b/tools/perf/arch/arm64/annotate/instructions.c
index 363af2f551221e52d06c8bc314cb04f8452d29f6..44db33854dbaca7faf8d647c9c25d326b76e69b0 100644 (file)
--- a/tools/perf/arch/arm64/annotate/instructions.c
+++ b/tools/perf/arch/arm64/annotate/instructions.c
@@ -60,7 +60,7 @@ out_free_source:
        return -1;
 }
 
-static int mov__scnprintf(struct ins *ins, char *bf, size_t size,
+static int mov__scnprintf(const struct ins *ins, char *bf, size_t size,
                          struct ins_operands *ops, int max_ins_name);
 
 static const struct ins_ops arm64_mov_ops = {

diff --git a/tools/perf/arch/x86/annotate/instructions.c b/tools/perf/arch/x86/annotate/instructions.c
index 24b388bacdae151795e40b17378451d480cc8c56..ffca3029388b48a7454f4ad7d7ba2844050e0e11 100644 (file)
--- a/tools/perf/arch/x86/annotate/instructions.c
+++ b/tools/perf/arch/x86/annotate/instructions.c
@@ -7,7 +7,7 @@
  * So this table should not have entries with the suffix unless it's
  * a complete different instruction than ones without the suffix.
  */
-static struct ins x86__instructions[] = {
+static const struct ins x86__instructions[] = {
        { .name = "adc",        .ops = &mov_ops,  },
        { .name = "add",        .ops = &mov_ops,  },
        { .name = "addsd",      .ops = &mov_ops,  },
@@ -19,9 +19,9 @@ static struct ins x86__instructions[] = {
        { .name = "btr",        .ops = &mov_ops,  },
        { .name = "bts",        .ops = &mov_ops,  },
        { .name = "call",       .ops = &call_ops, },
+       { .name = "cmovae",     .ops = &mov_ops,  },
        { .name = "cmovbe",     .ops = &mov_ops,  },
        { .name = "cmove",      .ops = &mov_ops,  },
-       { .name = "cmovae",     .ops = &mov_ops,  },
        { .name = "cmp",        .ops = &mov_ops,  },
        { .name = "cmpxch",     .ops = &mov_ops,  },
        { .name = "cmpxchg",    .ops = &mov_ops,  },
@@ -73,23 +73,23 @@ static struct ins x86__instructions[] = {
        { .name = "movaps",     .ops = &mov_ops,  },
        { .name = "movdqa",     .ops = &mov_ops,  },
        { .name = "movdqu",     .ops = &mov_ops,  },
+       { .name = "movsb",      .ops = &mov_ops,  },
        { .name = "movsd",      .ops = &mov_ops,  },
+       { .name = "movsl",      .ops = &mov_ops,  },
        { .name = "movss",      .ops = &mov_ops,  },
-       { .name = "movsb",      .ops = &mov_ops,  },
        { .name = "movsw",      .ops = &mov_ops,  },
-       { .name = "movsl",      .ops = &mov_ops,  },
        { .name = "movupd",     .ops = &mov_ops,  },
        { .name = "movups",     .ops = &mov_ops,  },
        { .name = "movzb",      .ops = &mov_ops,  },
-       { .name = "movzw",      .ops = &mov_ops,  },
        { .name = "movzl",      .ops = &mov_ops,  },
+       { .name = "movzw",      .ops = &mov_ops,  },
        { .name = "mulsd",      .ops = &mov_ops,  },
        { .name = "mulss",      .ops = &mov_ops,  },
        { .name = "nop",        .ops = &nop_ops,  },
        { .name = "or",         .ops = &mov_ops,  },
        { .name = "orps",       .ops = &mov_ops,  },
-       { .name = "pand",       .ops = &mov_ops,  },
        { .name = "paddq",      .ops = &mov_ops,  },
+       { .name = "pand",       .ops = &mov_ops,  },
        { .name = "pcmpeqb",    .ops = &mov_ops,  },
        { .name = "por",        .ops = &mov_ops,  },
        { .name = "rcl",        .ops = &mov_ops,  },
@@ -202,6 +202,20 @@ static int x86__annotate_init(struct arch *arch, char *cpuid)
                if (x86__cpuid_parse(arch, cpuid))
                        err = SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_CPUID_PARSING;
        }
+
+#ifndef NDEBUG
+       {
+               static bool sorted_check;
+
+               if (!sorted_check) {
+                       for (size_t i = 0; i < arch->nr_instructions - 1; i++) {
+                               assert(strcmp(arch->instructions[i].name,
+                                             arch->instructions[i + 1].name) <= 0);
+                       }
+                       sorted_check = true;
+               }
+       }
+#endif
        arch->e_machine = EM_X86_64;
        arch->e_flags = 0;
        arch->initialized = true;

diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c
index 9bc9b1de98db755abde4eacdeb64d7ca13ed8d80..2793697ce75c7b59dde6151ae43be4e3a6aff6e5 100644 (file)
--- a/tools/perf/util/disasm.c
+++ b/tools/perf/util/disasm.c
@@ -43,9 +43,9 @@ static const struct ins_ops ret_ops;
 static const struct ins_ops load_store_ops;
 static const struct ins_ops arithmetic_ops;
 
-static int jump__scnprintf(struct ins *ins, char *bf, size_t size,
+static int jump__scnprintf(const struct ins *ins, char *bf, size_t size,
                           struct ins_operands *ops, int max_ins_name);
-static int call__scnprintf(struct ins *ins, char *bf, size_t size,
+static int call__scnprintf(const struct ins *ins, char *bf, size_t size,
                           struct ins_operands *ops, int max_ins_name);
 
 static void ins__sort(struct arch *arch);
@@ -66,7 +66,8 @@ static int arch__grow_instructions(struct arch *arch)
                goto grow_from_non_allocated_table;
 
        new_nr_allocated = arch->nr_instructions_allocated + 128;
-       new_instructions = realloc(arch->instructions, new_nr_allocated * sizeof(struct ins));
+       new_instructions = realloc((void *)arch->instructions,
+                                  new_nr_allocated * sizeof(struct ins));
        if (new_instructions == NULL)
                return -1;
 
@@ -93,7 +94,7 @@ static int arch__associate_ins_ops(struct arch *arch, const char *name, const st
            arch__grow_instructions(arch))
                return -1;
 
-       ins = &arch->instructions[arch->nr_instructions];
+       ins = (struct ins *)&arch->instructions[arch->nr_instructions];
        ins->name = strdup(name);
        if (!ins->name)
                return -1;
@@ -146,6 +147,7 @@ static struct arch architectures[] = {
                .init = x86__annotate_init,
                .instructions = x86__instructions,
                .nr_instructions = ARRAY_SIZE(x86__instructions),
+               .sorted_instructions = true,
                .insn_suffix = "bwlq",
                .objdump =  {
                        .comment_char = '#',
@@ -241,13 +243,13 @@ static void ins_ops__delete(struct ins_operands *ops)
        zfree(&ops->target.name);
 }
 
-static int ins__raw_scnprintf(struct ins *ins, char *bf, size_t size,
+static int ins__raw_scnprintf(const struct ins *ins, char *bf, size_t size,
                              struct ins_operands *ops, int max_ins_name)
 {
        return scnprintf(bf, size, "%-*s %s", max_ins_name, ins->name, ops->raw);
 }
 
-static int ins__scnprintf(struct ins *ins, char *bf, size_t size,
+static int ins__scnprintf(const struct ins *ins, char *bf, size_t size,
                          struct ins_operands *ops, int max_ins_name)
 {
        if (ins->ops->scnprintf)
@@ -319,7 +321,7 @@ indirect_call:
        goto find_target;
 }
 
-static int call__scnprintf(struct ins *ins, char *bf, size_t size,
+static int call__scnprintf(const struct ins *ins, char *bf, size_t size,
                           struct ins_operands *ops, int max_ins_name)
 {
        if (ops->target.sym)
@@ -446,7 +448,7 @@ static int jump__parse(const struct arch *arch, struct ins_operands *ops, struct
        return 0;
 }
 
-static int jump__scnprintf(struct ins *ins, char *bf, size_t size,
+static int jump__scnprintf(const struct ins *ins, char *bf, size_t size,
                           struct ins_operands *ops, int max_ins_name)
 {
        const char *c;
@@ -551,7 +553,7 @@ out_free_ops:
        return 0;
 }
 
-static int lock__scnprintf(struct ins *ins, char *bf, size_t size,
+static int lock__scnprintf(const struct ins *ins, char *bf, size_t size,
                           struct ins_operands *ops, int max_ins_name)
 {
        int printed;
@@ -680,7 +682,7 @@ out_free_source:
        return -1;
 }
 
-static int mov__scnprintf(struct ins *ins, char *bf, size_t size,
+static int mov__scnprintf(const struct ins *ins, char *bf, size_t size,
                           struct ins_operands *ops, int max_ins_name)
 {
        return scnprintf(bf, size, "%-*s %s,%s", max_ins_name, ins->name,
@@ -699,7 +701,7 @@ static const struct ins_ops mov_ops = {
 #define        ADD_ZERO_EXT_XO_FORM    202
 #define        SUB_ZERO_EXT_XO_FORM    200
 
-static int arithmetic__scnprintf(struct ins *ins, char *bf, size_t size,
+static int arithmetic__scnprintf(const struct ins *ins, char *bf, size_t size,
                struct ins_operands *ops, int max_ins_name)
 {
        return scnprintf(bf, size, "%-*s %s", max_ins_name, ins->name,
@@ -743,7 +745,7 @@ static const struct ins_ops arithmetic_ops = {
        .scnprintf = arithmetic__scnprintf,
 };
 
-static int load_store__scnprintf(struct ins *ins, char *bf, size_t size,
+static int load_store__scnprintf(const struct ins *ins, char *bf, size_t size,
                struct ins_operands *ops, int max_ins_name)
 {
        return scnprintf(bf, size, "%-*s %s", max_ins_name, ins->name,
@@ -806,7 +808,7 @@ static int dec__parse(const struct arch *arch __maybe_unused, struct ins_operand
        return 0;
 }
 
-static int dec__scnprintf(struct ins *ins, char *bf, size_t size,
+static int dec__scnprintf(const struct ins *ins, char *bf, size_t size,
                           struct ins_operands *ops, int max_ins_name)
 {
        return scnprintf(bf, size, "%-*s %s", max_ins_name, ins->name,
@@ -818,7 +820,7 @@ static const struct ins_ops dec_ops = {
        .scnprintf = dec__scnprintf,
 };
 
-static int nop__scnprintf(struct ins *ins __maybe_unused, char *bf, size_t size,
+static int nop__scnprintf(const struct ins *ins __maybe_unused, char *bf, size_t size,
                          struct ins_operands *ops __maybe_unused, int max_ins_name)
 {
        return scnprintf(bf, size, "%-*s", max_ins_name, "nop");
@@ -866,7 +868,7 @@ static void ins__sort(struct arch *arch)
 {
        const int nmemb = arch->nr_instructions;
 
-       qsort(arch->instructions, nmemb, sizeof(struct ins), ins__cmp);
+       qsort((void *)arch->instructions, nmemb, sizeof(struct ins), ins__cmp);
 }
 
 static const struct ins_ops *__ins__find(const struct arch *arch, const char *name,

diff --git a/tools/perf/util/disasm.h b/tools/perf/util/disasm.h
index dc5233f2a773e8a78afd7c44af93967fed3ef4d8..4f5c9a985786688c090ffc08fb5c70f70d3c39de 100644 (file)
--- a/tools/perf/util/disasm.h
+++ b/tools/perf/util/disasm.h
@@ -19,7 +19,7 @@ struct disasm_line;
 
 struct arch {
        const char      *name;
-       struct ins      *instructions;
+       const struct ins        *instructions;
        size_t          nr_instructions;
        size_t          nr_instructions_allocated;
        const struct ins_ops  *(*associate_instruction_ops)(struct arch *arch, const char *name);
@@ -91,7 +91,7 @@ struct ins_ops {
        void (*free)(struct ins_operands *ops);
        int (*parse)(const struct arch *arch, struct ins_operands *ops, struct map_symbol *ms,
                        struct disasm_line *dl);
-       int (*scnprintf)(struct ins *ins, char *bf, size_t size,
+       int (*scnprintf)(const struct ins *ins, char *bf, size_t size,
                         struct ins_operands *ops, int max_ins_name);
 };