# -nocheckout Do not create, checkout, update, or configure
# the source tree.
# -noremove Do not remove the BUILDDIR after it has been built.
-# -nofeaturetests Do not run the feature tests.
-# -noregressiontests Do not run the regression tests.
# -notest Do not even attempt to run the test programs. Implies
# -norunningtests.
# -norunningtests Do not run the Olden benchmark suite with
# LARGE_PROBLEM_SIZE enabled.
# -noexternals Do not run the external tests (for cases where povray
# or SPEC are not installed)
+# -nodejagnu Do not run feature or regression tests
# -parallel Run two parallel jobs with GNU Make.
# -release Build an LLVM Release version
# -pedantic Enable additional GCC warnings to detect possible errors.
# -enable-linscan Enable linearscan tests
-# -disable-codegen Disable LLC and JIT tests in the nightly tester.
+# -disable-llc Disable LLC tests in the nightly tester.
+# -disable-jit Disable JIT tests in the nightly tester.
# -verbose Turn on some debug output
# -debug Print information useful only to maintainers of this script.
# -nice Checkout/Configure/Build with "nice" to reduce impact
# on busy servers.
+# -f2c Next argument specifies path to F2C utility
# -gnuplotscript Next argument specifies gnuplot script to use
# -templatefile Next argument specifies template file to use
+# -gccpath Path to gcc/g++ used to build LLVM
#
# CVSROOT is the CVS repository from which the tree will be checked out,
# specified either in the full :method:user@host:/dir syntax, or
# process and erased (unless -noremove is specified; see above.)
# WEBDIR is the directory into which the test results web page will be written,
# AND in which the "index.html" is assumed to be a symlink to the most recent
-# copy of the results. This directory MUST exist before the script is run.
+# copy of the results. This directory will be created if it does not exist.
# LLVMGCCDIR is the directory in which the LLVM GCC Front End is installed
# to. This is the same as you would have for a normal LLVM build.
#
use POSIX qw(strftime);
+use File::Copy;
my $HOME = $ENV{'HOME'};
my $CVSRootDir = $ENV{'CVSROOT'};
# Command line argument settings...
my $NOCHECKOUT = 0;
-my $NOREMOVE = 0;
-my $NOFEATURES = 0;
-my $NOREGRESSIONS = 0;
-my $NOTEST = 0;
+my $NOREMOVE = 0;
+my $NOTEST = 0;
my $NORUNNINGTESTS = 0;
my $NOEXTERNALS = 0;
-my $MAKEOPTS = "";
+my $MAKEOPTS = "";
my $PROGTESTOPTS = "";
-my $VERBOSE = 0;
+my $VERBOSE = 0;
my $DEBUG = 0;
-my $CONFIGUREARGS = "--enable-jit";
+my $CONFIGUREARGS = "";
my $NICE = "";
+my $NODEJAGNU = 0;
sub ReadFile {
if (open (FILE, $_[0])) {
return "0";
}
+sub Touch {
+ my @files = @_;
+ my $now = time;
+ foreach my $file (@files) {
+ if (! -f $file) {
+ open (FILE, ">$file") or warn "Could not create new file $file";
+ close FILE;
+ }
+ utime $now, $now, $file;
+ }
+}
+
sub AddRecord {
my ($Val, $Filename) = @_;
my @Records;
}
push @Records, "$DATE: $Val";
WriteFile "$WebDir/$Filename", (join "\n", @Records) . "\n";
- return @Records;
}
sub AddPreTag { # Add pre tags around nonempty list, or convert to "none"
chdir($dir) || die "Cannot change directory to: $name ($dir) ";
}
+sub CopyFile { #filename, newfile
+ my ($file, $newfile) = @_;
+ chomp($file);
+ if ($VERBOSE) { print "Copying $file to $newfile\n"; }
+ copy($file, $newfile);
+}
+
sub GetDir {
my $Suffix = shift;
opendir DH, $WebDir;
return GetRegex $Regex2, $Items[$Num];
}
-sub GetQMTestResults { # (filename)
- my ($filename) = @_;
+sub GetDejagnuTestResults { # (filename, log)
+ my ($filename, $DejagnuLog) = @_;
my @lines;
my $firstline;
$/ = "\n"; #Make sure we're going line at a time.
if (open SRCHFILE, $filename) {
- # Skip stuff before ---TEST RESULTS
- while ( <SRCHFILE> ) {
- if ( m/^--- TEST RESULTS/ ) { last; }
- }
# Process test results
- push(@lines,"<h3>TEST RESULTS</h3><ol><li>\n");
+ push(@lines,"<h3>
UNEXPECTED TEST RESULTS</h3><ol><li>\n");
my $first_list = 1;
my $should_break = 1;
my $nocopy = 0;
+ my $readingsum = 0;
while ( <SRCHFILE> ) {
if ( length($_) > 1 ) {
chomp($_);
- if ( ! m/: PASS[ ]*$/ &&
- ! m/^ qmtest.target:/ &&
- ! m/^ local/ &&
- ! m/^gmake:/ ) {
- if ( m/: XFAIL/ ) {
- $nocopy = 1;
- } elsif ( m/: XPASS/ || m/: FAIL/ ) {
- $nocopy = 0;
- if ( $first_list ) {
- $first_list = 0;
- $should_break = 1;
- push(@lines,"<b>$_</b><br/>\n");
- } else {
- push(@lines,"</li><li><b>$_</b><br/>\n");
- }
- } elsif ( m/^--- STATISTICS/ ) {
- if ( $first_list ) { push(@lines,"<b>PERFECT!</b>"); }
- push(@lines,"</li></ol><h3>STATISTICS</h3><pre>\n");
- $should_break = 0;
- $nocopy = 0;
- } elsif ( m/^--- TESTS WITH/ ) {
+ if ( m/^XPASS:/ || m/^FAIL:/ ) {
+ $nocopy = 0;
+ if ( $first_list ) {
+ $first_list = 0;
$should_break = 1;
- $first_list = 1;
- $nocopy = 0;
- push(@lines,"</pre><h3>TESTS WITH UNEXPECTED RESULTS</h3><ol><li>\n");
- } elsif ( m/^real / ) {
- last;
- } elsif (!$nocopy) {
- if ( $should_break ) {
- push(@lines,"$_<br/>\n");
- } else {
- push(@lines,"$_\n");
- }
+ push(@lines,"<b>$_</b><br/>\n");
+ } else {
+ push(@lines,"</li><li><b>$_</b><br/>\n");
}
+ } elsif ( m/Summary/ ) {
+ if ( $first_list ) { push(@lines,"<b>PERFECT!</b>"); }
+ push(@lines,"</li></ol><h3>STATISTICS</h3><pre>\n");
+ $should_break = 0;
+ $nocopy = 0;
+ $readingsum = 1;
+ } elsif ( $readingsum ) {
+ push(@lines,"$_\n");
}
}
}
- close SRCHFILE;
}
+ push(@lines, "</pre>\n");
+ close SRCHFILE;
+
my $content = join("",@lines);
return "$content</li></ol>\n";
-}
+}
#####################################################################
# List command line options here...
if (/^-nocheckout$/) { $NOCHECKOUT = 1; next; }
- if (/^-noremove$/) { $NOREMOVE = 1; next; }
- if (/^-nofeaturetests$/) { $NOFEATURES = 1; next; }
- if (/^-noregressiontests$/){ $NOREGRESSIONS = 1; next; }
- if (/^-notest$/) { $NOTEST = 1; $NORUNNINGTESTS = 1; next; }
+ if (/^-noremove$/) { $NOREMOVE = 1; next; }
+ if (/^-notest$/) { $NOTEST = 1; $NORUNNINGTESTS = 1; next; }
if (/^-norunningtests$/) { $NORUNNINGTESTS = 1; next; }
- if (/^-parallel$/) { $MAKEOPTS = "$MAKEOPTS -j2 -l3.0"; next; }
- if (/^-release$/) { $MAKEOPTS = "$MAKEOPTS ENABLE_OPTIMIZED=1"; next; }
+ if (/^-parallel$/) { $MAKEOPTS = "$MAKEOPTS -j2 -l3.0"; next; }
+ if (/^-release$/) { $MAKEOPTS = "$MAKEOPTS ENABLE_OPTIMIZED=1"; next; }
if (/^-pedantic$/) {
$MAKEOPTS = "$MAKEOPTS CompileOptimizeOpts='-O3 -DNDEBUG -finline-functions -Wpointer-arith -Wcast-align -Wno-deprecated -Wold-style-cast -Wabi -Woverloaded-virtual -ffor-scope'";
next;
}
- if (/^-enable-linscan$/) { $PROGTESTOPTS .= " ENABLE_LINEARSCAN=1"; next; }
- if (/^-disable-codegen$/){ $PROGTESTOPTS .= " DISABLE_JIT=1 DISABLE_LLC=1";
- $CONFIGUREARGS="--disable-jit --disable-llc_diffs";
- next; }
- if (/^-verbose$/) { $VERBOSE = 1; next; }
- if (/^-debug$/) { $DEBUG = 1; next; }
- if (/^-nice$/) { $NICE = "nice "; next; }
+ if (/^-enable-llcbeta$/) { $PROGTESTOPTS .= " ENABLE_LLCBETA=1"; next; }
+ if (/^-disable-llc$/) { $PROGTESTOPTS .= " DISABLE_LLC=1";
+ $CONFIGUREARGS .= " --disable-llc_diffs"; next; }
+ if (/^-disable-jit$/) { $PROGTESTOPTS .= " DISABLE_JIT=1";
+ $CONFIGUREARGS .= " --disable-jit"; next; }
+ if (/^-verbose$/) { $VERBOSE = 1; next; }
+ if (/^-debug$/) { $DEBUG = 1; next; }
+ if (/^-nice$/) { $NICE = "nice "; next; }
+ if (/^-f2c$/) {
+ $CONFIGUREARGS .= " --with-f2c=$ARGV[0]"; shift; next;
+ }
if (/^-gnuplotscript$/) { $PlotScriptFilename = $ARGV[0]; shift; next; }
if (/^-templatefile$/) { $Template = $ARGV[0]; shift; next; }
+ if (/^-gccpath/) {
+ $CONFIGUREARGS .= " CC=$ARGV[0]/gcc CXX=$ARGV[0]/g++"; shift; next;
+ }
if (/^-noexternals$/) { $NOEXTERNALS = 1; next; }
+ if(/^-nodejagnu$/) { $NODEJAGNU = 1; next; }
print "Unknown option: $_ : ignoring!\n";
}
if ($ENV{'LLVMGCCDIR'}) {
$CONFIGUREARGS .= " --with-llvmgccdir=" . $ENV{'LLVMGCCDIR'};
}
+if ($CONFIGUREARGS !~ /--disable-jit/) {
+ $CONFIGUREARGS .= " --enable-jit";
+}
die "Must specify 0 or 3 options!" if (@ARGV != 0 and @ARGV != 3);
#define the file names we'll use
my $BuildLog = "$Prefix-Build-Log.txt";
my $CVSLog = "$Prefix-CVS-Log.txt";
-my $FeatureTestsLog = "$Prefix-FeatureTests-Log.txt";
-my $RegressionTestsLog = "$Prefix-RegressionTests-Log.txt";
my $OldenTestsLog = "$Prefix-Olden-tests.txt";
my $SingleSourceLog = "$Prefix-SingleSource-ProgramTest.txt.gz";
my $MultiSourceLog = "$Prefix-MultiSource-ProgramTest.txt.gz";
my $ExternalLog = "$Prefix-External-ProgramTest.txt.gz";
+my $DejagnuLog = "$Prefix-Dejagnu-testrun.log";
+my $DejagnuSum = "$Prefix-Dejagnu-testrun.sum";
+my $DejagnuTestsLog = "$Prefix-DejagnuTests-Log.txt";
if ($VERBOSE) {
print "INITIALIZED\n";
print "BuildLog = $BuildLog\n";
}
+if (! -d $WebDir) {
+ mkdir $WebDir, 0777;
+ warn "Warning: $WebDir did not exist; creating it.\n";
+}
#
# Create the CVS repository directory
$CVSOPT = "-z3" if $CVSRootDir =~ /^:ext:/; # Use compression if going over ssh.
if (!$NOCHECKOUT) {
if ( $VERBOSE ) { print "CHECKOUT STAGE\n"; }
- system "(time -p $NICE cvs $CVSOPT -d $CVSRootDir co llvm) > $CVSLog 2>&1";
+ system "( time -p $NICE cvs $CVSOPT -d $CVSRootDir co -APR llvm; cd llvm/projects ; " .
+ "$NICE cvs $CVSOPT -d $CVSRootDir co -APR llvm-test ) > $CVSLog 2>&1";
+ ChangeDir( $BuildDir , "CVS Checkout directory") ;
}
ChangeDir( "llvm" , "llvm source directory") ;
if (!$NOCHECKOUT) {
if ( $VERBOSE ) { print "UPDATE STAGE\n"; }
- system "$NICE cvs update -P -d >> $CVSLog 2>&1" ;
+ system "$NICE cvs update -PdRA >> $CVSLog 2>&1" ;
}
if ( $Template eq "" ) {
my $CVSCheckoutTime = GetRegex "([0-9.]+)", `grep '^real' $CVSLog`;
my $NumFilesInCVS = `egrep '^U' $CVSLog | wc -l` + 0;
my $NumDirsInCVS = `egrep '^cvs (checkout|server|update):' $CVSLog | wc -l` + 0;
-$LOC = GetRegex "([0-9]+) +total", `wc -l \`utils/getsrcs.sh\` | grep total`;
+$LOC = `utils/countloc.sh`;
#
# Build the entire tree, saving build messages to the build log
if ($VERBOSE) { print "BUILD ERROR\n"; }
}
-if ($BuildError) { $NOFEATURES = 1; $NOREGRESSIONS = 1; }
-
-# Get results of feature tests.
-my $FeatureTestResults; # String containing the results of the feature tests
-my $FeatureTime; # System+CPU Time for feature tests
-my $FeatureWallTime; # Wall Clock Time for feature tests
-if (!$NOFEATURES) {
- if ( $VERBOSE ) { print "FEATURE TEST STAGE\n"; }
- my $feature_output = "$FeatureTestsLog";
+if ($BuildError) { $NODEJAGNU=1; }
- # Run the feature tests so we can summarize the results
- system "(time -p gmake $MAKEOPTS -C test Feature.t) > $feature_output 2>&1";
+my $DejangnuTestResults; # String containing the results of the dejagnu
+if(!$NODEJAGNU) {
+ if($VERBOSE) { print "DEJAGNU FEATURE/REGRESSION TEST STAGE\n"; }
+
+ my $dejagnu_output = "$DejagnuTestsLog";
+
+ #Run the feature and regression tests, results are put into testrun.sum
+ #Full log in testrun.log
+ system "(time -p gmake $MAKEOPTS check) > $dejagnu_output 2>&1";
- # Extract test results
- $FeatureTestResults = GetQMTestResults("$feature_output");
+ #Extract time of dejagnu tests
+ my $DejagnuTimeU = GetRegexNum "^user", 0, "([0-9.]+)", "$dejagnu_output";
+ my $DejagnuTimeS = GetRegexNum "^sys", 0, "([0-9.]+)", "$dejagnu_output";
+ $DejagnuTime = $DejagnuTimeU+$DejagnuTimeS; # DejagnuTime = User+System
+ $DejagnuWallTime = GetRegexNum "^real", 0,"([0-9.]+)","$dejagnu_output";
- # Extract time of feature tests
- my $FeatureTimeU = GetRegexNum "^user", 0, "([0-9.]+)", "$feature_output";
- my $FeatureTimeS = GetRegexNum "^sys", 0, "([0-9.]+)", "$feature_output";
- $FeatureTime = $FeatureTimeU+$FeatureTimeS; # FeatureTime = User+System
- $FeatureWallTime = GetRegexNum "^real", 0,"([0-9.]+)","$feature_output";
- # Run the regression tests so we can summarize the results
-} else {
- $FeatureTestResults = "Skipped by user choice.";
- $FeatureTime = "0.0";
- $FeatureWallTime = "0.0";
-}
-
-if (!$NOREGRESSIONS) {
- if ( $VERBOSE ) { print "REGRESSION TEST STAGE\n"; }
- my $regression_output = "$RegressionTestsLog";
+ #Copy the testrun.log and testrun.sum to our webdir
+ CopyFile("test/testrun.log", $DejagnuLog);
+ CopyFile("test/testrun.sum", $DejagnuSum);
- # Run the regression tests so we can summarize the results
- system "(time -p gmake $MAKEOPTS -C test Regression.t) > $regression_output 2>&1";
+ $DejagnuTestResults = GetDejagnuTestResults($DejagnuSum, $DejagnuLog);
+ print $DejagnuTestResults;
- # Extract test results
- $RegressionTestResults = GetQMTestResults("$regression_output");
-
- # Extract time of regressions tests
- my $RegressionTimeU = GetRegexNum "^user", 0, "([0-9.]+)", "$regression_output";
- my $RegressionTimeS = GetRegexNum "^sys", 0, "([0-9.]+)", "$regression_output";
- $RegressionTime = $RegressionTimeU+$RegressionTimeS; # RegressionTime = User+System
- $RegressionWallTime = GetRegexNum "^real", 0,"([0-9.]+)","$regression_output";
} else {
- $RegressionTestResults = "Skipped by user choice.";
- $RegressionTime = "0.0";
- $RegressionWallTime = "0.0";
+ $DejagnuTestResults = "Skipped by user choice.";
+ $DejagnuTime = "0.0";
+ $DejagnuWallTime = "0.0";
}
if ($DEBUG) {
- print $FeatureTestResults;
- print $RegressionTestResults;
+ print $DejagnuTestResults;
}
if ( $VERBOSE ) { print "BUILD INFORMATION COLLECTION STAGE\n"; }
sub TestDirectory {
my $SubDir = shift;
- ChangeDir( "test/Programs/$SubDir", "Programs Test Subdirectory" );
+ ChangeDir( "projects/llvm-test/$SubDir", "Programs Test Subdirectory" );
my $ProgramTestLog = "$Prefix-$SubDir-ProgramTest.txt";
system "cat $Prefix-SingleSource-Tests.txt $Prefix-MultiSource-Tests.txt ".
" $Prefix-External-Tests.txt | sort > $Prefix-Tests.txt";
} else {
+ $ExternalProgramsTable = '<tr><td>External TEST STAGE SKIPPED</td></tr>';
if ( $VERBOSE ) {
print "External TEST STAGE SKIPPED\n";
}
my ($NATTime, $CBETime, $LLCTime, $JITTime, $OptTime, $BytecodeSize,
$MachCodeSize) = ("","","","","","","");
if (!$NORUNNINGTESTS) {
- ChangeDir( "$BuildDir/llvm/test/Programs/MultiSource/Benchmarks/Olden",
+ ChangeDir( "$BuildDir/llvm/projects/llvm-test/MultiSource/Benchmarks/Olden",
"Olden Test Directory");
# Clean out previous results...
system "$NICE gmake $MAKEOPTS clean > /dev/null 2>&1";
- # Run the nightly test in this directory, with LARGE_PROBLEM_SIZE enabled!
+ # Run the nightly test in this directory, with LARGE_PROBLEM_SIZE and
+ # GET_STABLE_NUMBERS enabled!
system "gmake -k $MAKEOPTS $PROGTESTOPTS report.nightly.raw.out TEST=nightly " .
- " LARGE_PROBLEM_SIZE=1 > /dev/null 2>&1";
+ " LARGE_PROBLEM_SIZE=1 GET_STABLE_NUMBERS=1 > /dev/null 2>&1";
system "cp report.nightly.raw.out $OldenTestsLog";
} else {
system "gunzip ${OldenTestsLog}.gz";
# Loop over all of the records, summarizing them into rows for the running
# totals file.
- my $WallTimeRE = "[A-Za-z0-9.: ]+\\(([0-9.]+) wall clock";
+ my $WallTimeRE = "Time: ([0-9.]+) seconds \\([0-9.]+ wall clock";
foreach $Rec (@Records) {
- my $rNATTime = GetRegex 'TEST-RESULT-nat-time: real\s*([.0-9m]+)', $Rec;
- my $rCBETime = GetRegex 'TEST-RESULT-cbe-time: real\s*([.0-9m]+)', $Rec;
- my $rLLCTime = GetRegex 'TEST-RESULT-llc-time: real\s*([.0-9m]+)', $Rec;
- my $rJITTime = GetRegex 'TEST-RESULT-jit-time: real\s*([.0-9m]+)', $Rec;
- my $rOptTime = GetRegex "TEST-RESULT-compile: $WallTimeRE", $Rec;
+ my $rNATTime = GetRegex 'TEST-RESULT-nat-time: program\s*([.0-9m]+)', $Rec;
+ my $rCBETime = GetRegex 'TEST-RESULT-cbe-time: program\s*([.0-9m]+)', $Rec;
+ my $rLLCTime = GetRegex 'TEST-RESULT-llc-time: program\s*([.0-9m]+)', $Rec;
+ my $rJITTime = GetRegex 'TEST-RESULT-jit-time: program\s*([.0-9m]+)', $Rec;
+ my $rOptTime = GetRegex "TEST-RESULT-compile: .*$WallTimeRE", $Rec;
my $rBytecodeSize = GetRegex 'TEST-RESULT-compile: *([0-9]+)', $Rec;
my $rMachCodeSize = GetRegex 'TEST-RESULT-jit-machcode: *([0-9]+).*bytes of machine code', $Rec;
my $PrevDaysList = join "\n ", map { "<a href=\"$_.html\">$_</a><br>" } @PrevDays;
#
-# Start outputing files into the web directory
+# Start outputting files into the web directory
#
ChangeDir( $WebDir, "Web Directory" );
+# Make sure we don't get errors running the nightly tester the first time
+# because of files that don't exist.
+Touch ('running_build_time.txt', 'running_Olden_llc_time.txt',
+ 'running_loc.txt', 'running_Olden_machcode.txt',
+ 'running_Olden_bytecode.txt', 'running_Olden_nat_time.txt',
+ 'running_Olden_cbe_time.txt', 'running_Olden_opt_time.txt',
+ 'running_Olden_jit_time.txt');
+
# Add information to the files which accumulate information for graphs...
AddRecord($LOC, "running_loc.txt");
AddRecord($BuildTime, "running_build_time.txt");
#
# Rebuild the graphs now...
#
-$GNUPLOT = "/usr/dcs/software/supported/bin/gnuplot";
+$GNUPLOT = "/usr/bin/gnuplot";
$GNUPLOT = "gnuplot" if ! -x $GNUPLOT;
system ("$GNUPLOT", $PlotScriptFilename);
print "CVS Checkout: $CVSCheckoutTime seconds\n";
print "Files/Dirs/LOC in CVS: $NumFilesInCVS/$NumDirsInCVS/$LOC\n";
print "Build Time: $BuildTime seconds\n";
- print "Feature Test Time: $FeatureTime seconds\n";
- print "Regression Test Time: $RegressionTime seconds\n";
print "Libraries/Executables/Objects built: $NumLibraries/$NumExecutables/$NumObjects\n";
print "WARNINGS:\n $WarningsList\n";
projects / oota-llvm.git / blobdiff