Commit 293f324c authored by Charlie Jenkins's avatar Charlie Jenkins Committed by Arnaldo Carvalho de Melo
Browse files

tools: Unify top-level quiet infrastructure 



Commit f2868b1a ("perf tools: Expose quiet/verbose variables in
Makefile.perf") moved the quiet infrastructure out of
tools/build/Makefile.build and into the top-level Makefile.perf file so
that the quiet infrastructure could be used throughout perf and not just
in Makefile.build.

Extract out the quiet infrastructure into Makefile.include so that it
can be leveraged outside of perf.

Fixes: f2868b1a ("perf tools: Expose quiet/verbose variables in Makefile.perf")
Reviewed-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarCharlie Jenkins <charlie@rivosinc.com>
Acked-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Benjamin Tissoires <bentiss@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Eduard Zingerman <eddyz87@gmail.com>
Cc: Hao Luo <haoluo@google.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Kosina <jikos@kernel.org>
Cc: John Fastabend <john.fastabend@gmail.com>
Cc: Josh Poimboeuf <jpoimboe@kernel.org>
Cc: KP Singh <kpsingh@kernel.org>
Cc: Lukasz Luba <lukasz.luba@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Martin KaFai Lau <martin.lau@linux.dev>
Cc: Mykola Lysenko <mykolal@fb.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Quentin Monnet <qmo@kernel.org>
Cc: Rafael J. Wysocki <rafael@kernel.org>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Song Liu <song@kernel.org>
Cc: Stanislav Fomichev <sdf@google.com>
Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Yonghong Song <yonghong.song@linux.dev>
Cc: Zhang Rui <rui.zhang@intel.com>
Link: https://lore.kernel.org/r/20250213-quiet_tools-v3-1-07de4482a581@rivosinc.com


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

tools/build/Makefile

+1 −7
Original line number Diff line number Diff line
@@ -17,13 +17,7 @@ $(call allow-override,LD,$(CROSS_COMPILE)ld) 


export HOSTCC HOSTLD HOSTAR



ifeq ($(V),1)

  Q =

else

  Q = @

endif



export Q srctree CC LD

export srctree CC LD



MAKEFLAGS := --no-print-directory

build     := -f $(srctree)/tools/build/Makefile.build dir=. obj

tools/perf/Makefile.perf

+0 −41
Original line number Diff line number Diff line
@@ -161,47 +161,6 @@ export VPATH 
SOURCE := $(shell ln -sf $(srctree)/tools/perf $(OUTPUT)/source)

endif



# Beautify output

# ---------------------------------------------------------------------------

#

# Most of build commands in Kbuild start with "cmd_". You can optionally define

# "quiet_cmd_*". If defined, the short log is printed. Otherwise, no log from

# that command is printed by default.

#

# e.g.)

#    quiet_cmd_depmod = DEPMOD  $(MODLIB)

#          cmd_depmod = $(srctree)/scripts/depmod.sh $(DEPMOD) $(KERNELRELEASE)

#

# A simple variant is to prefix commands with $(Q) - that's useful

# for commands that shall be hidden in non-verbose mode.

#

#    $(Q)$(MAKE) $(build)=scripts/basic

#

# To put more focus on warnings, be less verbose as default

# Use 'make V=1' to see the full commands



ifeq ($(V),1)

  quiet =

  Q =

else

  quiet=quiet_

  Q=@

endif



# If the user is running make -s (silent mode), suppress echoing of commands

# make-4.0 (and later) keep single letter options in the 1st word of MAKEFLAGS.

ifeq ($(filter 3.%,$(MAKE_VERSION)),)

short-opts := $(firstword -$(MAKEFLAGS))

else

short-opts := $(filter-out --%,$(MAKEFLAGS))

endif



ifneq ($(findstring s,$(short-opts)),)

  quiet=silent_

endif



export quiet Q



# Do not use make's built-in rules

# (this improves performance and avoids hard-to-debug behaviour);

MAKEFLAGS += -r

tools/scripts/Makefile.include

+30 −0
Original line number Diff line number Diff line
@@ -136,6 +136,33 @@ else 
NO_SUBDIR = :

endif



# Beautify output

# ---------------------------------------------------------------------------

#

# Most of build commands in Kbuild start with "cmd_". You can optionally define

# "quiet_cmd_*". If defined, the short log is printed. Otherwise, no log from

# that command is printed by default.

#

# e.g.)

#    quiet_cmd_depmod = DEPMOD  $(MODLIB)

#          cmd_depmod = $(srctree)/scripts/depmod.sh $(DEPMOD) $(KERNELRELEASE)

#

# A simple variant is to prefix commands with $(Q) - that's useful

# for commands that shall be hidden in non-verbose mode.

#

#    $(Q)$(MAKE) $(build)=scripts/basic

#

# To put more focus on warnings, be less verbose as default

# Use 'make V=1' to see the full commands



ifeq ($(V),1)

  quiet =

  Q =

else

  quiet = quiet_

  Q = @

endif



# If the user is running make -s (silent mode), suppress echoing of commands

# make-4.0 (and later) keep single letter options in the 1st word of MAKEFLAGS.

ifeq ($(filter 3.%,$(MAKE_VERSION)),)
@@ -146,8 +173,11 @@ endif 


ifneq ($(findstring s,$(short-opts)),)

  silent=1

  quiet=silent_

endif



export quiet Q



#

# Define a callable command for descending to a new directory

#