perf test: Use existing config value for objdump path

There is already an existing config value for changing the objdump path,
so instead of having two values that do the same thing, make 'perf test'
use annotate.objdump as well.

Signed-off-by: James Clark <james.clark@arm.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Fangrui Song <maskray@google.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Yang Jihong <yangjihong1@huawei.com>
Cc: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/r/ZU5Cx4LTrB5q0sIG@kernel.org
Link: https://lore.kernel.org/r/20231113102327.695386-1-james.clark@arm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/Documentation/perf-config.txt b/tools/perf/Documentation/perf-config.txt
index 16398babd1ef5b1a3e2291961fe56d4cdcb0455f..379f9d7a8ab11a029e602bde77d57a0ef7785f79 100644 (file)
--- a/tools/perf/Documentation/perf-config.txt
+++ b/tools/perf/Documentation/perf-config.txt
@@ -251,7 +251,8 @@ annotate.*::
                addr2line binary to use for file names and line numbers.
 
        annotate.objdump::
-               objdump binary to use for disassembly and annotations.
+               objdump binary to use for disassembly and annotations,
+               including in the 'perf test' command.
 
        annotate.disassembler_style::
                Use this to change the default disassembler style to some other value
@@ -722,11 +723,6 @@ session-<NAME>.*::
                Defines new record session for daemon. The value is record's
                command line without the 'record' keyword.
 
-test.*::
-
-       test.objdump::
-               objdump binary to use for disassembly and annotations.
-
 SEE ALSO
 --------
 linkperf:perf[1]

diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index 113e92119e1d1dd9793c2bcefc8c98fbb838414e..b8c21e81a021be581a7711f6692667509891792d 100644 (file)
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -518,7 +518,7 @@ static int run_workload(const char *work, int argc, const char **argv)
 static int perf_test__config(const char *var, const char *value,
                             void *data __maybe_unused)
 {
-       if (!strcmp(var, "test.objdump"))
+       if (!strcmp(var, "annotate.objdump"))
                test_objdump_path = value;
 
        return 0;