Commit 3290996e authored by Jean-Philippe Brucker's avatar Jean-Philippe Brucker Committed by Andrii Nakryiko
Browse files

tools/runqslower: Use Makefile.include 



Makefile.include defines variables such as OUTPUT and CC for out-of-tree
build and cross-build. Include it into the runqslower Makefile and use
its $(QUIET*) helpers.

Signed-off-by: default avatarJean-Philippe Brucker <jean-philippe@linaro.org>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Acked-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20201110164310.2600671-5-jean-philippe@linaro.org
parent 8859b0da

tools/bpf/runqslower/Makefile

+9 −15
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)

include ../../scripts/Makefile.include



OUTPUT := .output

CLANG ?= clang

LLC ?= llc
@@ -21,10 +23,8 @@ VMLINUX_BTF_PATH := $(or $(VMLINUX_BTF),$(firstword \ 
abs_out := $(abspath $(OUTPUT))

ifeq ($(V),1)

Q =

msg =

else

Q = @

msg = @printf '  %-8s %s%s\n' "$(1)" "$(notdir $(2))" "$(if $(3), $(3))";

MAKEFLAGS += --no-print-directory

submake_extras := feature_display=0

endif
@@ -37,12 +37,11 @@ all: runqslower 
runqslower: $(OUTPUT)/runqslower



clean:

	$(call msg,CLEAN)

	$(call QUIET_CLEAN, runqslower)

	$(Q)rm -rf $(OUTPUT) runqslower



$(OUTPUT)/runqslower: $(OUTPUT)/runqslower.o $(BPFOBJ)

	$(call msg,BINARY,$@)

	$(Q)$(CC) $(CFLAGS) $^ -lelf -lz -o $@

	$(QUIET_LINK)$(CC) $(CFLAGS) $^ -lelf -lz -o $@



$(OUTPUT)/runqslower.o: runqslower.h $(OUTPUT)/runqslower.skel.h	      \

			$(OUTPUT)/runqslower.bpf.o
@@ -50,31 +49,26 @@ $(OUTPUT)/runqslower.o: runqslower.h $(OUTPUT)/runqslower.skel.h \ 
$(OUTPUT)/runqslower.bpf.o: $(OUTPUT)/vmlinux.h runqslower.h



$(OUTPUT)/%.skel.h: $(OUTPUT)/%.bpf.o | $(BPFTOOL)

	$(call msg,GEN-SKEL,$@)

	$(Q)$(BPFTOOL) gen skeleton $< > $@

	$(QUIET_GEN)$(BPFTOOL) gen skeleton $< > $@



$(OUTPUT)/%.bpf.o: %.bpf.c $(BPFOBJ) | $(OUTPUT)

	$(call msg,BPF,$@)

	$(Q)$(CLANG) -g -O2 -target bpf $(INCLUDES)			      \

	$(QUIET_GEN)$(CLANG) -g -O2 -target bpf $(INCLUDES)		      \

		 -c $(filter %.c,$^) -o $@ &&				      \

	$(LLVM_STRIP) -g $@



$(OUTPUT)/%.o: %.c | $(OUTPUT)

	$(call msg,CC,$@)

	$(Q)$(CC) $(CFLAGS) $(INCLUDES) -c $(filter %.c,$^) -o $@

	$(QUIET_CC)$(CC) $(CFLAGS) $(INCLUDES) -c $(filter %.c,$^) -o $@



$(OUTPUT):

	$(call msg,MKDIR,$@)

	$(Q)mkdir -p $(OUTPUT)

	$(QUIET_MKDIR)mkdir -p $(OUTPUT)



$(OUTPUT)/vmlinux.h: $(VMLINUX_BTF_PATH) | $(OUTPUT) $(BPFTOOL)

	$(call msg,GEN,$@)

	$(Q)if [ ! -e "$(VMLINUX_BTF_PATH)" ] ; then \

		echo "Couldn't find kernel BTF; set VMLINUX_BTF to"	       \

			"specify its location." >&2;			       \

		exit 1;\

	fi

	$(Q)$(BPFTOOL) btf dump file $(VMLINUX_BTF_PATH) format c > $@

	$(QUIET_GEN)$(BPFTOOL) btf dump file $(VMLINUX_BTF_PATH) format c > $@



$(BPFOBJ): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(OUTPUT)

	$(Q)$(MAKE) $(submake_extras) -C $(LIBBPF_SRC)			       \