From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 15 May 2012 08:33:44 +0000 (+0200)
Subject: [ng] check: memoize some internal vars (avoid useless recalculation)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=v1.12-233-g0010655;p=thirdparty%2Fautomake.git

[ng] check: memoize some internal vars (avoid useless recalculation)

Thanks to our recently-introduced support for memoization of make
variables, we can avoid some useless re-calculation of few internal
variables used by the parallel testsuite harness support, thus
improving performances in some common use cases.

More precisely, we have measured the times required to complete null
"make all", "make recheck" and "make check AM_LAZY_CHECK=yes"
invocations in a package with 5000 tests in the top-level directory
and other 5000 tests in a subdirectory.  Here are the results,
averaged on a several runs:

+ Before this patch:
  - "make all"                           2.9 seconds
  - "make recheck"                       4.9 seconds
  - "make check AM_LAZY_CHECK=yes"      18.1 seconds

+ After this patch:
  - "make all"                           2.7 seconds
  - "make recheck"                       3.9 seconds
  - "make check AM_LAZY_CHECK=yes"      15.2 seconds

+ In mainline automake (commit v1.12-75-gd89da9c):
  - "make all"                           0.9 seconds
  - "make recheck"                       3.5 seconds
  - "make check RECHECK_LOGS="          14.1 seconds

So we still have a problem with "make all".  That's due to performance
issues with the internal make function 'am__strip_suffixes', which will
be dealt with in a later patch.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/lib/am/check.am b/lib/am/check.am
index df2c40c35..903dfc247 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -196,14 +196,18 @@ END { \
 am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
 
 # This supports runtime overriding of $(TESTS) and $(XFAIL_TESTS).
-am__test_bases       = $(call am__get_test_bases, $(TESTS))
-am__xfail_test_bases = $(call am__get_test_bases, $(XFAIL_TESTS))
+am__test_bases = \
+  $(call am__memoize,am__test_bases,$(call am__get_test_bases,$(TESTS)))
+am__xfail_test_bases = \
+  $(call am__memoize,am__xfail_test_bases,$(call am__get_test_bases,$(XFAIL_TESTS)))
 
 # The $(strip) is to work around the GNU make 3.80 bug where trailing
 # whitespace in "TESTS = foo.test $(empty)" causes $(TESTS_LOGS) to
 # erroneously expand to "foo.log .log".
-am__test_results = $(addsuffix .trs,$(strip $(am__test_bases)))
-am__test_logs    = $(addsuffix .log,$(strip $(am__test_bases)))
+am__test_results = \
+  $(call am__memoize,am__test_results,$(addsuffix .trs,$(strip $(am__test_bases))))
+am__test_logs = \
+  $(call am__memoize,am__test_logs,$(addsuffix .log,$(strip $(am__test_bases))))
 
 # $(TEST_LOGS) is a published interface.
 TEST_LOGS = $(am__test_logs)