Support parallel testing in libgomp, part I [PR66005]

..., while still hard-coding the number of parallel slots to one.

	PR testsuite/66005
	libgomp/
	* testsuite/Makefile.am (PWD_COMMAND): New variable.
	(%/site.exp): New target.
	(check_p_numbers0, check_p_numbers1, check_p_numbers2)
	(check_p_numbers3, check_p_numbers4, check_p_numbers5)
	(check_p_numbers6, check_p_numbers, gcc_test_parallel_slots)
	(check_p_subdirs)
	(check_DEJAGNU_libgomp_targets): New variables.
	($(check_DEJAGNU_libgomp_targets)): New target.
	($(check_DEJAGNU_libgomp_targets)): New dependency.
	(check-DEJAGNU $(check_DEJAGNU_libgomp_targets)): New targets.
	* testsuite/Makefile.in: Regenerate.
	* testsuite/lib/libgomp.exp: For parallel testing,
	'load_file ../libgomp-test-support.exp'.

Co-authored-by: Thomas Schwinge <thomas@codesourcery.com>

diff --git a/libgomp/testsuite/Makefile.am b/libgomp/testsuite/Makefile.am
index 655a413c160b5686c159b6ce2b89b01c621c1f11..eef02f4a8c25b179e2772e24b1ad22836570e0b2 100644 (file)
--- a/libgomp/testsuite/Makefile.am
+++ b/libgomp/testsuite/Makefile.am
@@ -12,6 +12,8 @@ _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
             echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
 RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
 
+PWD_COMMAND = $${PWDCMD-pwd}
+
 EXTRA_DEJAGNU_SITE_CONFIG = libgomp-site-extra.exp
 
 # Instead of directly in ../testsuite/libgomp-test-support.exp.in, the
@@ -25,17 +27,6 @@ libgomp-test-support.exp: libgomp-test-support.pt.exp Makefile
          'set offload_additional_lib_paths "$(offload_additional_lib_paths)"'
        mv $@.tmp $@
 
-check-DEJAGNU: site.exp
-       srcdir='$(srcdir)'; export srcdir; \
-       EXPECT=$(EXPECT); export EXPECT; \
-       if $(SHELL) -c "$(_RUNTEST) --version" > /dev/null 2>&1; then \
-         exit_status=0; l='$(PACKAGE)'; for tool in $$l; do \
-           if $(_RUNTEST) $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \
-           then :; else exit_status=1; fi; \
-         done; \
-       else echo "WARNING: could not find '$(_RUNTEST)'" 1>&2; :;\
-       fi; \
-       exit $$exit_status
 site.exp: Makefile $(EXTRA_DEJAGNU_SITE_CONFIG)
        @echo 'Making a new site.exp file ...'
        @echo '## these variables are automatically generated by make ##' >site.tmp
@@ -63,6 +54,71 @@ site.exp: Makefile $(EXTRA_DEJAGNU_SITE_CONFIG)
        @test ! -f site.exp || mv site.exp site.bak
        @mv site.tmp site.exp
 
