Commit ef019df0 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf build: Install libtraceevent locally when building 



The perf build currently has a '-Itools/lib' on the CC command
line. This causes issues as the libapi, libsubcmd, libtraceevent,
libbpf headers are all found via this path, making it impossible to
override include behavior.

Change the libtraceevent build mirroring the libbpf, libsubcmd, libapi
and libperf build, so that it is installed in a directory along with its
headers. A later change will modify the include behavior.

Similarly, the plugins are now installed into libtraceevent_plugins
except they have no header files.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masahiro Yamada <masahiroy@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Nicolas Schier <nicolas@fjasle.eu>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: bpf@vger.kernel.org
Link: http://lore.kernel.org/lkml/20221109184914.1357295-7-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 91009a3a

tools/perf/.gitignore

+2 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ libapi/ 
libbpf/

libperf/

libsubcmd/

libtraceevent/

libtraceevent_plugins/

fixdep

libtraceevent-dynamic-list

Documentation/doc.dep

tools/perf/Makefile.perf

+38 −19
Original line number Diff line number Diff line
@@ -242,7 +242,8 @@ sub-make: fixdep 
else # force_fixdep



LIBAPI_DIR      = $(srctree)/tools/lib/api/

TRACE_EVENT_DIR = $(srctree)/tools/lib/traceevent/

LIBTRACEEVENT_DIR = $(srctree)/tools/lib/traceevent/

LIBTRACEEVENT_PLUGINS_DIR = $(LIBTRACEEVENT_DIR)/plugins

LIBBPF_DIR      = $(srctree)/tools/lib/bpf/

LIBSUBCMD_DIR   = $(srctree)/tools/lib/subcmd/

LIBPERF_DIR     = $(srctree)/tools/lib/perf/
@@ -292,16 +293,17 @@ grep-libs = $(filter -l%,$(1)) 
strip-libs = $(filter-out -l%,$(1))



ifneq ($(OUTPUT),)

  TE_PATH=$(OUTPUT)

  PLUGINS_PATH=$(OUTPUT)

  LIBTRACEEVENT_OUTPUT = $(abspath $(OUTPUT))/libtraceevent

else

  TE_PATH=$(TRACE_EVENT_DIR)

  PLUGINS_PATH=$(TRACE_EVENT_DIR)plugins/

  LIBTRACEEVENT_OUTPUT = $(CURDIR)/libtraceevent

endif



LIBTRACEEVENT = $(TE_PATH)libtraceevent.a

LIBTRACEEVENT_PLUGINS_OUTPUT = $(LIBTRACEEVENT_OUTPUT)_plugins

LIBTRACEEVENT_DESTDIR = $(LIBTRACEEVENT_OUTPUT)

LIBTRACEEVENT_PLUGINS_DESTDIR = $(LIBTRACEEVENT_PLUGINS_OUTPUT)

LIBTRACEEVENT_INCLUDE = $(LIBTRACEEVENT_DESTDIR)/include

LIBTRACEEVENT = $(LIBTRACEEVENT_OUTPUT)/libtraceevent.a

export LIBTRACEEVENT

LIBTRACEEVENT_DYNAMIC_LIST = $(PLUGINS_PATH)libtraceevent-dynamic-list

LIBTRACEEVENT_DYNAMIC_LIST = $(LIBTRACEEVENT_PLUGINS_OUTPUT)/libtraceevent-dynamic-list



#

