lkml.org 
[lkml]   [2019]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 23/79] libperf: Make libperf.a part of the build
On Mon, Jul 22, 2019 at 09:39:24AM -0300, Arnaldo Carvalho de Melo wrote:
> Em Sun, Jul 21, 2019 at 01:24:10PM +0200, Jiri Olsa escreveu:
> > Adding empty libperf.a under toos/perf/lib and
> > linking it with perf.
>
> So, I noticed you created a subdirectory under tools/perf/, while I
> first thought you would have it in tools/lib/perf/, why not move it
> there?

yea I started like this, and then there was only one reason
I could think of ;-) I mentioned it in the cover letter:
- move under tools/lib after the interface is more stable-ish

if you insist to move it there now, would it be ok
to make it under separate patch afterwards? it would
safe me zillions of small changes ;-)

thanks,
jirka

>
> - Arnaldo
>
> > It can also be built separately with:
> >
> > $ cd tools/perf/lib && make
> > CC core.o
> > LD libperf-in.o
> > AR libperf.a
> > LINK libperf.so
> >
> > Link: http://lkml.kernel.org/n/tip-lzrlfu3hutepbeqyntjks3za@git.kernel.org
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > ---
> > tools/perf/Makefile.config | 1 +
> > tools/perf/Makefile.perf | 30 ++++++++--------
> > tools/perf/lib/Build | 1 +
> > tools/perf/lib/Makefile | 74 ++++++++++++++++++++++++++++++++++++++
> > tools/perf/lib/core.c | 0
> > 5 files changed, 92 insertions(+), 14 deletions(-)
> > create mode 100644 tools/perf/lib/Build
> > create mode 100644 tools/perf/lib/Makefile
> > create mode 100644 tools/perf/lib/core.c
> >
> > diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
> > index 89ac5a1f1550..e4988f49ea79 100644
> > --- a/tools/perf/Makefile.config
> > +++ b/tools/perf/Makefile.config
> > @@ -277,6 +277,7 @@ ifeq ($(DEBUG),0)
> > endif
> > endif
> >
> > +INC_FLAGS += -I$(src-perf)/lib/include
> > INC_FLAGS += -I$(src-perf)/util/include
> > INC_FLAGS += -I$(src-perf)/arch/$(SRCARCH)/include
> > INC_FLAGS += -I$(srctree)/tools/include/uapi
> > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
> > index 0fffd2bb6cd9..6e7e7d44ffac 100644
> > --- a/tools/perf/Makefile.perf
> > +++ b/tools/perf/Makefile.perf
> > @@ -224,6 +224,7 @@ LIB_DIR = $(srctree)/tools/lib/api/
> > TRACE_EVENT_DIR = $(srctree)/tools/lib/traceevent/
> > BPF_DIR = $(srctree)/tools/lib/bpf/
> > SUBCMD_DIR = $(srctree)/tools/lib/subcmd/
> > +LIBPERF_DIR = $(srctree)/tools/perf/lib/
> >
> > # Set FEATURE_TESTS to 'all' so all possible feature checkers are executed.
> > # Without this setting the output feature dump file misses some features, for
> > @@ -272,6 +273,7 @@ ifneq ($(OUTPUT),)
> > TE_PATH=$(OUTPUT)
> > BPF_PATH=$(OUTPUT)
> > SUBCMD_PATH=$(OUTPUT)
> > + LIBPERF_PATH=$(OUTPUT)
> > ifneq ($(subdir),)
> > API_PATH=$(OUTPUT)/../lib/api/
> > else
> > @@ -282,6 +284,7 @@ else
> > API_PATH=$(LIB_DIR)
> > BPF_PATH=$(BPF_DIR)
> > SUBCMD_PATH=$(SUBCMD_DIR)
> > + LIBPERF_PATH=$(LIBPERF_DIR)
> > endif
> >
> > LIBTRACEEVENT = $(TE_PATH)libtraceevent.a
> > @@ -303,6 +306,8 @@ LIBBPF = $(BPF_PATH)libbpf.a
> >
> > LIBSUBCMD = $(SUBCMD_PATH)libsubcmd.a
> >
> > +LIBPERF = $(LIBPERF_PATH)libperf.a
> > +
> > # python extension build directories
> > PYTHON_EXTBUILD := $(OUTPUT)python_ext_build/
> > PYTHON_EXTBUILD_LIB := $(PYTHON_EXTBUILD)lib/
> > @@ -348,9 +353,7 @@ endif
> >
> > export PERL_PATH
> >
> > -LIBPERF_A=$(OUTPUT)libperf.a
> > -
> > -PERFLIBS = $(LIBAPI) $(LIBTRACEEVENT) $(LIBSUBCMD)
> > +PERFLIBS = $(LIBAPI) $(LIBTRACEEVENT) $(LIBSUBCMD) $(LIBPERF)
> > ifndef NO_LIBBPF
> > PERFLIBS += $(LIBBPF)
> > endif
> > @@ -583,8 +586,6 @@ JEVENTS_IN := $(OUTPUT)pmu-events/jevents-in.o
> >
> > PMU_EVENTS_IN := $(OUTPUT)pmu-events/pmu-events-in.o
> >
> > -LIBPERF_IN := $(OUTPUT)libperf-in.o
> > -
> > export JEVENTS
> >
> > build := -f $(srctree)/tools/build/Makefile.build dir=. obj
> > @@ -601,12 +602,9 @@ $(JEVENTS): $(JEVENTS_IN)
> > $(PMU_EVENTS_IN): $(JEVENTS) FORCE
> > $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=pmu-events obj=pmu-events
> >
> > -$(LIBPERF_IN): prepare FORCE
> > - $(Q)$(MAKE) $(build)=libperf
> > -
> > -$(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(PMU_EVENTS_IN) $(LIBPERF_IN) $(LIBTRACEEVENT_DYNAMIC_LIST)
> > +$(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(PMU_EVENTS_IN) $(LIBTRACEEVENT_DYNAMIC_LIST)
> > $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBTRACEEVENT_DYNAMIC_LIST_LDFLAGS) \
> > - $(PERF_IN) $(PMU_EVENTS_IN) $(LIBPERF_IN) $(LIBS) -o $@
> > + $(PERF_IN) $(PMU_EVENTS_IN) $(LIBS) -o $@
> >
> > $(GTK_IN): FORCE
> > $(Q)$(MAKE) $(build)=gtk
> > @@ -727,9 +725,6 @@ endif
> >
> > $(patsubst perf-%,%.o,$(PROGRAMS)): $(wildcard */*.h)
> >
> > -$(LIBPERF_A): $(LIBPERF_IN)
> > - $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIBPERF_IN) $(LIB_OBJS)
> > -
> > LIBTRACEEVENT_FLAGS += plugin_dir=$(plugindir_SQ) 'EXTRA_CFLAGS=$(EXTRA_CFLAGS)' 'LDFLAGS=$(LDFLAGS)'
> >
> > $(LIBTRACEEVENT): FORCE
> > @@ -762,6 +757,13 @@ $(LIBBPF)-clean:
> > $(call QUIET_CLEAN, libbpf)
> > $(Q)$(MAKE) -C $(BPF_DIR) O=$(OUTPUT) clean >/dev/null
> >
> > +$(LIBPERF): FORCE
> > + $(Q)$(MAKE) -C $(LIBPERF_DIR) O=$(OUTPUT) $(OUTPUT)libperf.a
> > +
> > +$(LIBPERF)-clean:
> > + $(call QUIET_CLEAN, libperf)
> > + $(Q)$(MAKE) -C $(LIBPERF_DIR) O=$(OUTPUT) clean >/dev/null
> > +
> > $(LIBSUBCMD): FORCE
> > $(Q)$(MAKE) -C $(SUBCMD_DIR) O=$(OUTPUT) $(OUTPUT)libsubcmd.a
> >
> > @@ -948,7 +950,7 @@ config-clean:
> > python-clean:
> > $(python-clean)
> >
> > -clean:: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean config-clean fixdep-clean python-clean
> > +clean:: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBPERF)-clean config-clean fixdep-clean python-clean
> > $(call QUIET_CLEAN, core-objs) $(RM) $(LIBPERF_A) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS)
> > $(Q)find $(if $(OUTPUT),$(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
> > $(Q)$(RM) $(OUTPUT).config-detected
> > diff --git a/tools/perf/lib/Build b/tools/perf/lib/Build
> > new file mode 100644
> > index 000000000000..5196958cec01
> > --- /dev/null
> > +++ b/tools/perf/lib/Build
> > @@ -0,0 +1 @@
> > +libperf-y += core.o
> > diff --git a/tools/perf/lib/Makefile b/tools/perf/lib/Makefile
> > new file mode 100644
> > index 000000000000..e6f2eb702aaa
> > --- /dev/null
> > +++ b/tools/perf/lib/Makefile
> > @@ -0,0 +1,74 @@
> > +# SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
> > +# Most of this file is copied from tools/lib/bpf/Makefile
> > +
> > +MAKEFLAGS += --no-print-directory
> > +
> > +ifeq ($(srctree),)
> > +srctree := $(patsubst %/,%,$(dir $(CURDIR)))
> > +srctree := $(patsubst %/,%,$(dir $(srctree)))
> > +srctree := $(patsubst %/,%,$(dir $(srctree)))
> > +#$(info Determined 'srctree' to be $(srctree))
> > +endif
> > +
> > +include $(srctree)/tools/scripts/Makefile.include
> > +include $(srctree)/tools/scripts/Makefile.arch
> > +
> > +ifeq ("$(origin V)", "command line")
> > + VERBOSE = $(V)
> > +endif
> > +ifndef VERBOSE
> > + VERBOSE = 0
> > +endif
> > +
> > +ifeq ($(VERBOSE),1)
> > + Q =
> > +else
> > + Q = @
> > +endif
> > +
> > +# Set compile option CFLAGS
> > +ifdef EXTRA_CFLAGS
> > + CFLAGS := $(EXTRA_CFLAGS)
> > +else
> > + CFLAGS := -g -Wall
> > +endif
> > +
> > +INCLUDES = -I. -Iinclude -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(ARCH)/include/
> > +
> > +# Append required CFLAGS
> > +override CFLAGS += $(EXTRA_WARNINGS)
> > +override CFLAGS += -Werror -Wall
> > +override CFLAGS += -fPIC
> > +override CFLAGS += $(INCLUDES)
> > +override CFLAGS += -fvisibility=hidden
> > +
> > +all:
> > +
> > +export srctree OUTPUT CC LD CFLAGS V
> > +include $(srctree)/tools/build/Makefile.include
> > +
> > +LIBPERF_SO := $(OUTPUT)libperf.so
> > +LIBPERF_A := $(OUTPUT)libperf.a
> > +LIBPERF_IN := $(OUTPUT)libperf-in.o
> > +
> > +$(LIBPERF_IN): FORCE
> > + $(Q)$(MAKE) $(build)=libperf
> > +
> > +$(LIBPERF_A): $(LIBPERF_IN)
> > + $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIBPERF_IN)
> > +
> > +$(LIBPERF_SO): $(LIBPERF_IN)
> > + $(QUIET_LINK)$(CC) --shared -Wl,-soname,libperf.so $^ -o $@
> > +
> > +libs: $(LIBPERF_A) $(LIBPERF_SO)
> > +
> > +all: fixdep
> > + $(Q)$(MAKE) libs
> > +
> > +clean:
> > + $(call QUIET_CLEAN, libperf) $(RM) $(LIBPERF_A) \
> > + *.o *~ *.a *.so .*.d .*.cmd LIBPERF-CFLAGS
> > +
> > +FORCE:
> > +
> > +.PHONY: all install clean FORCE
> > diff --git a/tools/perf/lib/core.c b/tools/perf/lib/core.c
> > new file mode 100644
> > index 000000000000..e69de29bb2d1
> > --
> > 2.21.0
>
> --
>
> - Arnaldo

\
 
 \ /
  Last update: 2019-07-22 17:55    [W:0.213 / U:1.164 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site