* [PATCH v2 2/5] Documentation/Makefile: conditionally include ../GIT-VERSION-FILE
@ 2020-12-07 0:32 Ramsay Jones
2020-12-07 3:21 ` Felipe Contreras
2020-12-07 7:45 ` Junio C Hamano
0 siblings, 2 replies; 4+ messages in thread
From: Ramsay Jones @ 2020-12-07 0:32 UTC (permalink / raw)
To: Junio C Hamano; +Cc: GIT Mailing-list
The 'clean' target is still noticeably slow on cygwin, despite the
substantial improvement made by the previous patch. For example, the
second invocation of 'make clean' below:
$ make clean >/dev/null 2>&1
$ make clean
...
make[1]: Entering directory '/home/ramsay/git/Documentation'
make[2]: Entering directory '/home/ramsay/git'
make[2]: 'GIT-VERSION-FILE' is up to date.
make[2]: Leaving directory '/home/ramsay/git'
...
$
has been timed at 12.364s on my laptop (on old core i5-4200M @ 2.50GHz,
8GB RAM, 1TB HDD).
Notice that the 'clean' target is making a nested call to the parent
Makefile to ensure that the GIT-VERSION-FILE is up-to-date (prior to
the previous patch, there would have been _two_ such invocations).
This is to ensure that the $(GIT_VERSION) make variable is set, once
that file had been included. However, the 'clean' target does not use
the $(GIT_VERSION) variable, so this is wasted effort.
In order to eliminate such wasted effort, use the value of the internal
$(MAKECMDGOALS) variable to only '-include ../GIT-VERSION-FILE' when the
target is not 'clean'. (This drops the time down to 10.361s, on my laptop,
giving an improvement of 16.20%).
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---
Documentation/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 652d57a1b6..5c680024eb 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -272,7 +272,9 @@ install-html: html
../GIT-VERSION-FILE: FORCE
$(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE
+ifneq ($(MAKECMDGOALS),clean)
-include ../GIT-VERSION-FILE
+endif
#
# Determine "include::" file references in asciidoc files.
--
2.29.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 2/5] Documentation/Makefile: conditionally include ../GIT-VERSION-FILE
2020-12-07 0:32 [PATCH v2 2/5] Documentation/Makefile: conditionally include ../GIT-VERSION-FILE Ramsay Jones
@ 2020-12-07 3:21 ` Felipe Contreras
2020-12-08 22:23 ` Ramsay Jones
2020-12-07 7:45 ` Junio C Hamano
1 sibling, 1 reply; 4+ messages in thread
From: Felipe Contreras @ 2020-12-07 3:21 UTC (permalink / raw)
To: Ramsay Jones; +Cc: Junio C Hamano, GIT Mailing-list
On Sun, Dec 6, 2020 at 6:35 PM Ramsay Jones <ramsay@ramsayjones.plus.com> wrote:
>
>
> The 'clean' target is still noticeably slow on cygwin, despite the
> substantial improvement made by the previous patch. For example, the
> second invocation of 'make clean' below:
>
> $ make clean >/dev/null 2>&1
> $ make clean
> ...
> make[1]: Entering directory '/home/ramsay/git/Documentation'
> make[2]: Entering directory '/home/ramsay/git'
> make[2]: 'GIT-VERSION-FILE' is up to date.
> make[2]: Leaving directory '/home/ramsay/git'
> ...
> $
>
> has been timed at 12.364s on my laptop (on old core i5-4200M @ 2.50GHz,
> 8GB RAM, 1TB HDD).
>
> Notice that the 'clean' target is making a nested call to the parent
> Makefile to ensure that the GIT-VERSION-FILE is up-to-date (prior to
> the previous patch, there would have been _two_ such invocations).
> This is to ensure that the $(GIT_VERSION) make variable is set, once
> that file had been included. However, the 'clean' target does not use
> the $(GIT_VERSION) variable, so this is wasted effort.
Yes, this is the important information: "the 'clean' target does not use
the $(GIT_VERSION) variable". I would feature it at the start of the
commit message.
--
Felipe Contreras
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 2/5] Documentation/Makefile: conditionally include ../GIT-VERSION-FILE
2020-12-07 3:21 ` Felipe Contreras
@ 2020-12-08 22:23 ` Ramsay Jones
0 siblings, 0 replies; 4+ messages in thread
From: Ramsay Jones @ 2020-12-08 22:23 UTC (permalink / raw)
To: Felipe Contreras; +Cc: Junio C Hamano, GIT Mailing-list
On 07/12/2020 03:21, Felipe Contreras wrote:
> On Sun, Dec 6, 2020 at 6:35 PM Ramsay Jones <ramsay@ramsayjones.plus.com> wrote:
[snip]
>> Notice that the 'clean' target is making a nested call to the parent
>> Makefile to ensure that the GIT-VERSION-FILE is up-to-date (prior to
>> the previous patch, there would have been _two_ such invocations).
>> This is to ensure that the $(GIT_VERSION) make variable is set, once
>> that file had been included. However, the 'clean' target does not use
>> the $(GIT_VERSION) variable, so this is wasted effort.
>
> Yes, this is the important information: "the 'clean' target does not use
> the $(GIT_VERSION) variable". I would feature it at the start of the
> commit message.
Heh, I didn't intend to 'bury the lead' here. I spent about 30 minutes
re-writing this message to come up with an improvement; I'm not sure
that I succeeded. ;-)
v3 comming soon ...
Thanks!
ATB,
Ramsay Jones
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 2/5] Documentation/Makefile: conditionally include ../GIT-VERSION-FILE
2020-12-07 0:32 [PATCH v2 2/5] Documentation/Makefile: conditionally include ../GIT-VERSION-FILE Ramsay Jones
2020-12-07 3:21 ` Felipe Contreras
@ 2020-12-07 7:45 ` Junio C Hamano
1 sibling, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2020-12-07 7:45 UTC (permalink / raw)
To: Ramsay Jones; +Cc: GIT Mailing-list
Ramsay Jones <ramsay@ramsayjones.plus.com> writes:
> The 'clean' target is still noticeably slow on cygwin, despite the
> substantial improvement made by the previous patch. For example, the
> second invocation of 'make clean' below:
>
> $ make clean >/dev/null 2>&1
> $ make clean
> ...
> make[1]: Entering directory '/home/ramsay/git/Documentation'
> make[2]: Entering directory '/home/ramsay/git'
> make[2]: 'GIT-VERSION-FILE' is up to date.
> make[2]: Leaving directory '/home/ramsay/git'
> ...
> $
>
> has been timed at 12.364s on my laptop (on old core i5-4200M @ 2.50GHz,
> 8GB RAM, 1TB HDD).
>
> Notice that the 'clean' target is making a nested call to the parent
> Makefile to ensure that the GIT-VERSION-FILE is up-to-date (prior to
> the previous patch, there would have been _two_ such invocations).
> This is to ensure that the $(GIT_VERSION) make variable is set, once
> that file had been included. However, the 'clean' target does not use
> the $(GIT_VERSION) variable, so this is wasted effort.
>
> In order to eliminate such wasted effort, use the value of the internal
> $(MAKECMDGOALS) variable to only '-include ../GIT-VERSION-FILE' when the
> target is not 'clean'. (This drops the time down to 10.361s, on my laptop,
> giving an improvement of 16.20%).
Again, nicely explained.
>
> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
> ---
> Documentation/Makefile | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/Documentation/Makefile b/Documentation/Makefile
> index 652d57a1b6..5c680024eb 100644
> --- a/Documentation/Makefile
> +++ b/Documentation/Makefile
> @@ -272,7 +272,9 @@ install-html: html
> ../GIT-VERSION-FILE: FORCE
> $(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE
>
> +ifneq ($(MAKECMDGOALS),clean)
> -include ../GIT-VERSION-FILE
> +endif
>
> #
> # Determine "include::" file references in asciidoc files.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-12-08 22:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-07 0:32 [PATCH v2 2/5] Documentation/Makefile: conditionally include ../GIT-VERSION-FILE Ramsay Jones
2020-12-07 3:21 ` Felipe Contreras
2020-12-08 22:23 ` Ramsay Jones
2020-12-07 7:45 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).