+%/site.exp: site.exp
+       -@test -d $* || mkdir $*
+       @srcdir=`cd $(srcdir); ${PWD_COMMAND}`;
+       @objdir=`${PWD_COMMAND}`/$*; \
+       sed -e "s|^set srcdir .*$$|set srcdir $$srcdir|" \
+           -e "s|^set objdir .*$$|set objdir $$objdir|" \
+           site.exp > $*/site.exp.tmp
+       @-rm -f $*/site.bak
+       @test ! -f $*/site.exp || mv $*/site.exp $*/site.bak
+       @mv $*/site.exp.tmp $*/site.exp
+
+check_p_numbers0:=1 2 3 4 5 6 7 8 9
+check_p_numbers1:=0 $(check_p_numbers0)
+check_p_numbers2:=$(foreach i,$(check_p_numbers0),$(addprefix $(i),$(check_p_numbers1)))
+check_p_numbers3:=$(addprefix 0,$(check_p_numbers1)) $(check_p_numbers2)
+check_p_numbers4:=$(foreach i,$(check_p_numbers0),$(addprefix $(i),$(check_p_numbers3)))
+check_p_numbers5:=$(addprefix 0,$(check_p_numbers3)) $(check_p_numbers4)
+check_p_numbers6:=$(foreach i,$(check_p_numbers0),$(addprefix $(i),$(check_p_numbers5)))
+check_p_numbers:=$(check_p_numbers0) $(check_p_numbers2) $(check_p_numbers4) $(check_p_numbers6)
+gcc_test_parallel_slots:=1
+check_p_subdirs=$(wordlist 1,$(gcc_test_parallel_slots),$(check_p_numbers))
+check_DEJAGNU_libgomp_targets = $(addprefix check-DEJAGNUlibgomp,$(check_p_subdirs))
+$(check_DEJAGNU_libgomp_targets): check-DEJAGNUlibgomp%: libgomp%/site.exp
+
+check-DEJAGNU $(check_DEJAGNU_libgomp_targets): check-DEJAGNU%: site.exp
+       $(if $*,@)AR="$(AR)"; export AR; \
+       RANLIB="$(RANLIB)"; export RANLIB; \
+       if [ -z "$*" ] && [ -n "$(filter -j%, $(MFLAGS))" ]; then \
+         rm -rf libgomp-parallel || true; \
+         mkdir libgomp-parallel; \
+         $(MAKE) $(AM_MAKEFLAGS) $(check_DEJAGNU_libgomp_targets); \
+         rm -rf libgomp-parallel || true; \
+         for idx in $(check_p_subdirs); do \
+           if [ -d libgomp$$idx ]; then \
+             mv -f libgomp$$idx/libgomp.sum libgomp$$idx/libgomp.sum.sep; \
+             mv -f libgomp$$idx/libgomp.log libgomp$$idx/libgomp.log.sep; \
+           fi; \
+         done; \
+         $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh \
+           libgomp[0-9]*/libgomp.sum.sep > libgomp.sum; \
+         $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh -L \
+           libgomp[0-9]*/libgomp.log.sep > libgomp.log; \
+         exit 0; \
+       fi; \
+       srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \
+       EXPECT=$(EXPECT); export EXPECT; \
+       runtest=$(_RUNTEST); \
+       if [ -z "$$runtest" ]; then runtest=runtest; fi; \
+       tool=libgomp; \
+       if [ -n "$*" ]; then \
+         if [ -f libgomp-parallel/finished ]; then rm -rf "$*"; exit 0; fi; \
+         GCC_RUNTEST_PARALLELIZE_DIR=`${PWD_COMMAND}`/libgomp-parallel; \
+         export GCC_RUNTEST_PARALLELIZE_DIR; \
+         cd "$*"; \
+       fi; \
+       if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
+         $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \
+                   $(RUNTESTFLAGS); \
+         if [ -n "$*" ]; then \
+           touch $$GCC_RUNTEST_PARALLELIZE_DIR/finished; \
+         fi; \
+       else \
+         echo "WARNING: could not find \`runtest'" 1>&2; :;\
+       fi
+
 distclean-DEJAGNU:
        -rm -f site.exp site.bak
        -l='$(PACKAGE)'; for tool in $$l; do \

diff --git a/libgomp/testsuite/Makefile.in b/libgomp/testsuite/Makefile.in
index 4e8b21e8b38c751b13e43abc5030b84862df1635..69d5fa7fb2e05824c249c38f94d90bbbfea2bbe4 100644 (file)
--- a/libgomp/testsuite/Makefile.in
+++ b/libgomp/testsuite/Makefile.in
@@ -300,7 +300,19 @@ _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
             echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
 
 RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
+PWD_COMMAND = $${PWDCMD-pwd}
 EXTRA_DEJAGNU_SITE_CONFIG = libgomp-site-extra.exp
+check_p_numbers0 := 1 2 3 4 5 6 7 8 9
+check_p_numbers1 := 0 $(check_p_numbers0)
+check_p_numbers2 := $(foreach i,$(check_p_numbers0),$(addprefix $(i),$(check_p_numbers1)))
+check_p_numbers3 := $(addprefix 0,$(check_p_numbers1)) $(check_p_numbers2)
+check_p_numbers4 := $(foreach i,$(check_p_numbers0),$(addprefix $(i),$(check_p_numbers3)))
+check_p_numbers5 := $(addprefix 0,$(check_p_numbers3)) $(check_p_numbers4)
+check_p_numbers6 := $(foreach i,$(check_p_numbers0),$(addprefix $(i),$(check_p_numbers5)))
+check_p_numbers := $(check_p_numbers0) $(check_p_numbers2) $(check_p_numbers4) $(check_p_numbers6)
+gcc_test_parallel_slots := 1
+check_p_subdirs = $(wordlist 1,$(gcc_test_parallel_slots),$(check_p_numbers))
+check_DEJAGNU_libgomp_targets = $(addprefix check-DEJAGNUlibgomp,$(check_p_subdirs))
 all: all-am
 
 .SUFFIXES:
@@ -475,17 +487,6 @@ libgomp-test-support.exp: libgomp-test-support.pt.exp Makefile
          'set offload_additional_lib_paths "$(offload_additional_lib_paths)"'
        mv $@.tmp $@
 
