* [PATCH 0/4] perf tools: libperf related fixes
@ 2019-09-01 12:48 Jiri Olsa
2019-09-01 12:48 ` [PATCH 1/4] perf tools: Fix python/perf.so compilation Jiri Olsa
` (3 more replies)
0 siblings, 4 replies; 13+ messages in thread
From: Jiri Olsa @ 2019-09-01 12:48 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: lkml, Ingo Molnar, Namhyung Kim, Alexander Shishkin,
Peter Zijlstra, Michael Petlan
hi,
sending some libperf related fixes.
thanks,
jirka
---
Jiri Olsa (4):
perf tools: Fix python/perf.so compilation
perf tests: Fix static build test
perf tests: Add libperf automated test
libperf: Add missing event.h into install rule
tools/perf/Makefile.perf | 2 +-
tools/perf/lib/Makefile | 1 +
tools/perf/tests/make | 8 ++++++--
3 files changed, 8 insertions(+), 3 deletions(-)
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 1/4] perf tools: Fix python/perf.so compilation
2019-09-01 12:48 [PATCH 0/4] perf tools: libperf related fixes Jiri Olsa
@ 2019-09-01 12:48 ` Jiri Olsa
2019-09-01 15:14 ` Arnaldo Carvalho de Melo
2019-09-20 16:21 ` [tip: perf/urgent] perf python: Add missing python/perf.so dependency for libperf tip-bot2 for Jiri Olsa
2019-09-01 12:48 ` [PATCH 2/4] perf tests: Fix static build test Jiri Olsa
` (2 subsequent siblings)
3 siblings, 2 replies; 13+ messages in thread
From: Jiri Olsa @ 2019-09-01 12:48 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: lkml, Ingo Molnar, Namhyung Kim, Alexander Shishkin,
Peter Zijlstra, Michael Petlan
The python/perf.so compilation needs libperf ready,
otherwise it fails:
$ make python/perf.so JOBS=1
BUILD: Doing 'make -j1' parallel build
GEN python/perf.so
gcc: error: /home/jolsa/kernel/linux-perf/tools/perf/lib/libperf.a: No such file or directory
Fixing this with by adding libperf dependency.
Link: http://lkml.kernel.org/n/tip-0aaa6frvqnybjc2rjn7xrvjh@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/Makefile.perf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index f9807d8c005b..2ccc12f3730b 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -567,7 +567,7 @@ all: shell_compatibility_test $(ALL_PROGRAMS) $(LANG_BINDINGS) $(OTHER_PROGRAMS)
# Create python binding output directory if not already present
_dummy := $(shell [ -d '$(OUTPUT)python' ] || mkdir -p '$(OUTPUT)python')
-$(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS) $(LIBTRACEEVENT_DYNAMIC_LIST)
+$(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS) $(LIBTRACEEVENT_DYNAMIC_LIST) $(LIBPERF)
$(QUIET_GEN)LDSHARED="$(CC) -pthread -shared" \
CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS) $(LIBTRACEEVENT_DYNAMIC_LIST_LDFLAGS)' \
$(PYTHON_WORD) util/setup.py \
--
2.21.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 2/4] perf tests: Fix static build test
2019-09-01 12:48 [PATCH 0/4] perf tools: libperf related fixes Jiri Olsa
2019-09-01 12:48 ` [PATCH 1/4] perf tools: Fix python/perf.so compilation Jiri Olsa
@ 2019-09-01 12:48 ` Jiri Olsa
2019-09-01 15:15 ` Arnaldo Carvalho de Melo
2019-09-01 12:48 ` [PATCH 3/4] perf tests: Add libperf automated test Jiri Olsa
2019-09-01 12:48 ` [PATCH 4/4] libperf: Add missing event.h into install rule Jiri Olsa
3 siblings, 1 reply; 13+ messages in thread
From: Jiri Olsa @ 2019-09-01 12:48 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: lkml, Ingo Molnar, Namhyung Kim, Alexander Shishkin,
Peter Zijlstra, Michael Petlan
Link: http://lkml.kernel.org/n/tip-ibdgg163291sx5m5xkojx5sq@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/tests/make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/tests/make b/tools/perf/tests/make
index 70c48475896d..17ee3facfd4d 100644
--- a/tools/perf/tests/make
+++ b/tools/perf/tests/make
@@ -100,7 +100,7 @@ make_install_info := install-info
make_install_pdf := install-pdf
make_install_prefix := install prefix=/tmp/krava
make_install_prefix_slash := install prefix=/tmp/krava/
-make_static := LDFLAGS=-static
+make_static := LDFLAGS=-static NO_PERF_READ_VDSO32=1 NO_JVMTI=1
# all the NO_* variable combined
make_minimal := NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1
--
2.21.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 3/4] perf tests: Add libperf automated test
2019-09-01 12:48 [PATCH 0/4] perf tools: libperf related fixes Jiri Olsa
2019-09-01 12:48 ` [PATCH 1/4] perf tools: Fix python/perf.so compilation Jiri Olsa
2019-09-01 12:48 ` [PATCH 2/4] perf tests: Fix static build test Jiri Olsa
@ 2019-09-01 12:48 ` Jiri Olsa
2019-09-01 15:18 ` Arnaldo Carvalho de Melo
2019-09-20 16:21 ` [tip: perf/urgent] perf tests: Add libperf automated test for 'make -C tools/perf build-test' tip-bot2 for Jiri Olsa
2019-09-01 12:48 ` [PATCH 4/4] libperf: Add missing event.h into install rule Jiri Olsa
3 siblings, 2 replies; 13+ messages in thread
From: Jiri Olsa @ 2019-09-01 12:48 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: lkml, Ingo Molnar, Namhyung Kim, Alexander Shishkin,
Peter Zijlstra, Michael Petlan
Adding libperf build test.
Link: http://lkml.kernel.org/n/tip-r1be6tz02ay0bf2729a7xwjk@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/tests/make | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/perf/tests/make b/tools/perf/tests/make
index 17ee3facfd4d..128a0d801ac1 100644
--- a/tools/perf/tests/make
+++ b/tools/perf/tests/make
@@ -327,6 +327,10 @@ make_kernelsrc_tools:
(make -C ../../tools $(PARALLEL_OPT) $(K_O_OPT) perf) > $@ 2>&1 && \
test -x $(KERNEL_O)/tools/perf/perf && rm -f $@ || (cat $@ ; false)
+make_libperf:
+ @echo "- make -C lib";
+ make -C lib clean >$@ 2>&1; make -C lib >>$@ 2>&1 && rm $@
+
FEATURES_DUMP_FILE := $(FULL_O)/BUILD_TEST_FEATURE_DUMP
FEATURES_DUMP_FILE_STATIC := $(FULL_O)/BUILD_TEST_FEATURE_DUMP_STATIC
@@ -365,5 +369,5 @@ $(foreach t,$(run),$(if $(findstring make_static,$(t)),\
$(eval $(t) := $($(t)) FEATURES_DUMP=$(FEATURES_DUMP_FILE))))
endif
-.PHONY: all $(run) $(run_O) tarpkg clean make_kernelsrc make_kernelsrc_tools
+.PHONY: all $(run) $(run_O) tarpkg clean make_kernelsrc make_kernelsrc_tools make_libperf
endif # ifndef MK
--
2.21.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 4/4] libperf: Add missing event.h into install rule
2019-09-01 12:48 [PATCH 0/4] perf tools: libperf related fixes Jiri Olsa
` (2 preceding siblings ...)
2019-09-01 12:48 ` [PATCH 3/4] perf tests: Add libperf automated test Jiri Olsa
@ 2019-09-01 12:48 ` Jiri Olsa
2019-09-01 15:18 ` Arnaldo Carvalho de Melo
2019-09-20 16:21 ` [tip: perf/urgent] libperf: Add missing event.h file to " tip-bot2 for Jiri Olsa
3 siblings, 2 replies; 13+ messages in thread
From: Jiri Olsa @ 2019-09-01 12:48 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: lkml, Ingo Molnar, Namhyung Kim, Alexander Shishkin,
Peter Zijlstra, Michael Petlan
So it's properly installed.
Link: http://lkml.kernel.org/n/tip-7e989xk9ykmd60db9lym5uc6@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/lib/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/perf/lib/Makefile b/tools/perf/lib/Makefile
index a67efb8d9d39..e325c0503dc6 100644
--- a/tools/perf/lib/Makefile
+++ b/tools/perf/lib/Makefile
@@ -146,6 +146,7 @@ install_headers:
$(call do_install,include/perf/threadmap.h,$(prefix)/include/perf,644); \
$(call do_install,include/perf/evlist.h,$(prefix)/include/perf,644); \
$(call do_install,include/perf/evsel.h,$(prefix)/include/perf,644);
+ $(call do_install,include/perf/event.h,$(prefix)/include/perf,644);
install_pkgconfig: $(LIBPERF_PC)
$(call QUIET_INSTALL, $(LIBPERF_PC)) \
--
2.21.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 1/4] perf tools: Fix python/perf.so compilation
2019-09-01 12:48 ` [PATCH 1/4] perf tools: Fix python/perf.so compilation Jiri Olsa
@ 2019-09-01 15:14 ` Arnaldo Carvalho de Melo
2019-09-20 16:21 ` [tip: perf/urgent] perf python: Add missing python/perf.so dependency for libperf tip-bot2 for Jiri Olsa
1 sibling, 0 replies; 13+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-09-01 15:14 UTC (permalink / raw)
To: Jiri Olsa
Cc: lkml, Ingo Molnar, Namhyung Kim, Alexander Shishkin,
Peter Zijlstra, Michael Petlan
Em Sun, Sep 01, 2019 at 02:48:19PM +0200, Jiri Olsa escreveu:
> The python/perf.so compilation needs libperf ready,
> otherwise it fails:
>
> $ make python/perf.so JOBS=1
> BUILD: Doing 'make -j1' parallel build
> GEN python/perf.so
> gcc: error: /home/jolsa/kernel/linux-perf/tools/perf/lib/libperf.a: No such file or directory
>
> Fixing this with by adding libperf dependency.
Thanks, tested, applied.
- Arnaldo
> Link: http://lkml.kernel.org/n/tip-0aaa6frvqnybjc2rjn7xrvjh@git.kernel.org
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/perf/Makefile.perf | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
> index f9807d8c005b..2ccc12f3730b 100644
> --- a/tools/perf/Makefile.perf
> +++ b/tools/perf/Makefile.perf
> @@ -567,7 +567,7 @@ all: shell_compatibility_test $(ALL_PROGRAMS) $(LANG_BINDINGS) $(OTHER_PROGRAMS)
> # Create python binding output directory if not already present
> _dummy := $(shell [ -d '$(OUTPUT)python' ] || mkdir -p '$(OUTPUT)python')
>
> -$(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS) $(LIBTRACEEVENT_DYNAMIC_LIST)
> +$(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS) $(LIBTRACEEVENT_DYNAMIC_LIST) $(LIBPERF)
> $(QUIET_GEN)LDSHARED="$(CC) -pthread -shared" \
> CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS) $(LIBTRACEEVENT_DYNAMIC_LIST_LDFLAGS)' \
> $(PYTHON_WORD) util/setup.py \
> --
> 2.21.0
--
- Arnaldo
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 2/4] perf tests: Fix static build test
2019-09-01 12:48 ` [PATCH 2/4] perf tests: Fix static build test Jiri Olsa
@ 2019-09-01 15:15 ` Arnaldo Carvalho de Melo
2019-09-01 15:46 ` Jiri Olsa
0 siblings, 1 reply; 13+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-09-01 15:15 UTC (permalink / raw)
To: Jiri Olsa
Cc: lkml, Ingo Molnar, Namhyung Kim, Alexander Shishkin,
Peter Zijlstra, Michael Petlan
Em Sun, Sep 01, 2019 at 02:48:20PM +0200, Jiri Olsa escreveu:
> Link: http://lkml.kernel.org/n/tip-ibdgg163291sx5m5xkojx5sq@git.kernel.org
Can you explain why this is needed? Wat is the problem with building
statically with those features? What happens when one tries to do it
that way?
I.e. what is this fixing?
- Arnaldo
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/perf/tests/make | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/tests/make b/tools/perf/tests/make
> index 70c48475896d..17ee3facfd4d 100644
> --- a/tools/perf/tests/make
> +++ b/tools/perf/tests/make
> @@ -100,7 +100,7 @@ make_install_info := install-info
> make_install_pdf := install-pdf
> make_install_prefix := install prefix=/tmp/krava
> make_install_prefix_slash := install prefix=/tmp/krava/
> -make_static := LDFLAGS=-static
> +make_static := LDFLAGS=-static NO_PERF_READ_VDSO32=1 NO_JVMTI=1
>
> # all the NO_* variable combined
> make_minimal := NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1
> --
> 2.21.0
--
- Arnaldo
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/4] perf tests: Add libperf automated test
2019-09-01 12:48 ` [PATCH 3/4] perf tests: Add libperf automated test Jiri Olsa
@ 2019-09-01 15:18 ` Arnaldo Carvalho de Melo
2019-09-20 16:21 ` [tip: perf/urgent] perf tests: Add libperf automated test for 'make -C tools/perf build-test' tip-bot2 for Jiri Olsa
1 sibling, 0 replies; 13+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-09-01 15:18 UTC (permalink / raw)
To: Jiri Olsa
Cc: lkml, Ingo Molnar, Namhyung Kim, Alexander Shishkin,
Peter Zijlstra, Michael Petlan
Em Sun, Sep 01, 2019 at 02:48:21PM +0200, Jiri Olsa escreveu:
> Adding libperf build test.
Thanks, applied. And also added a note that this is used when one does
a:
$ make -C tools/perf built-test
> Link: http://lkml.kernel.org/n/tip-r1be6tz02ay0bf2729a7xwjk@git.kernel.org
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/perf/tests/make | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/tests/make b/tools/perf/tests/make
> index 17ee3facfd4d..128a0d801ac1 100644
> --- a/tools/perf/tests/make
> +++ b/tools/perf/tests/make
> @@ -327,6 +327,10 @@ make_kernelsrc_tools:
> (make -C ../../tools $(PARALLEL_OPT) $(K_O_OPT) perf) > $@ 2>&1 && \
> test -x $(KERNEL_O)/tools/perf/perf && rm -f $@ || (cat $@ ; false)
>
> +make_libperf:
> + @echo "- make -C lib";
> + make -C lib clean >$@ 2>&1; make -C lib >>$@ 2>&1 && rm $@
> +
> FEATURES_DUMP_FILE := $(FULL_O)/BUILD_TEST_FEATURE_DUMP
> FEATURES_DUMP_FILE_STATIC := $(FULL_O)/BUILD_TEST_FEATURE_DUMP_STATIC
>
> @@ -365,5 +369,5 @@ $(foreach t,$(run),$(if $(findstring make_static,$(t)),\
> $(eval $(t) := $($(t)) FEATURES_DUMP=$(FEATURES_DUMP_FILE))))
> endif
>
> -.PHONY: all $(run) $(run_O) tarpkg clean make_kernelsrc make_kernelsrc_tools
> +.PHONY: all $(run) $(run_O) tarpkg clean make_kernelsrc make_kernelsrc_tools make_libperf
> endif # ifndef MK
> --
> 2.21.0
--
- Arnaldo
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 4/4] libperf: Add missing event.h into install rule
2019-09-01 12:48 ` [PATCH 4/4] libperf: Add missing event.h into install rule Jiri Olsa
@ 2019-09-01 15:18 ` Arnaldo Carvalho de Melo
2019-09-20 16:21 ` [tip: perf/urgent] libperf: Add missing event.h file to " tip-bot2 for Jiri Olsa
1 sibling, 0 replies; 13+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-09-01 15:18 UTC (permalink / raw)
To: Jiri Olsa
Cc: lkml, Ingo Molnar, Namhyung Kim, Alexander Shishkin,
Peter Zijlstra, Michael Petlan
Em Sun, Sep 01, 2019 at 02:48:22PM +0200, Jiri Olsa escreveu:
> So it's properly installed.
Thanks, applied.
- Arnaldo
> Link: http://lkml.kernel.org/n/tip-7e989xk9ykmd60db9lym5uc6@git.kernel.org
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/perf/lib/Makefile | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/tools/perf/lib/Makefile b/tools/perf/lib/Makefile
> index a67efb8d9d39..e325c0503dc6 100644
> --- a/tools/perf/lib/Makefile
> +++ b/tools/perf/lib/Makefile
> @@ -146,6 +146,7 @@ install_headers:
> $(call do_install,include/perf/threadmap.h,$(prefix)/include/perf,644); \
> $(call do_install,include/perf/evlist.h,$(prefix)/include/perf,644); \
> $(call do_install,include/perf/evsel.h,$(prefix)/include/perf,644);
> + $(call do_install,include/perf/event.h,$(prefix)/include/perf,644);
>
> install_pkgconfig: $(LIBPERF_PC)
> $(call QUIET_INSTALL, $(LIBPERF_PC)) \
> --
> 2.21.0
--
- Arnaldo
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 2/4] perf tests: Fix static build test
2019-09-01 15:15 ` Arnaldo Carvalho de Melo
@ 2019-09-01 15:46 ` Jiri Olsa
0 siblings, 0 replies; 13+ messages in thread
From: Jiri Olsa @ 2019-09-01 15:46 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Jiri Olsa, lkml, Ingo Molnar, Namhyung Kim, Alexander Shishkin,
Peter Zijlstra, Michael Petlan
On Sun, Sep 01, 2019 at 12:15:28PM -0300, Arnaldo Carvalho de Melo wrote:
> Em Sun, Sep 01, 2019 at 02:48:20PM +0200, Jiri Olsa escreveu:
> > Link: http://lkml.kernel.org/n/tip-ibdgg163291sx5m5xkojx5sq@git.kernel.org
>
>
> Can you explain why this is needed? Wat is the problem with building
> statically with those features? What happens when one tries to do it
> that way?
>
> I.e. what is this fixing?
sry, I have to disable VDSO and JVMTI for static build,
because they are shared libraries and just won't pass
with -static in LDFLAGS.. I wanted to throw it out,
because I'm confused that the test is passing for you
just like it is right now ;-)
I'll send out version with changelog
jirka
>
> - Arnaldo
>
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > ---
> > tools/perf/tests/make | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tools/perf/tests/make b/tools/perf/tests/make
> > index 70c48475896d..17ee3facfd4d 100644
> > --- a/tools/perf/tests/make
> > +++ b/tools/perf/tests/make
> > @@ -100,7 +100,7 @@ make_install_info := install-info
> > make_install_pdf := install-pdf
> > make_install_prefix := install prefix=/tmp/krava
> > make_install_prefix_slash := install prefix=/tmp/krava/
> > -make_static := LDFLAGS=-static
> > +make_static := LDFLAGS=-static NO_PERF_READ_VDSO32=1 NO_JVMTI=1
> >
> > # all the NO_* variable combined
> > make_minimal := NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1
> > --
> > 2.21.0
>
> --
>
> - Arnaldo
^ permalink raw reply [flat|nested] 13+ messages in thread
* [tip: perf/urgent] libperf: Add missing event.h file to install rule
2019-09-01 12:48 ` [PATCH 4/4] libperf: Add missing event.h into install rule Jiri Olsa
2019-09-01 15:18 ` Arnaldo Carvalho de Melo
@ 2019-09-20 16:21 ` tip-bot2 for Jiri Olsa
1 sibling, 0 replies; 13+ messages in thread
From: tip-bot2 for Jiri Olsa @ 2019-09-20 16:21 UTC (permalink / raw)
To: linux-tip-commits
Cc: Jiri Olsa, Alexander Shishkin, Michael Petlan, Namhyung Kim,
Peter Zijlstra, Arnaldo Carvalho de Melo, Ingo Molnar,
Borislav Petkov, linux-kernel
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 227cb129858a3eb4b874937274b09834ffcc39b0
Gitweb: https://git.kernel.org/tip/227cb129858a3eb4b874937274b09834ffcc39b0
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Sun, 01 Sep 2019 14:48:22 +02:00
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Tue, 10 Sep 2019 14:33:32 +01:00
libperf: Add missing event.h file to install rule
So that this development header is properly installed and can be found
by tools linking with libperf.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20190901124822.10132-5-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/lib/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/perf/lib/Makefile b/tools/perf/lib/Makefile
index a67efb8..e325c05 100644
--- a/tools/perf/lib/Makefile
+++ b/tools/perf/lib/Makefile
@@ -146,6 +146,7 @@ install_headers:
$(call do_install,include/perf/threadmap.h,$(prefix)/include/perf,644); \
$(call do_install,include/perf/evlist.h,$(prefix)/include/perf,644); \
$(call do_install,include/perf/evsel.h,$(prefix)/include/perf,644);
+ $(call do_install,include/perf/event.h,$(prefix)/include/perf,644);
install_pkgconfig: $(LIBPERF_PC)
$(call QUIET_INSTALL, $(LIBPERF_PC)) \
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [tip: perf/urgent] perf python: Add missing python/perf.so dependency for libperf
2019-09-01 12:48 ` [PATCH 1/4] perf tools: Fix python/perf.so compilation Jiri Olsa
2019-09-01 15:14 ` Arnaldo Carvalho de Melo
@ 2019-09-20 16:21 ` tip-bot2 for Jiri Olsa
1 sibling, 0 replies; 13+ messages in thread
From: tip-bot2 for Jiri Olsa @ 2019-09-20 16:21 UTC (permalink / raw)
To: linux-tip-commits
Cc: Jiri Olsa, Arnaldo Carvalho de Melo, Alexander Shishkin,
Michael Petlan, Namhyung Kim, Peter Zijlstra, Ingo Molnar,
Borislav Petkov, linux-kernel
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 5079bde790304959bf744c548efdd5be660ea8e2
Gitweb: https://git.kernel.org/tip/5079bde790304959bf744c548efdd5be660ea8e2
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Sun, 01 Sep 2019 14:48:19 +02:00
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Tue, 10 Sep 2019 14:33:32 +01:00
perf python: Add missing python/perf.so dependency for libperf
The python/perf.so compilation needs libperf ready, otherwise it fails:
$ make python/perf.so JOBS=1
BUILD: Doing 'make -j1' parallel build
GEN python/perf.so
gcc: error: /home/jolsa/kernel/linux-perf/tools/perf/lib/libperf.a: No such file or directory
Fixing this with by adding libperf dependency.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20190901124822.10132-2-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/Makefile.perf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index f9807d8..2ccc12f 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -567,7 +567,7 @@ all: shell_compatibility_test $(ALL_PROGRAMS) $(LANG_BINDINGS) $(OTHER_PROGRAMS)
# Create python binding output directory if not already present
_dummy := $(shell [ -d '$(OUTPUT)python' ] || mkdir -p '$(OUTPUT)python')
-$(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS) $(LIBTRACEEVENT_DYNAMIC_LIST)
+$(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS) $(LIBTRACEEVENT_DYNAMIC_LIST) $(LIBPERF)
$(QUIET_GEN)LDSHARED="$(CC) -pthread -shared" \
CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS) $(LIBTRACEEVENT_DYNAMIC_LIST_LDFLAGS)' \
$(PYTHON_WORD) util/setup.py \
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [tip: perf/urgent] perf tests: Add libperf automated test for 'make -C tools/perf build-test'
2019-09-01 12:48 ` [PATCH 3/4] perf tests: Add libperf automated test Jiri Olsa
2019-09-01 15:18 ` Arnaldo Carvalho de Melo
@ 2019-09-20 16:21 ` tip-bot2 for Jiri Olsa
1 sibling, 0 replies; 13+ messages in thread
From: tip-bot2 for Jiri Olsa @ 2019-09-20 16:21 UTC (permalink / raw)
To: linux-tip-commits
Cc: Jiri Olsa, Arnaldo Carvalho de Melo, Alexander Shishkin,
Michael Petlan, Namhyung Kim, Peter Zijlstra, Ingo Molnar,
Borislav Petkov, linux-kernel
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 9eab951f34dbd092ab520bda167f288899858306
Gitweb: https://git.kernel.org/tip/9eab951f34dbd092ab520bda167f288899858306
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Sun, 01 Sep 2019 14:48:21 +02:00
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Tue, 10 Sep 2019 14:33:32 +01:00
perf tests: Add libperf automated test for 'make -C tools/perf build-test'
Add a libperf build test, that is triggered when one does:
$ make -C tools/perf build-test
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20190901124822.10132-4-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/tests/make | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/perf/tests/make b/tools/perf/tests/make
index 70c4847..6b3afed 100644
--- a/tools/perf/tests/make
+++ b/tools/perf/tests/make
@@ -327,6 +327,10 @@ make_kernelsrc_tools:
(make -C ../../tools $(PARALLEL_OPT) $(K_O_OPT) perf) > $@ 2>&1 && \
test -x $(KERNEL_O)/tools/perf/perf && rm -f $@ || (cat $@ ; false)
+make_libperf:
+ @echo "- make -C lib";
+ make -C lib clean >$@ 2>&1; make -C lib >>$@ 2>&1 && rm $@
+
FEATURES_DUMP_FILE := $(FULL_O)/BUILD_TEST_FEATURE_DUMP
FEATURES_DUMP_FILE_STATIC := $(FULL_O)/BUILD_TEST_FEATURE_DUMP_STATIC
@@ -365,5 +369,5 @@ $(foreach t,$(run),$(if $(findstring make_static,$(t)),\
$(eval $(t) := $($(t)) FEATURES_DUMP=$(FEATURES_DUMP_FILE))))
endif
-.PHONY: all $(run) $(run_O) tarpkg clean make_kernelsrc make_kernelsrc_tools
+.PHONY: all $(run) $(run_O) tarpkg clean make_kernelsrc make_kernelsrc_tools make_libperf
endif # ifndef MK
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2019-09-20 16:22 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-01 12:48 [PATCH 0/4] perf tools: libperf related fixes Jiri Olsa
2019-09-01 12:48 ` [PATCH 1/4] perf tools: Fix python/perf.so compilation Jiri Olsa
2019-09-01 15:14 ` Arnaldo Carvalho de Melo
2019-09-20 16:21 ` [tip: perf/urgent] perf python: Add missing python/perf.so dependency for libperf tip-bot2 for Jiri Olsa
2019-09-01 12:48 ` [PATCH 2/4] perf tests: Fix static build test Jiri Olsa
2019-09-01 15:15 ` Arnaldo Carvalho de Melo
2019-09-01 15:46 ` Jiri Olsa
2019-09-01 12:48 ` [PATCH 3/4] perf tests: Add libperf automated test Jiri Olsa
2019-09-01 15:18 ` Arnaldo Carvalho de Melo
2019-09-20 16:21 ` [tip: perf/urgent] perf tests: Add libperf automated test for 'make -C tools/perf build-test' tip-bot2 for Jiri Olsa
2019-09-01 12:48 ` [PATCH 4/4] libperf: Add missing event.h into install rule Jiri Olsa
2019-09-01 15:18 ` Arnaldo Carvalho de Melo
2019-09-20 16:21 ` [tip: perf/urgent] libperf: Add missing event.h file to " tip-bot2 for Jiri Olsa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).