Commit f2868b1a authored by Charlie Jenkins's avatar Charlie Jenkins Committed by Namhyung Kim
Browse files

perf tools: Expose quiet/verbose variables in Makefile.perf 



The variables to make builds silent/verbose live inside
tools/build/Makefile.build. Move those variables to the top-level
Makefile.perf to be generally available.

Committer testing:

See the SYSCALL lines, now they are consistent with the other
operations in other lines:
  SYSTBL  /tmp/build/perf-tools-next/arch/x86/include/generated/asm/syscalls_32.h
  SYSTBL  /tmp/build/perf-tools-next/arch/x86/include/generated/asm/syscalls_64.h
  GEN     /tmp/build/perf-tools-next/common-cmds.h
  GEN     /tmp/build/perf-tools-next/arch/arm64/include/generated/asm/sysreg-defs.h
  PERF_VERSION = 6.13.rc2.g3d94bb6ed1d0
  GEN     perf-archive
  MKDIR   /tmp/build/perf-tools-next/jvmti/
  MKDIR   /tmp/build/perf-tools-next/jvmti/
  MKDIR   /tmp/build/perf-tools-next/jvmti/
  MKDIR   /tmp/build/perf-tools-next/jvmti/
  GEN     perf-iostat
  CC      /tmp/build/perf-tools-next/jvmti/libjvmti.o

Reported-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarCharlie Jenkins <charlie@rivosinc.com>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: coresight@lists.linaro.org
Link: https://lore.kernel.org/r/20250114-perf_make_test-v1-1-decc1c517b11@rivosinc.com


Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent e9cbc854

tools/build/Makefile.build

+0 −20
Original line number Diff line number Diff line
@@ -12,26 +12,6 @@ 
PHONY := __build

__build:



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



build-dir := $(srctree)/tools/build



# Define $(fixdep) for dep-cmd function

tools/perf/Makefile.perf

+36 −1
Original line number Diff line number Diff line
@@ -161,12 +161,47 @@ 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/perf/tests/shell/coresight/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -24,6 +24,6 @@ CLEANDIRS = $(SUBDIRS:%=clean-%) 


clean: $(CLEANDIRS)

$(CLEANDIRS):

	$(call QUIET_CLEAN, test-$(@:clean-%=%)) $(Q)$(MAKE) -C $(@:clean-%=%) clean >/dev/null

	$(call QUIET_CLEAN, test-$(@:clean-%=%)) $(MAKE) -C $(@:clean-%=%) clean >/dev/null



.PHONY: all clean $(SUBDIRS) $(CLEANDIRS) $(INSTALLDIRS)