From 056dbd0645875b69e825bf04f5360856eb3f0ece Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Thu, 28 May 2009 22:45:24 +0000 Subject: [PATCH] NewNightlyTest.pl: Add a -parallel-jobs argument (set # of jobs for make with -parallel, instead of always using 2). git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@72551 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/NewNightlyTest.pl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/utils/NewNightlyTest.pl b/utils/NewNightlyTest.pl index 6837dc0e729..9672632fa27 100755 --- a/utils/NewNightlyTest.pl +++ b/utils/NewNightlyTest.pl @@ -27,7 +27,8 @@ use Socket; # -norunningtests Do not run the Olden benchmark suite with # LARGE_PROBLEM_SIZE enabled. # -nodejagnu Do not run feature or regression tests -# -parallel Run two parallel jobs with GNU Make. +# -parallel Run parallel jobs with GNU Make (see -parallel-jobs). +# -parallel-jobs The number of parallel Make jobs to use (default is two). # -release Build an LLVM Release version # -release-asserts Build an LLVM ReleaseAsserts version # -enable-llcbeta Enable testing of beta features in llc. @@ -133,6 +134,7 @@ $SUBMITSERVER = "llvm.org"; $SUBMITSCRIPT = "/nightlytest/NightlyTestAccept.php"; $SUBMITAUX=""; $SUBMIT = 1; +$PARALLELJOBS = "2"; while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) { shift; @@ -145,7 +147,8 @@ while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) { if (/^-noremoveresults$/){ $NOREMOVERESULTS = 1; next; } if (/^-notest$/) { $NOTEST = 1; $NORUNNINGTESTS = 1; next; } if (/^-norunningtests$/) { $NORUNNINGTESTS = 1; next; } - if (/^-parallel$/) { $MAKEOPTS = "$MAKEOPTS -j2 -l3.0"; next; } + if (/^-parallel-jobs$/) { $PARALLELJOBS = "$ARGV[0]"; shift; next;} + if (/^-parallel$/) { $MAKEOPTS = "$MAKEOPTS -j$PARALLELJOBS -l3.0"; next; } if (/^-release$/) { $MAKEOPTS = "$MAKEOPTS ENABLE_OPTIMIZED=1 ". "OPTIMIZE_OPTION=-O2"; $BUILDTYPE="release"; next;} if (/^-release-asserts$/){ $MAKEOPTS = "$MAKEOPTS ENABLE_OPTIMIZED=1 ".