[PATCH 2/2] malloc: add testing for large tcache support.

[Cupertino Miranda]

This patch adds large tcache support tests by re-executing
all of the malloc tests, using the tunables:
  glibc.malloc.tcache_max=1048576
  glibc.mallc.tcache_max_large_capacity=4194304
Test names are prefixed with "largetcache".
---
 Rules           | 19 +++++++++++++++++++
 malloc/Makefile | 11 +++++++++++
 2 files changed, 30 insertions(+)

diff --git a/Rules b/Rules
index 713c225d2e..9cccdd2160 100644
--- a/Rules
+++ b/Rules
@@ -151,6 +151,7 @@ tests: $(addprefix $(objpfx),$(filter-out $(tests-unsupported), \
 					  $(tests-malloc-check:%=%-malloc-check) \
 					  $(tests-malloc-hugetlb1:%=%-malloc-hugetlb1) \
 					  $(tests-malloc-hugetlb2:%=%-malloc-hugetlb2)) \
+					  $(tests-malloc-largetcache:%=%-malloc-largetcache)) \
 			     $(test-srcs)) $(tests-special) \
 			     $(tests-printers-programs)
 xtests: tests $(xtests-special)
@@ -163,6 +164,7 @@ tests: $(tests:%=$(objpfx)%.out) $(tests-internal:%=$(objpfx)%.out) \
        $(tests-malloc-check:%=$(objpfx)%-malloc-check.out) \
        $(tests-malloc-hugetlb1:%=$(objpfx)%-malloc-hugetlb1.out) \
        $(tests-malloc-hugetlb2:%=$(objpfx)%-malloc-hugetlb2.out) \
+       $(tests-malloc-largetcache:%=$(objpfx)%-malloc-largetcache.out) \
        $(tests-special) $(tests-printers-out)
 xtests: tests $(xtests:%=$(objpfx)%.out) $(xtests-special)
 endif # $(run-built-tests) != no
@@ -177,6 +179,7 @@ tests-expected = $(tests) $(tests-internal) $(tests-printers) \
 	$(tests-container) $(tests-malloc-check:%=%-malloc-check) \
 	$(tests-malloc-hugetlb1:%=%-malloc-hugetlb1) \
 	$(tests-malloc-hugetlb2:%=%-malloc-hugetlb2) \
+	$(tests-malloc-largetcache:%=%-malloc-largetcache) \
 	$(tests-mcheck:%=%-mcheck)
 xtests-expected = $(xtests)
 endif # $(run-built-tests) != no
@@ -209,6 +212,7 @@ binaries-mcheck-tests = $(tests-mcheck:%=%-mcheck)
 binaries-malloc-check-tests = $(tests-malloc-check:%=%-malloc-check)
 binaries-malloc-hugetlb1-tests = $(tests-malloc-hugetlb1:%=%-malloc-hugetlb1)
 binaries-malloc-hugetlb2-tests = $(tests-malloc-hugetlb2:%=%-malloc-hugetlb2)
+binaries-malloc-largetcache-tests = $(tests-malloc-largetcache:%=%-malloc-largetcache)
 else
 binaries-all-notests =
 binaries-all-tests = $(tests) $(tests-internal) $(xtests) $(test-srcs)
@@ -222,6 +226,7 @@ binaries-mcheck-tests =
 binaries-malloc-check-tests =
 binaries-malloc-hugetlb1-tests =
 binaries-malloc-hugetlb2-tests =
+binaries-malloc-largetcache-tests =
 endif
 
 binaries-pie = $(binaries-pie-tests) $(binaries-pie-notests)
@@ -288,6 +293,14 @@ $(addprefix $(objpfx),$(binaries-malloc-hugetlb2-tests)): %-malloc-hugetlb2: %.o
 	$(+link-tests)
 endif
 
+ifneq "$(strip $(binaries-malloc-largetcache-tests))" ""
+$(addprefix $(objpfx),$(binaries-malloc-largetcache-tests)): %-malloc-largetcache: %.o \
+  $(link-extra-libs-tests) \
+  $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
+  $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
+	$(+link-tests)
+endif
+
 ifneq "$(strip $(binaries-pie-tests))" ""
 $(addprefix $(objpfx),$(binaries-pie-tests)): %: %.o \
   $(link-extra-libs-tests) \
@@ -337,6 +350,12 @@ $(1)-malloc-hugetlb2-ENV += GLIBC_TUNABLES=glibc.malloc.hugetlb=2
 endef
 $(foreach t,$(tests-malloc-hugetlb2),$(eval $(call malloc-hugetlb2-ENVS,$(t))))
 
+# All malloc-largetcache tests will be run with GLIBC_TUNABLE=glibc.malloc.tcache_max=1048576:glibc.mallc.tcache_max_large_capacity=4194304
+define malloc-largetcache-ENVS
+$(1)-malloc-largetcache-ENV += GLIBC_TUNABLES=glibc.malloc.tcache_max=1048576:glibc.mallc.tcache_max_large_capacity=4194304
+endef
+$(foreach t,$(tests-malloc-largetcache),$(eval $(call malloc-largetcache-ENVS,$(t))))
+
 # mcheck tests need the debug DSO to support -lmcheck.
 define mcheck-ENVS
 $(1)-mcheck-ENV = LD_PRELOAD=$(common-objpfx)/malloc/libc_malloc_debug.so
diff --git a/malloc/Makefile b/malloc/Makefile
index 1630aaf6ac..2df2b215da 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -147,6 +147,17 @@ tests-malloc-hugetlb1 = \
 tests-malloc-hugetlb2 = \
 	$(filter-out $(tests-exclude-hugetlb2), $(tests))
 
+tests-exclude-largetcache = \
+  tst-compathooks-off \
+  tst-compathooks-on \
+  tst-interpose-thread \
+  tst-mallocstate \
+  tst-malloc-backtrace \
+  tst-malloc-usable-tunables
+
+tests-malloc-largetcache = \
+	$(filter-out $(tests-exclude-largetcache), $(tests))
+
 # -lmcheck needs __malloc_initialize_hook, which was deprecated in 2.24.
 ifeq ($(have-GLIBC_2.23)$(build-shared),yesyes)
 # Tests that don't play well with mcheck.  They are either bugs in mcheck or
-- 
2.39.5