perf test: Use existing config value for objdump path

[PATCH] perf test: Use existing config value for objdump path

Posted by James Clark 2 years, 1 month ago

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>
---
 tools/perf/Documentation/perf-config.txt | 8 ++------
 tools/perf/tests/builtin-test.c          | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/tools/perf/Documentation/perf-config.txt b/tools/perf/Documentation/perf-config.txt
index 16398babd1ef..379f9d7a8ab1 100644
--- 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 113e92119e1d..b8c21e81a021 100644
--- 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;
-- 
2.34.1

Re: [PATCH] perf test: Use existing config value for objdump path

Posted by Namhyung Kim 2 years ago

Hello,

On Mon, Nov 13, 2023 at 2:23 AM James Clark <james.clark@arm.com> wrote:
>
> 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>

Thanks,
Namhyung

> ---
>  tools/perf/Documentation/perf-config.txt | 8 ++------
>  tools/perf/tests/builtin-test.c          | 2 +-
>  2 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/tools/perf/Documentation/perf-config.txt b/tools/perf/Documentation/perf-config.txt
> index 16398babd1ef..379f9d7a8ab1 100644
> --- 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 113e92119e1d..b8c21e81a021 100644
> --- 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;
> --
> 2.34.1
>

Re: [PATCH] perf test: Use existing config value for objdump path

Posted by Arnaldo Carvalho de Melo 2 years ago

Em Mon, Nov 20, 2023 at 12:48:38PM -0800, Namhyung Kim escreveu:
> Hello,
> 
> On Mon, Nov 13, 2023 at 2:23 AM James Clark <james.clark@arm.com> wrote:
> >
> > 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>

Thanks, applied to perf-tools-next.

- Arnaldo

 
> Thanks,
> Namhyung
> 
> > ---
> >  tools/perf/Documentation/perf-config.txt | 8 ++------
> >  tools/perf/tests/builtin-test.c          | 2 +-
> >  2 files changed, 3 insertions(+), 7 deletions(-)
> >
> > diff --git a/tools/perf/Documentation/perf-config.txt b/tools/perf/Documentation/perf-config.txt
> > index 16398babd1ef..379f9d7a8ab1 100644
> > --- 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 113e92119e1d..b8c21e81a021 100644
> > --- 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;
> > --
> > 2.34.1
> >

-- 

- Arnaldo