-check-DEJAGNU: site.exp
-       srcdir='$(srcdir)'; export srcdir; \
-       EXPECT=$(EXPECT); export EXPECT; \
-       if $(SHELL) -c "$(_RUNTEST) --version" > /dev/null 2>&1; then \
-         exit_status=0; l='$(PACKAGE)'; for tool in $$l; do \
-           if $(_RUNTEST) $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \
-           then :; else exit_status=1; fi; \
-         done; \
-       else echo "WARNING: could not find '$(_RUNTEST)'" 1>&2; :;\
-       fi; \
-       exit $$exit_status
 site.exp: Makefile $(EXTRA_DEJAGNU_SITE_CONFIG)
        @echo 'Making a new site.exp file ...'
        @echo '## these variables are automatically generated by make ##' >site.tmp
@@ -513,6 +514,59 @@ site.exp: Makefile $(EXTRA_DEJAGNU_SITE_CONFIG)
        @test ! -f site.exp || mv site.exp site.bak
        @mv site.tmp site.exp
 
+%/site.exp: site.exp
+       -@test -d $* || mkdir $*
+       @srcdir=`cd $(srcdir); ${PWD_COMMAND}`;
+       @objdir=`${PWD_COMMAND}`/$*; \
+       sed -e "s|^set srcdir .*$$|set srcdir $$srcdir|" \
+           -e "s|^set objdir .*$$|set objdir $$objdir|" \
+           site.exp > $*/site.exp.tmp
+       @-rm -f $*/site.bak
+       @test ! -f $*/site.exp || mv $*/site.exp $*/site.bak
+       @mv $*/site.exp.tmp $*/site.exp
+$(check_DEJAGNU_libgomp_targets): check-DEJAGNUlibgomp%: libgomp%/site.exp
+
+check-DEJAGNU $(check_DEJAGNU_libgomp_targets): check-DEJAGNU%: site.exp
+       $(if $*,@)AR="$(AR)"; export AR; \
+       RANLIB="$(RANLIB)"; export RANLIB; \
+       if [ -z "$*" ] && [ -n "$(filter -j%, $(MFLAGS))" ]; then \
+         rm -rf libgomp-parallel || true; \
+         mkdir libgomp-parallel; \
+         $(MAKE) $(AM_MAKEFLAGS) $(check_DEJAGNU_libgomp_targets); \
+         rm -rf libgomp-parallel || true; \
+         for idx in $(check_p_subdirs); do \
+           if [ -d libgomp$$idx ]; then \
+             mv -f libgomp$$idx/libgomp.sum libgomp$$idx/libgomp.sum.sep; \
+             mv -f libgomp$$idx/libgomp.log libgomp$$idx/libgomp.log.sep; \
+           fi; \
+         done; \
+         $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh \
+           libgomp[0-9]*/libgomp.sum.sep > libgomp.sum; \
+         $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh -L \
+           libgomp[0-9]*/libgomp.log.sep > libgomp.log; \
+         exit 0; \
+       fi; \
+       srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \
+       EXPECT=$(EXPECT); export EXPECT; \
+       runtest=$(_RUNTEST); \
+       if [ -z "$$runtest" ]; then runtest=runtest; fi; \
+       tool=libgomp; \
+       if [ -n "$*" ]; then \
+         if [ -f libgomp-parallel/finished ]; then rm -rf "$*"; exit 0; fi; \
+         GCC_RUNTEST_PARALLELIZE_DIR=`${PWD_COMMAND}`/libgomp-parallel; \
+         export GCC_RUNTEST_PARALLELIZE_DIR; \
+         cd "$*"; \
+       fi; \
+       if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
+         $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \
+                   $(RUNTESTFLAGS); \
+         if [ -n "$*" ]; then \
+           touch $$GCC_RUNTEST_PARALLELIZE_DIR/finished; \
+         fi; \
+       else \
+         echo "WARNING: could not find \`runtest'" 1>&2; :;\
+       fi
+
 distclean-DEJAGNU:
        -rm -f site.exp site.bak
        -l='$(PACKAGE)'; for tool in $$l; do \

diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
index 30d67e4f280a49dca5926aea85da5e1647b86127..4f938b335bdc35593b158743f3cb743a55af597e 100644 (file)
--- a/libgomp/testsuite/lib/libgomp.exp
+++ b/libgomp/testsuite/lib/libgomp.exp
@@ -42,7 +42,12 @@ load_gcc_lib torture-options.exp
 load_gcc_lib fortran-modules.exp
 
 # Try to load a test support file, built during libgomp configuration.
-load_file libgomp-test-support.exp
+# Search in '..' vs. '.' to support parallel vs. sequential testing.
+if [info exists ::env(GCC_RUNTEST_PARALLELIZE_DIR)] {
+    load_file ../libgomp-test-support.exp
+} else {
+    load_file libgomp-test-support.exp
+}
 
 set dg-do-what-default run