2020-03-18 20:46:27

by Jiri Olsa

[permalink] [raw]
Subject: [PATCH] perf tools: Unify a bit the build directory output

Removing the extra 'SUBDIR' line from clean and doc build
output. Because it's annoying.. ;-)

Before:
$ make clean
...
SUBDIR Documentation
CLEAN Documentation

After:
$ make clean
...
CLEAN Documentation

Before:
$ make doc
BUILD: Doing 'make -j8' parallel build
SUBDIR Documentation
ASCIIDOC perf-stat.html
...

After:
$ make doc
BUILD: Doing 'make -j8' parallel build
ASCIIDOC perf-stat.html
...

Signed-off-by: Jiri Olsa <[email protected]>
---
tools/perf/Makefile.perf | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 3eda9d4b88e7..a02aca9b21f4 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -231,6 +231,7 @@ TRACE_EVENT_DIR = $(srctree)/tools/lib/traceevent/
BPF_DIR = $(srctree)/tools/lib/bpf/
SUBCMD_DIR = $(srctree)/tools/lib/subcmd/
LIBPERF_DIR = $(srctree)/tools/lib/perf/
+DOC_DIR = $(srctree)/tools/perf/Documentation/

# Set FEATURE_TESTS to 'all' so all possible feature checkers are executed.
# Without this setting the output feature dump file misses some features, for
@@ -792,7 +793,6 @@ $(LIBSUBCMD): FORCE
$(Q)$(MAKE) -C $(SUBCMD_DIR) O=$(OUTPUT) $(OUTPUT)libsubcmd.a

$(LIBSUBCMD)-clean:
- $(call QUIET_CLEAN, libsubcmd)
$(Q)$(MAKE) -C $(SUBCMD_DIR) O=$(OUTPUT) clean

help:
@@ -832,7 +832,7 @@ INSTALL_DOC_TARGETS += quick-install-doc quick-install-man quick-install-html

# 'make doc' should call 'make -C Documentation all'
$(DOC_TARGETS):
- $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) $(@:doc=all)
+ $(Q)$(MAKE) -C $(DOC_DIR) O=$(OUTPUT) $(@:doc=all)

TAG_FOLDERS= . ../lib ../include
TAG_FILES= ../../include/uapi/linux/perf_event.h
@@ -959,7 +959,7 @@ install-python_ext:

# 'make install-doc' should call 'make -C Documentation install'
$(INSTALL_DOC_TARGETS):
- $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) $(@:-doc=)
+ $(Q)$(MAKE) -C $(DOC_DIR) O=$(OUTPUT) $(@:-doc=)

### Cleaning rules

@@ -1008,7 +1008,8 @@ clean:: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clea
$(OUTPUT)$(rename_flags_array) \
$(OUTPUT)$(arch_errno_name_array) \
$(OUTPUT)$(sync_file_range_arrays)
- $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
+ $(call QUIET_CLEAN, Documentation) \
+ $(MAKE) -C $(DOC_DIR) O=$(OUTPUT) clean >/dev/null

#
# To provide FEATURE-DUMP into $(FEATURE_DUMP_COPY)
--
2.25.1


2020-03-19 18:26:29

by Arnaldo Carvalho de Melo

[permalink] [raw]
Subject: Re: [PATCH] perf tools: Unify a bit the build directory output

Em Wed, Mar 18, 2020 at 09:45:22PM +0100, Jiri Olsa escreveu:
> Removing the extra 'SUBDIR' line from clean and doc build
> output. Because it's annoying.. ;-)
>
> Before:
> $ make clean
> ...
> SUBDIR Documentation
> CLEAN Documentation
>
> After:
> $ make clean
> ...
> CLEAN Documentation

Thanks, applied to perf/core.

- Arnaldo

2020-03-19 18:58:38

by Arnaldo Carvalho de Melo

[permalink] [raw]
Subject: Re: [PATCH] perf tools: Unify a bit the build directory output

Em Thu, Mar 19, 2020 at 03:25:14PM -0300, Arnaldo Carvalho de Melo escreveu:
> Em Wed, Mar 18, 2020 at 09:45:22PM +0100, Jiri Olsa escreveu:
> > Removing the extra 'SUBDIR' line from clean and doc build
> > output. Because it's annoying.. ;-)
> >
> > Before:
> > $ make clean
> > ...
> > SUBDIR Documentation
> > CLEAN Documentation
> >
> > After:
> > $ make clean
> > ...
> > CLEAN Documentation
>
> Thanks, applied to perf/core.

Hey, since you're annoyed, how about sending a patch to ditch this one:

make[3]: Nothing to be done for '/tmp/build/perf/plugins/libtraceevent-dynamic-list'.

? ;-)

- Arnaldo

2020-03-19 19:29:08

by Jiri Olsa

[permalink] [raw]
Subject: Re: [PATCH] perf tools: Unify a bit the build directory output

