Skip to content

R
riscv-gcc-1
Commit f1ee724c by Jakub Jelinek
Options

Makefile.in (dg_target_exps): Set. 

	* Makefile.in (dg_target_exps): Set.
	(check_gcc_parallelize): Parallelize gcc testing into 10 jobs
	instead of 7, try to divide it more evenly.

	* Make-lang.in (check_gfortran_parallelize): Parallelize dg.exp
	into 6 jobs instead of 3.

	* testsuite/Makefile.am (check_DEJAGNU_normal_targets): Add
	check-DEJAGNUnormal[4-9].
	(check-DEJAGNU): Split into 10 jobs for parallel testing instead of 4.
	* testsuite/Makefile.in: Regenerated.

From-SVN: r175238
parent fe7eb484
Showing with 78 additions and 35 deletions
gcc/ChangeLog
2011-06-21 Jakub Jelinek <jakub@redhat.com>
* Makefile.in (dg_target_exps): Set.
(check_gcc_parallelize): Parallelize gcc testing into 10 jobs
instead of 7, try to divide it more evenly.
2011-06-20 Changpeng Fang <changpeng.fang@amd.com> 2011-06-20 Changpeng Fang <changpeng.fang@amd.com>
PR i386/49089 PR i386/49089
......
gcc/Makefile.in
...@@ -501,6 +501,10 @@ xm_include_list=@xm_include_list@ ...@@ -501,6 +501,10 @@ xm_include_list=@xm_include_list@
xm_defines=@xm_defines@ xm_defines=@xm_defines@
lang_checks=check-gcc lang_checks=check-gcc
lang_checks_parallelized=check-gcc lang_checks_parallelized=check-gcc
dg_target_exps:=alpha.exp,arm.exp,avr.exp,bfin.exp,cris.exp,frv.exp
dg_target_exps:=$(dg_target_exps),i386.exp,ia64.exp,m68k.exp,microblaze.exp
dg_target_exps:=$(dg_target_exps),mips.exp,powerpc.exp,rx.exp,s390.exp,sh.exp
dg_target_exps:=$(dg_target_exps),sparc.exp,spu.exp,xstormy16.exp
# This lists a couple of test files that take most time during check-gcc. # This lists a couple of test files that take most time during check-gcc.
# When doing parallelized check-gcc, these can run in parallel with the # When doing parallelized check-gcc, these can run in parallel with the
# remaining tests. Each word in this variable stands for work for one # remaining tests. Each word in this variable stands for work for one
...@@ -514,10 +518,14 @@ lang_checks_parallelized=check-gcc ...@@ -514,10 +518,14 @@ lang_checks_parallelized=check-gcc
# */ prefixed to it in runtest_file_p, it is usually desirable to include # */ prefixed to it in runtest_file_p, it is usually desirable to include
# a subdirectory name. # a subdirectory name.
check_gcc_parallelize=execute.exp=execute/2* \ check_gcc_parallelize=execute.exp=execute/2* \
execute.exp=execute/\[013-9a-zA-Z\]* \ execute.exp=execute/\[013-9a-fA-F\]* \
compile.exp dg.exp \ execute.exp=execute/\[pP\]*,dg.exp \
dg-torture.exp,builtins.exp \ execute.exp=execute/\[g-oq-zG-OQ-Z\]*,compile.exp=compile/2* \
struct-layout-1.exp,unsorted.exp,stackalign.exp,i386.exp compile.exp=compile/\[9pP\]*,builtins.exp \
compile.exp=compile/\[013-8a-oq-zA-OQ-Z\]* \
dg-torture.exp,ieee.exp \
vect.exp,guality.exp,unsorted.exp \
struct-layout-1.exp,stackalign.exp,$(dg_target_exps)
lang_opt_files=@lang_opt_files@ $(srcdir)/c-family/c.opt $(srcdir)/common.opt lang_opt_files=@lang_opt_files@ $(srcdir)/c-family/c.opt $(srcdir)/common.opt
lang_specs_files=@lang_specs_files@ lang_specs_files=@lang_specs_files@
lang_tree_files=@lang_tree_files@ lang_tree_files=@lang_tree_files@
......
gcc/fortran/Make-lang.in
...@@ -171,9 +171,12 @@ check-fortran-subtargets : check-gfortran-subtargets ...@@ -171,9 +171,12 @@ check-fortran-subtargets : check-gfortran-subtargets
lang_checks += check-gfortran lang_checks += check-gfortran
lang_checks_parallelized += check-gfortran lang_checks_parallelized += check-gfortran
# For description see comment above check_gcc_parallelize in gcc/Makefile.in. # For description see comment above check_gcc_parallelize in gcc/Makefile.in.
check_gfortran_parallelize = dg.exp=gfortran.dg/\[a-cA-C\]* \ check_gfortran_parallelize = dg.exp=gfortran.dg/\[adAD\]* \
dg.exp=gfortran.dg/\[d-mD-M\]* \ dg.exp=gfortran.dg/\[bcBC\]* \
dg.exp=gfortran.dg/\[n-zN-Z0-9\]* dg.exp=gfortran.dg/\[nopNOP\]* \
dg.exp=gfortran.dg/\[isuvISUV\]* \
dg.exp=gfortran.dg/\[efhkqrxzEFHKQRXZ\]* \
dg.exp=gfortran.dg/\[0-9gjlmtwyGJLMTWY\]*
# GFORTRAN documentation. # GFORTRAN documentation.
GFORTRAN_TEXI = \ GFORTRAN_TEXI = \
......
gcc/testsuite/ChangeLog
2011-06-21 Jakub Jelinek <jakub@redhat.com>
* Make-lang.in (check_gfortran_parallelize): Parallelize dg.exp
into 6 jobs instead of 3.
2011-06-20 Jason Merrill <jason@redhat.com> 2011-06-20 Jason Merrill <jason@redhat.com>
PR c++/49216 PR c++/49216
......
libstdc++-v3/ChangeLog
2011-06-21 Jakub Jelinek <jakub@redhat.com>
* testsuite/Makefile.am (check_DEJAGNU_normal_targets): Add
check-DEJAGNUnormal[4-9].
(check-DEJAGNU): Split into 10 jobs for parallel testing instead of 4.
* testsuite/Makefile.in: Regenerated.
2011-06-20 Daniel Krugler <daniel.kruegler@googlemail.com> 2011-06-20 Daniel Krugler <daniel.kruegler@googlemail.com>
Paolo Carlini <paolo.carlini@oracle.com> Paolo Carlini <paolo.carlini@oracle.com>
......
libstdc++-v3/testsuite/Makefile.am
...@@ -100,7 +100,7 @@ new-abi-baseline: ...@@ -100,7 +100,7 @@ new-abi-baseline:
@test ! -f $*/site.exp || mv $*/site.exp $*/site.bak @test ! -f $*/site.exp || mv $*/site.exp $*/site.bak
@mv $*/site.exp.tmp $*/site.exp @mv $*/site.exp.tmp $*/site.exp
check_DEJAGNU_normal_targets = $(patsubst %,check-DEJAGNUnormal%,0 1 2 3) check_DEJAGNU_normal_targets = $(patsubst %,check-DEJAGNUnormal%,0 1 2 3 4 5 6 7 8 9)
$(check_DEJAGNU_normal_targets): check-DEJAGNUnormal%: normal%/site.exp $(check_DEJAGNU_normal_targets): check-DEJAGNUnormal%: normal%/site.exp
# Run the testsuite in normal mode. # Run the testsuite in normal mode.
...@@ -109,22 +109,17 @@ check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp ...@@ -109,22 +109,17 @@ check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp
RANLIB="$(RANLIB)"; export RANLIB; \ RANLIB="$(RANLIB)"; export RANLIB; \
if [ -z "$*$(filter-out --target_board=%, $(RUNTESTFLAGS))" ] \ if [ -z "$*$(filter-out --target_board=%, $(RUNTESTFLAGS))" ] \
&& [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \ && [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \
$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNUnormal0 check-DEJAGNUnormal1 \ $(MAKE) $(AM_MAKEFLAGS) $(check_DEJAGNU_normal_targets); \
check-DEJAGNUnormal2 check-DEJAGNUnormal3; \ for idx in 0 1 2 3 4 5 6 7 8 9; do \
for idx in 0 1 2 3; do \
mv -f normal$$idx/libstdc++.sum normal$$idx/libstdc++.sum.sep; \ mv -f normal$$idx/libstdc++.sum normal$$idx/libstdc++.sum.sep; \
mv -f normal$$idx/libstdc++.log normal$$idx/libstdc++.log.sep; \ mv -f normal$$idx/libstdc++.log normal$$idx/libstdc++.log.sep; \
done; \ done; \
mv -f libstdc++.sum libstdc++.sum.sep; \ mv -f libstdc++.sum libstdc++.sum.sep; \
mv -f libstdc++.log libstdc++.log.sep; \ mv -f libstdc++.log libstdc++.log.sep; \
$(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh \ $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh \
libstdc++.sum.sep normal0/libstdc++.sum.sep \ libstdc++.sum.sep normal[0-9]/libstdc++.sum.sep > libstdc++.sum; \
normal1/libstdc++.sum.sep normal2/libstdc++.sum.sep \
normal3/libstdc++.sum.sep > libstdc++.sum; \
$(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh -L \ $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh -L \
libstdc++.log.sep normal0/libstdc++.log.sep \ libstdc++.log.sep normal[0-9]/libstdc++.log.sep > libstdc++.log; \
normal1/libstdc++.log.sep normal2/libstdc++.log.sep \
normal3/libstdc++.log.sep > libstdc++.log; \
exit 0; \ exit 0; \
fi; \ fi; \
srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \ srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \
...@@ -140,13 +135,25 @@ check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp ...@@ -140,13 +135,25 @@ check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp
$(RUNTESTFLAGS) abi.exp; \ $(RUNTESTFLAGS) abi.exp; \
else echo "WARNING: could not find \`runtest'" 1>&2; :;\ else echo "WARNING: could not find \`runtest'" 1>&2; :;\
fi; \ fi; \
dirs="`cd $$srcdir; echo [013-9][0-9]_*/* [ab]* de* [ep]*/*`";; \ dirs="`cd $$srcdir; echo [013-9][0-9]_*/*`";; \
normal1) \ normal1) \
dirs="`cd $$srcdir; echo 2[0-2]_*/*`";; \ dirs="`cd $$srcdir; echo [ab]* de* [ep]*/*`";; \
normal2) \ normal2) \
dirs="`cd $$srcdir; echo 2[4-9]_*/*`";; \ dirs="`cd $$srcdir; echo 2[01]_*/*`";; \
normal3) \ normal3) \
dirs="`cd $$srcdir; echo 23_*/* t*/*`";; \ dirs="`cd $$srcdir; echo 22_*/*`";; \
normal4) \
dirs="`cd $$srcdir; echo 23_*/[a-km-tw-z]*`";; \
normal5) \
dirs="`cd $$srcdir; echo 23_*/[luv]*`";; \
normal6) \
dirs="`cd $$srcdir; echo 2[459]_*/*`";; \
normal7) \
dirs="`cd $$srcdir; echo 2[68]_*/*`";; \
normal8) \
dirs="`cd $$srcdir; echo 27_*/*`";; \
normal9) \
dirs="`cd $$srcdir; echo t*/*`";; \
esac; \ esac; \
if [ -n "$*" ]; then cd "$*"; fi; \ if [ -n "$*" ]; then cd "$*"; fi; \
if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
......
libstdc++-v3/testsuite/Makefile.in
...@@ -287,7 +287,7 @@ lists_of_files = \ ...@@ -287,7 +287,7 @@ lists_of_files = \
extract_symvers = $(glibcxx_builddir)/scripts/extract_symvers extract_symvers = $(glibcxx_builddir)/scripts/extract_symvers
baseline_subdir := $(shell $(CXX) --print-multi-dir) baseline_subdir := $(shell $(CXX) --print-multi-dir)
check_DEJAGNU_normal_targets = $(patsubst %,check-DEJAGNUnormal%,0 1 2 3) check_DEJAGNU_normal_targets = $(patsubst %,check-DEJAGNUnormal%,0 1 2 3 4 5 6 7 8 9)
# Runs the testsuite, but in compile only mode. # Runs the testsuite, but in compile only mode.
# Can be used to test sources with non-GNU FE's at various warning # Can be used to test sources with non-GNU FE's at various warning
...@@ -545,22 +545,17 @@ check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp ...@@ -545,22 +545,17 @@ check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp
RANLIB="$(RANLIB)"; export RANLIB; \ RANLIB="$(RANLIB)"; export RANLIB; \
if [ -z "$*$(filter-out --target_board=%, $(RUNTESTFLAGS))" ] \ if [ -z "$*$(filter-out --target_board=%, $(RUNTESTFLAGS))" ] \
&& [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \ && [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \
$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNUnormal0 check-DEJAGNUnormal1 \ $(MAKE) $(AM_MAKEFLAGS) $(check_DEJAGNU_normal_targets); \
check-DEJAGNUnormal2 check-DEJAGNUnormal3; \ for idx in 0 1 2 3 4 5 6 7 8 9; do \
for idx in 0 1 2 3; do \
mv -f normal$$idx/libstdc++.sum normal$$idx/libstdc++.sum.sep; \ mv -f normal$$idx/libstdc++.sum normal$$idx/libstdc++.sum.sep; \
mv -f normal$$idx/libstdc++.log normal$$idx/libstdc++.log.sep; \ mv -f normal$$idx/libstdc++.log normal$$idx/libstdc++.log.sep; \
done; \ done; \
mv -f libstdc++.sum libstdc++.sum.sep; \ mv -f libstdc++.sum libstdc++.sum.sep; \
mv -f libstdc++.log libstdc++.log.sep; \ mv -f libstdc++.log libstdc++.log.sep; \
$(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh \ $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh \
libstdc++.sum.sep normal0/libstdc++.sum.sep \ libstdc++.sum.sep normal[0-9]/libstdc++.sum.sep > libstdc++.sum; \
normal1/libstdc++.sum.sep normal2/libstdc++.sum.sep \
normal3/libstdc++.sum.sep > libstdc++.sum; \
$(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh -L \ $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh -L \
libstdc++.log.sep normal0/libstdc++.log.sep \ libstdc++.log.sep normal[0-9]/libstdc++.log.sep > libstdc++.log; \
normal1/libstdc++.log.sep normal2/libstdc++.log.sep \
normal3/libstdc++.log.sep > libstdc++.log; \
exit 0; \ exit 0; \
fi; \ fi; \
srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \ srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \
...@@ -576,13 +571,25 @@ check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp ...@@ -576,13 +571,25 @@ check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp
$(RUNTESTFLAGS) abi.exp; \ $(RUNTESTFLAGS) abi.exp; \
else echo "WARNING: could not find \`runtest'" 1>&2; :;\ else echo "WARNING: could not find \`runtest'" 1>&2; :;\
fi; \ fi; \
dirs="`cd $$srcdir; echo [013-9][0-9]_*/* [ab]* de* [ep]*/*`";; \ dirs="`cd $$srcdir; echo [013-9][0-9]_*/*`";; \
normal1) \ normal1) \
dirs="`cd $$srcdir; echo 2[0-2]_*/*`";; \ dirs="`cd $$srcdir; echo [ab]* de* [ep]*/*`";; \
normal2) \ normal2) \
dirs="`cd $$srcdir; echo 2[4-9]_*/*`";; \ dirs="`cd $$srcdir; echo 2[01]_*/*`";; \
normal3) \ normal3) \
dirs="`cd $$srcdir; echo 23_*/* t*/*`";; \ dirs="`cd $$srcdir; echo 22_*/*`";; \
normal4) \
dirs="`cd $$srcdir; echo 23_*/[a-km-tw-z]*`";; \
normal5) \
dirs="`cd $$srcdir; echo 23_*/[luv]*`";; \
normal6) \
dirs="`cd $$srcdir; echo 2[459]_*/*`";; \
normal7) \
dirs="`cd $$srcdir; echo 2[68]_*/*`";; \
normal8) \
dirs="`cd $$srcdir; echo 27_*/*`";; \
normal9) \
dirs="`cd $$srcdir; echo t*/*`";; \
esac; \ esac; \
if [ -n "$*" ]; then cd "$*"; fi; \ if [ -n "$*" ]; then cd "$*"; fi; \
if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment