1. Patchew
  2. linux
  3. [PATCH 0/2 perf-tools-next] 'perf test python' fixes/improvements
  4. View patch

[PATCH 2/2] perf test: Don't build the python binding builtin test case with NO_LIBPYTHON=1

Arnaldo Carvalho de Melo posted 2 patches 2 weeks, 5 days ago
[PATCH 2/2] perf test: Don't build the python binding builtin test case with NO_LIBPYTHON=1
Posted by Arnaldo Carvalho de Melo 2 weeks, 5 days ago 
From: Arnaldo Carvalho de Melo <acme@redhat.com>

The python_use test suite was being built even when the python binding
that it is designed to test is not being built, fix it.

Testing this patch:

When building with NO_LIBPYTHON=1, i.e. explicitely disabling linking
against libpython and thus not building the python binding:

  $ perf check feature libpython
             libpython: [ OFF ]  # HAVE_LIBPYTHON_SUPPORT
  $ perf test "import perf"
  $

Not disabling linking with libpython, the default, that results in the
python binding being built:

  $ perf check feature libpython
               libpython: [ on  ]  # HAVE_LIBPYTHON_SUPPORT
  $ perf test "import perf"
   17: 'import perf' in python                                         : Ok
  $ perf test -vv "import perf"
  Couldn't bump rlimit(MEMLOCK), failures may take place when creating BPF maps, etc
   17: 'import perf' in python:
  --- start ---
  test child forked, pid 533419
  python usage test: "'/usr/bin/python3' -c "import sys ; sys.path.insert(0, '/tmp/build/perf-tools-next/python'); import perf" "
  ---- end(0) ----
   17: 'import perf' in python                                         : Ok
  $ strace -s1024 -f -e execve perf test 17
  execve("/home/acme/bin/perf", ["perf", "test", "17"], 0x7ffe04832040 /* 38 vars */) = 0
  strace: Process 533458 attached
   17: 'import perf' in python                                         : Running (1 active)
  strace: Process 533459 attached
  [pid 533459] execve("/bin/sh", ["sh", "-c", "--", "'/usr/bin/python3' -c \"import sys ; sys.path.insert(0, '/tmp/build/perf-tools-next/python'); import perf\" 2> /dev/null"], 0x133179a0 /* 40 vars */) = 0
  strace: Process 533460 attached
  [pid 533460] execve("/usr/bin/python3", ["/usr/bin/python3", "-c", "import sys ; sys.path.insert(0, '/tmp/build/perf-tools-next/python'); import perf"], 0x5566715c7280 /* 40 vars */) = 0
  [pid 533460] +++ exited with 0 +++
  [pid 533459] --- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED, si_pid=533460, si_uid=1000, si_status=0, si_utime=4 /* 0.04 s */, si_stime=2 /* 0.02 s */} ---
  [pid 533459] +++ exited with 0 +++
  [pid 533458] --- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED, si_pid=533459, si_uid=1000, si_status=0, si_utime=0, si_stime=0} ---
  [pid 533458] +++ exited with 0 +++
   17: 'import perf' in python                                         : Ok
  +++ exited with 0 +++
  $

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Howard Chu <howardchu95@gmail.com>
Cc: Ian Rogers <irogers@google.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linux.dev>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Veronika Molnarova <vmolnaro@redhat.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/tests/Build          | 2 +-
 tools/perf/tests/builtin-test.c | 2 ++
 tools/perf/tests/tests.h        | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build
index 01ed9335db4dba4e..8596616907adf244 100644
--- a/tools/perf/tests/Build
+++ b/tools/perf/tests/Build
@@ -20,7 +20,7 @@ perf-test-y += hists_link.o
 perf-test-y += hists_filter.o
 perf-test-y += hists_output.o
 perf-test-y += hists_cumulate.o
-perf-test-y += python-use.o
+perf-test-$(CONFIG_LIBPYTHON) += python-use.o
 perf-test-y += bp_signal.o
 perf-test-y += bp_signal_overflow.o
 perf-test-y += bp_account.o
diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index d2cabaa8ad922d68..13f7b24694d1d0b0 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -79,7 +79,9 @@ static struct test_suite *generic_tests[] = {
 	&suite__syscall_openat_tp_fields,
 #endif
 	&suite__hists_link,
+#ifdef HAVE_LIBPYTHON_SUPPORT
 	&suite__python_use,
+#endif
 	&suite__bp_signal,
 	&suite__bp_signal_overflow,
 	&suite__bp_accounting,
diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
index af284dd47e5c7855..3144c7916532825c 100644
--- a/tools/perf/tests/tests.h
+++ b/tools/perf/tests/tests.h
@@ -99,7 +99,9 @@ DECLARE_SUITE(dso_data_cache);
 DECLARE_SUITE(dso_data_reopen);
 DECLARE_SUITE(parse_events);
 DECLARE_SUITE(hists_link);
+#ifdef HAVE_LIBPYTHON_SUPPORT
 DECLARE_SUITE(python_use);
+#endif
 DECLARE_SUITE(bp_signal);
 DECLARE_SUITE(bp_signal_overflow);
 DECLARE_SUITE(bp_accounting);
-- 
2.47.0
Re: [PATCH 2/2] perf test: Don't build the python binding builtin test case with NO_LIBPYTHON=1
Posted by Namhyung Kim 2 weeks, 5 days ago 
On Mon, Nov 04, 2024 at 02:59:53PM -0300, Arnaldo Carvalho de Melo wrote:
> From: Arnaldo Carvalho de Melo <acme@redhat.com>
> 
> The python_use test suite was being built even when the python binding
> that it is designed to test is not being built, fix it.

Can we keep the test and skip it instead?  It'd be helpful to maintain
the test number consistent and to give a clear message why it skipped.

Thanks,
Namhyung

> 
> Testing this patch:
> 
> When building with NO_LIBPYTHON=1, i.e. explicitely disabling linking
> against libpython and thus not building the python binding:
> 
>   $ perf check feature libpython
>              libpython: [ OFF ]  # HAVE_LIBPYTHON_SUPPORT
>   $ perf test "import perf"
>   $
> 
> Not disabling linking with libpython, the default, that results in the
> python binding being built:
> 
>   $ perf check feature libpython
>                libpython: [ on  ]  # HAVE_LIBPYTHON_SUPPORT
>   $ perf test "import perf"
>    17: 'import perf' in python                                         : Ok
>   $ perf test -vv "import perf"
>   Couldn't bump rlimit(MEMLOCK), failures may take place when creating BPF maps, etc
>    17: 'import perf' in python:
>   --- start ---
>   test child forked, pid 533419
>   python usage test: "'/usr/bin/python3' -c "import sys ; sys.path.insert(0, '/tmp/build/perf-tools-next/python'); import perf" "
>   ---- end(0) ----
>    17: 'import perf' in python                                         : Ok
>   $ strace -s1024 -f -e execve perf test 17
>   execve("/home/acme/bin/perf", ["perf", "test", "17"], 0x7ffe04832040 /* 38 vars */) = 0
>   strace: Process 533458 attached
>    17: 'import perf' in python                                         : Running (1 active)
>   strace: Process 533459 attached
>   [pid 533459] execve("/bin/sh", ["sh", "-c", "--", "'/usr/bin/python3' -c \"import sys ; sys.path.insert(0, '/tmp/build/perf-tools-next/python'); import perf\" 2> /dev/null"], 0x133179a0 /* 40 vars */) = 0
>   strace: Process 533460 attached
>   [pid 533460] execve("/usr/bin/python3", ["/usr/bin/python3", "-c", "import sys ; sys.path.insert(0, '/tmp/build/perf-tools-next/python'); import perf"], 0x5566715c7280 /* 40 vars */) = 0
>   [pid 533460] +++ exited with 0 +++
>   [pid 533459] --- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED, si_pid=533460, si_uid=1000, si_status=0, si_utime=4 /* 0.04 s */, si_stime=2 /* 0.02 s */} ---
>   [pid 533459] +++ exited with 0 +++
>   [pid 533458] --- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED, si_pid=533459, si_uid=1000, si_status=0, si_utime=0, si_stime=0} ---
>   [pid 533458] +++ exited with 0 +++
>    17: 'import perf' in python                                         : Ok
>   +++ exited with 0 +++
>   $
> 
> Cc: Adrian Hunter <adrian.hunter@intel.com>
> Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
> Cc: Howard Chu <howardchu95@gmail.com>
> Cc: Ian Rogers <irogers@google.com>
> Cc: James Clark <james.clark@linaro.org>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Kan Liang <kan.liang@linux.intel.com>
> Cc: Leo Yan <leo.yan@linux.dev>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Cc: Thomas Richter <tmricht@linux.ibm.com>
> Cc: Veronika Molnarova <vmolnaro@redhat.com>
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> ---
>  tools/perf/tests/Build          | 2 +-
>  tools/perf/tests/builtin-test.c | 2 ++
>  tools/perf/tests/tests.h        | 2 ++
>  3 files changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build
> index 01ed9335db4dba4e..8596616907adf244 100644
> --- a/tools/perf/tests/Build
> +++ b/tools/perf/tests/Build
> @@ -20,7 +20,7 @@ perf-test-y += hists_link.o
>  perf-test-y += hists_filter.o
>  perf-test-y += hists_output.o
>  perf-test-y += hists_cumulate.o
> -perf-test-y += python-use.o
> +perf-test-$(CONFIG_LIBPYTHON) += python-use.o
>  perf-test-y += bp_signal.o
>  perf-test-y += bp_signal_overflow.o
>  perf-test-y += bp_account.o
> diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
> index d2cabaa8ad922d68..13f7b24694d1d0b0 100644
> --- a/tools/perf/tests/builtin-test.c
> +++ b/tools/perf/tests/builtin-test.c
> @@ -79,7 +79,9 @@ static struct test_suite *generic_tests[] = {
>  	&suite__syscall_openat_tp_fields,
>  #endif
>  	&suite__hists_link,
> +#ifdef HAVE_LIBPYTHON_SUPPORT
>  	&suite__python_use,
> +#endif
>  	&suite__bp_signal,
>  	&suite__bp_signal_overflow,
>  	&suite__bp_accounting,
> diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
> index af284dd47e5c7855..3144c7916532825c 100644
> --- a/tools/perf/tests/tests.h
> +++ b/tools/perf/tests/tests.h
> @@ -99,7 +99,9 @@ DECLARE_SUITE(dso_data_cache);
>  DECLARE_SUITE(dso_data_reopen);
>  DECLARE_SUITE(parse_events);
>  DECLARE_SUITE(hists_link);
> +#ifdef HAVE_LIBPYTHON_SUPPORT
>  DECLARE_SUITE(python_use);
> +#endif
>  DECLARE_SUITE(bp_signal);
>  DECLARE_SUITE(bp_signal_overflow);
>  DECLARE_SUITE(bp_accounting);
> -- 
> 2.47.0
>
Re: [PATCH 2/2] perf test: Don't build the python binding builtin test case with NO_LIBPYTHON=1
Posted by Ian Rogers 2 weeks, 5 days ago 
On Mon, Nov 4, 2024 at 10:00 AM Arnaldo Carvalho de Melo
<acme@kernel.org> wrote:
>
> From: Arnaldo Carvalho de Melo <acme@redhat.com>
>
> The python_use test suite was being built even when the python binding
> that it is designed to test is not being built, fix it.

The python module that the test is testing isn't strictly using
libpython.so, that's `perf script`. Perhaps there needs to be more
than 1 overloaded #define.

Reviewed-by: Ian Rogers <irogers@google.com>

Thanks,
Ian

> Testing this patch:
>
> When building with NO_LIBPYTHON=1, i.e. explicitely disabling linking
> against libpython and thus not building the python binding:
>
>   $ perf check feature libpython
>              libpython: [ OFF ]  # HAVE_LIBPYTHON_SUPPORT
>   $ perf test "import perf"
>   $
>
> Not disabling linking with libpython, the default, that results in the
> python binding being built:
>
>   $ perf check feature libpython
>                libpython: [ on  ]  # HAVE_LIBPYTHON_SUPPORT
>   $ perf test "import perf"
>    17: 'import perf' in python                                         : Ok
>   $ perf test -vv "import perf"
>   Couldn't bump rlimit(MEMLOCK), failures may take place when creating BPF maps, etc
>    17: 'import perf' in python:
>   --- start ---
>   test child forked, pid 533419
>   python usage test: "'/usr/bin/python3' -c "import sys ; sys.path.insert(0, '/tmp/build/perf-tools-next/python'); import perf" "
>   ---- end(0) ----
>    17: 'import perf' in python                                         : Ok
>   $ strace -s1024 -f -e execve perf test 17
>   execve("/home/acme/bin/perf", ["perf", "test", "17"], 0x7ffe04832040 /* 38 vars */) = 0
>   strace: Process 533458 attached
>    17: 'import perf' in python                                         : Running (1 active)
>   strace: Process 533459 attached
>   [pid 533459] execve("/bin/sh", ["sh", "-c", "--", "'/usr/bin/python3' -c \"import sys ; sys.path.insert(0, '/tmp/build/perf-tools-next/python'); import perf\" 2> /dev/null"], 0x133179a0 /* 40 vars */) = 0
>   strace: Process 533460 attached
>   [pid 533460] execve("/usr/bin/python3", ["/usr/bin/python3", "-c", "import sys ; sys.path.insert(0, '/tmp/build/perf-tools-next/python'); import perf"], 0x5566715c7280 /* 40 vars */) = 0
>   [pid 533460] +++ exited with 0 +++
>   [pid 533459] --- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED, si_pid=533460, si_uid=1000, si_status=0, si_utime=4 /* 0.04 s */, si_stime=2 /* 0.02 s */} ---
>   [pid 533459] +++ exited with 0 +++
>   [pid 533458] --- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED, si_pid=533459, si_uid=1000, si_status=0, si_utime=0, si_stime=0} ---
>   [pid 533458] +++ exited with 0 +++
>    17: 'import perf' in python                                         : Ok
>   +++ exited with 0 +++
>   $
>
> Cc: Adrian Hunter <adrian.hunter@intel.com>
> Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
> Cc: Howard Chu <howardchu95@gmail.com>
> Cc: Ian Rogers <irogers@google.com>
> Cc: James Clark <james.clark@linaro.org>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Kan Liang <kan.liang@linux.intel.com>
> Cc: Leo Yan <leo.yan@linux.dev>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Cc: Thomas Richter <tmricht@linux.ibm.com>
> Cc: Veronika Molnarova <vmolnaro@redhat.com>
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> ---
>  tools/perf/tests/Build          | 2 +-
>  tools/perf/tests/builtin-test.c | 2 ++
>  tools/perf/tests/tests.h        | 2 ++
>  3 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build
> index 01ed9335db4dba4e..8596616907adf244 100644
> --- a/tools/perf/tests/Build
> +++ b/tools/perf/tests/Build
> @@ -20,7 +20,7 @@ perf-test-y += hists_link.o
>  perf-test-y += hists_filter.o
>  perf-test-y += hists_output.o
>  perf-test-y += hists_cumulate.o
> -perf-test-y += python-use.o
> +perf-test-$(CONFIG_LIBPYTHON) += python-use.o
>  perf-test-y += bp_signal.o
>  perf-test-y += bp_signal_overflow.o
>  perf-test-y += bp_account.o
> diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
> index d2cabaa8ad922d68..13f7b24694d1d0b0 100644
> --- a/tools/perf/tests/builtin-test.c
> +++ b/tools/perf/tests/builtin-test.c
> @@ -79,7 +79,9 @@ static struct test_suite *generic_tests[] = {
>         &suite__syscall_openat_tp_fields,
>  #endif
>         &suite__hists_link,
> +#ifdef HAVE_LIBPYTHON_SUPPORT
>         &suite__python_use,
> +#endif
>         &suite__bp_signal,
>         &suite__bp_signal_overflow,
>         &suite__bp_accounting,
> diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
> index af284dd47e5c7855..3144c7916532825c 100644
> --- a/tools/perf/tests/tests.h
> +++ b/tools/perf/tests/tests.h
> @@ -99,7 +99,9 @@ DECLARE_SUITE(dso_data_cache);
>  DECLARE_SUITE(dso_data_reopen);
>  DECLARE_SUITE(parse_events);
>  DECLARE_SUITE(hists_link);
> +#ifdef HAVE_LIBPYTHON_SUPPORT
>  DECLARE_SUITE(python_use);
> +#endif
>  DECLARE_SUITE(bp_signal);
>  DECLARE_SUITE(bp_signal_overflow);
>  DECLARE_SUITE(bp_accounting);
> --
> 2.47.0
>

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.