On Thu, Mar 19, 2020 at 03:57:50PM -0300, Arnaldo Carvalho de Melo wrote:
> Em Thu, Mar 19, 2020 at 03:25:14PM -0300, Arnaldo Carvalho de Melo escreveu:
> > Em Wed, Mar 18, 2020 at 09:45:22PM +0100, Jiri Olsa escreveu:
> > > Removing the extra 'SUBDIR' line from clean and doc build
> > > output. Because it's annoying.. ;-)
> > >
> > > Before:
> > > $ make clean
> > > ...
> > > SUBDIR Documentation
> > > CLEAN Documentation
> > >
> > > After:
> > > $ make clean
> > > ...
> > > CLEAN Documentation
> >
> > Thanks, applied to perf/core.
>
> Hey, since you're annoyed, how about sending a patch to ditch this one:
>
> make[3]: Nothing to be done for '/tmp/build/perf/plugins/libtraceevent-dynamic-list'.
>
> ? ;-)

I'll add it to my 'when annoyed todo list' .. which is getting
more and more attention in this lock down time ;-)

jirka

Subject: [tip: perf/urgent] perf tools: Unify a bit the build directory output

The following commit has been merged into the perf/urgent branch of tip:

Commit-ID: 7cd053d4cf8a3dc1a06bdb4be0ed9b0ecbaa21f5
Gitweb: https://git.kernel.org/tip/7cd053d4cf8a3dc1a06bdb4be0ed9b0ecbaa21f5
Author: Jiri Olsa <[email protected]>
AuthorDate: Wed, 18 Mar 2020 21:45:22 +01:00
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitterDate: Tue, 24 Mar 2020 10:35:58 -03:00

perf tools: Unify a bit the build directory output

Removing the extra 'SUBDIR' line from clean and doc build output.
Because it's annoying.. ;-)

Before:

$ make clean
...
SUBDIR Documentation
CLEAN Documentation

After:

$ make clean
...
CLEAN Documentation

Before:

$ make doc
BUILD: Doing 'make -j8' parallel build
SUBDIR Documentation
ASCIIDOC perf-stat.html
...

After:

$ make doc
BUILD: Doing 'make -j8' parallel build
ASCIIDOC perf-stat.html
...

Signed-off-by: Jiri Olsa <[email protected]>
Tested-by: Arnaldo Carvalho de Melo <[email protected]>
Cc: Alexander Shishkin <[email protected]>
Cc: Michael Petlan <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/Makefile.perf | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 3eda9d4..a02aca9 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -231,6 +231,7 @@ TRACE_EVENT_DIR = $(srctree)/tools/lib/traceevent/
BPF_DIR = $(srctree)/tools/lib/bpf/
SUBCMD_DIR = $(srctree)/tools/lib/subcmd/
LIBPERF_DIR = $(srctree)/tools/lib/perf/
+DOC_DIR = $(srctree)/tools/perf/Documentation/

# Set FEATURE_TESTS to 'all' so all possible feature checkers are executed.
# Without this setting the output feature dump file misses some features, for
@@ -792,7 +793,6 @@ $(LIBSUBCMD): FORCE
$(Q)$(MAKE) -C $(SUBCMD_DIR) O=$(OUTPUT) $(OUTPUT)libsubcmd.a

$(LIBSUBCMD)-clean:
- $(call QUIET_CLEAN, libsubcmd)
$(Q)$(MAKE) -C $(SUBCMD_DIR) O=$(OUTPUT) clean

help:
@@ -832,7 +832,7 @@ INSTALL_DOC_TARGETS += quick-install-doc quick-install-man quick-install-html

# 'make doc' should call 'make -C Documentation all'
$(DOC_TARGETS):
- $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) $(@:doc=all)
+ $(Q)$(MAKE) -C $(DOC_DIR) O=$(OUTPUT) $(@:doc=all)

TAG_FOLDERS= . ../lib ../include
TAG_FILES= ../../include/uapi/linux/perf_event.h
@@ -959,7 +959,7 @@ install-python_ext:

# 'make install-doc' should call 'make -C Documentation install'
$(INSTALL_DOC_TARGETS):
- $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) $(@:-doc=)
+ $(Q)$(MAKE) -C $(DOC_DIR) O=$(OUTPUT) $(@:-doc=)

### Cleaning rules

@@ -1008,7 +1008,8 @@ clean:: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clea
$(OUTPUT)$(rename_flags_array) \
$(OUTPUT)$(arch_errno_name_array) \
$(OUTPUT)$(sync_file_range_arrays)
- $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
+ $(call QUIET_CLEAN, Documentation) \
+ $(MAKE) -C $(DOC_DIR) O=$(OUTPUT) clean >/dev/null

#
# To provide FEATURE-DUMP into $(FEATURE_DUMP_COPY)