# The static build has no dynsym table, so this does not work for
@@ -821,21 +823,33 @@ $(patsubst perf-%,%.o,$(PROGRAMS)): $(wildcard */*.h) 


LIBTRACEEVENT_FLAGS += plugin_dir=$(plugindir_SQ) 'EXTRA_CFLAGS=$(EXTRA_CFLAGS)' 'LDFLAGS=$(filter-out -static,$(LDFLAGS))'



$(LIBTRACEEVENT): FORCE

	$(Q)$(MAKE) -C $(TRACE_EVENT_DIR) $(LIBTRACEEVENT_FLAGS) O=$(OUTPUT) $(OUTPUT)libtraceevent.a



libtraceevent_plugins: FORCE

	$(Q)$(MAKE) -C $(TRACE_EVENT_DIR)plugins $(LIBTRACEEVENT_FLAGS) O=$(OUTPUT) plugins



$(LIBTRACEEVENT_DYNAMIC_LIST): libtraceevent_plugins

	$(Q)$(MAKE) -C $(TRACE_EVENT_DIR)plugins $(LIBTRACEEVENT_FLAGS) O=$(OUTPUT) $(OUTPUT)libtraceevent-dynamic-list

$(LIBTRACEEVENT): FORCE | $(LIBTRACEEVENT_OUTPUT)

	$(Q)$(MAKE) -C $(LIBTRACEEVENT_DIR) O=$(LIBTRACEEVENT_OUTPUT) \

		DESTDIR=$(LIBTRACEEVENT_DESTDIR) prefix= \

		$@ install_headers



$(LIBTRACEEVENT)-clean:

	$(call QUIET_CLEAN, libtraceevent)

	$(Q)$(MAKE) -C $(TRACE_EVENT_DIR) O=$(OUTPUT) clean >/dev/null

	$(Q)$(RM) -r -- $(LIBTRACEEVENT_OUTPUT)



libtraceevent_plugins: FORCE | $(LIBTRACEEVENT_PLUGINS_OUTPUT)

	$(Q)$(MAKE) -C $(LIBTRACEEVENT_PLUGINS_DIR) O=$(LIBTRACEEVENT_PLUGINS_OUTPUT) \

		DESTDIR=$(LIBTRACEEVENT_PLUGINS_DESTDIR) prefix= \

		plugins



libtraceevent_plugins-clean:

	$(call QUIET_CLEAN, libtraceevent_plugins)

	$(Q)$(RM) -r -- $(LIBTRACEEVENT_PLUGINS_OUTPUT)



$(LIBTRACEEVENT_DYNAMIC_LIST): libtraceevent_plugins

	$(Q)$(MAKE) -C $(LIBTRACEEVENT_PLUGINS_DIR) O=$(LIBTRACEEVENT_PLUGINS_OUTPUT) \

		DESTDIR=$(LIBTRACEEVENT_PLUGINS_DESTDIR) prefix= \

		$(LIBTRACEEVENT_FLAGS) $@



install-traceevent-plugins: libtraceevent_plugins

	$(Q)$(MAKE) -C $(TRACE_EVENT_DIR) $(LIBTRACEEVENT_FLAGS) O=$(OUTPUT) install_plugins

	$(Q)$(MAKE) -C $(LIBTRACEEVENT_PLUGINS_DIR) O=$(LIBTRACEEVENT_PLUGINS_OUTPUT) \

		DESTDIR=$(LIBTRACEEVENT_PLUGINS_DESTDIR) prefix= \

		$(LIBTRACEEVENT_FLAGS) install



$(LIBAPI): FORCE | $(LIBAPI_OUTPUT)

	$(Q)$(MAKE) -C $(LIBAPI_DIR) O=$(LIBAPI_OUTPUT) \
@@ -1060,6 +1074,11 @@ SKELETONS += $(SKEL_OUT)/kwork_trace.skel.h 
$(SKEL_TMP_OUT) $(LIBAPI_OUTPUT) $(LIBBPF_OUTPUT) $(LIBPERF_OUTPUT) $(LIBSUBCMD_OUTPUT):

	$(Q)$(MKDIR) -p $@



ifndef LIBTRACEEVENT_DYNAMIC

$(LIBTRACEEVENT_OUTPUT) $(LIBTRACEEVENT_PLUGINS_OUTPUT):

	$(Q)$(MKDIR) -p $@

endif



ifdef BUILD_BPF_SKEL

BPFTOOL := $(SKEL_TMP_OUT)/bootstrap/bpftool

BPF_INCLUDE := -I$(SKEL_TMP_OUT)/.. -I$(LIBBPF_INCLUDE)
@@ -1102,7 +1121,7 @@ endif # BUILD_BPF_SKEL 
bpf-skel-clean:

	$(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TMP_OUT) $(SKELETONS)



clean:: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBPERF)-clean fixdep-clean python-clean bpf-skel-clean tests-coresight-targets-clean

clean:: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBPERF)-clean fixdep-clean python-clean bpf-skel-clean tests-coresight-targets-clean libtraceevent_plugins-clean

	$(call QUIET_CLEAN, core-objs)  $(RM) $(LIBPERF_A) $(OUTPUT)perf-archive $(OUTPUT)perf-iostat $(LANG_BINDINGS)

	$(Q)find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete

	$(Q)$(RM) $(OUTPUT).config-detected