# -norunningtests.
# -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.
-# -enable-linscan Enable linearscan tests
+# -release Build an LLVM Release version
+# -enable-llcbeta Enable testing of beta features in llc.
+# -disable-llc Disable LLC tests in the nightly tester.
+# -disable-jit Disable JIT tests in the nightly tester.
+# -disable-cbe Disable C backend 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
+# -cvstag Check out a specific CVS tag to build LLVM (useful for
+# testing release branches)
+# -target Specify the target triplet
+# -cflags Next argument specifies that C compilation options that
+# override the default.
+# -cxxflags Next argument specifies that C++ compilation options that
+# override the default.
+# -ldflags Next argument specifies that linker options that override
+# the default.
+# -compileflags Next argument specifies extra options passed to make when
+# building LLVM.
+#
+# ---------------- Options to configure llvm-test ----------------------------
+# -extraflags Next argument specifies extra options that are passed to
+# compile the tests.
+# -noexternals Do not run the external tests (for cases where povray
+# or SPEC are not installed)
+# -with-externals Specify a directory where the external tests are located.
#
# 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'};
$CVSRootDir = "/home/vadve/shared/PublicCVS"
- unless $CVSRootDir;
-my $BuildDir = "$HOME/buildtest";
-my $WebDir = "$HOME/cvs/testresults-X86";
+ unless $CVSRootDir;
+my $BuildDir = $ENV{'BUILDDIR'};
+ $BuildDir = "$HOME/buildtest"
+ unless $BuildDir;
+my $WebDir = $ENV{'WEBDIR'};
+ $WebDir = "$HOME/cvs/testresults-X86"
+ unless $WebDir;
# Calculate the date prefix...
@TIME = localtime;
my $DATE = sprintf "%4d-%02d-%02d", $TIME[5]+1900, $TIME[4]+1, $TIME[3];
my $DateString = strftime "%B %d, %Y", localtime;
+my $TestStartTime = gmtime() . "GMT<br>" . localtime() . " (local)";
+
+# Command line argument settings...
+my $NOCHECKOUT = 0;
+my $NOREMOVE = 0;
+my $NOTEST = 0;
+my $NORUNNINGTESTS = 0;
+my $NOEXTERNALS = 0;
+my $MAKEOPTS = "";
+my $PROGTESTOPTS = "";
+my $VERBOSE = 0;
+my $DEBUG = 0;
+my $CONFIGUREARGS = "";
+my $CVSCOOPT = "-APR";
+my $NICE = "";
+my $NODEJAGNU = 0;
sub ReadFile {
- undef $/;
if (open (FILE, $_[0])) {
+ undef $/;
my $Ret = <FILE>;
close FILE;
+ $/ = '\n';
return $Ret;
} else {
print "Could not open file '$_[0]' for reading!";
if (defined($1)) {
return $1;
}
- return "?";
+ 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;
+ if (open FILE, "$WebDir/$Filename") {
+ @Records = grep !/$DATE/, split "\n", <FILE>;
+ close FILE;
+ }
+ push @Records, "$DATE: $Val";
+ WriteFile "$WebDir/$Filename", (join "\n", @Records) . "\n";
}
sub AddPreTag { # Add pre tags around nonempty list, or convert to "none"
$_ = shift;
- if (length) { return "<ul><pre>$_</pre></ul>"; } else { "<b>none</b><br>"; }
+ if (length) { return "<pre>$_</pre>"; } else { "<b>none</b><br>"; }
+}
+
+sub ArrayToList { # Add <li> tags around nonempty list or convert to "none"
+ my $result = "";
+ if (scalar @_) {
+ $result = "<ul>";
+ foreach $item (@_) {
+ $result .= "<li><tt>$item</tt></li>";
+ }
+ $result .= "</ul>";
+ } else {
+ $result = "<p><b>none</b></p>";
+ }
+ return $result;
+}
+
+sub ChangeDir { # directory, logical name
+ my ($dir,$name) = @_;
+ chomp($dir);
+ if ( $VERBOSE ) { print "Changing To: $name ($dir)\n"; }
+ 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 {
return $Time;
}
+sub GetRegexNum {
+ my ($Regex, $Num, $Regex2, $File) = @_;
+ my @Items = split "\n", `grep '$Regex' $File`;
+ return GetRegex $Regex2, $Items[$Num];
+}
+
+sub GetDejagnuTestResults { # (filename, log)
+ my ($filename, $DejagnuLog) = @_;
+ my @lines;
+ my $firstline;
+ $/ = "\n"; #Make sure we're going line at a time.
+
+ print "DEJAGNU TEST RESULTS:\n";
+
+ if (open SRCHFILE, $filename) {
+ # Process test results
+ my $first_list = 1;
+ my $should_break = 1;
+ my $nocopy = 0;
+ my $readingsum = 0;
+ while ( <SRCHFILE> ) {
+ if ( length($_) > 1 ) {
+ chomp($_);
+ if ( m/^XPASS:/ || m/^FAIL:/ ) {
+ $nocopy = 0;
+ if ( $first_list ) {
+ push(@lines, "<h3>UNEXPECTED TEST RESULTS</h3><ol><li>\n");
+ $first_list = 0;
+ $should_break = 1;
+ push(@lines, "<b>$_</b><br/>\n");
+ print " $_\n";
+ } else {
+ push(@lines, "</li><li><b>$_</b><br/>\n");
+ print " $_\n";
+ }
+ } elsif ( m/Summary/ ) {
+ if ( $first_list ) {
+ push(@lines, "<b>PERFECT!</b>");
+ print " PERFECT!\n";
+ } else {
+ push(@lines, "</li></ol>\n");
+ }
+ push(@lines, "<h3>STATISTICS</h3><pre>\n");
+ print "\nDEJAGNU STATISTICS:\n";
+ $should_break = 0;
+ $nocopy = 0;
+ $readingsum = 1;
+ } elsif ( $readingsum ) {
+ push(@lines,"$_\n");
+ print " $_\n";
+ }
+ }
+ }
+ }
+ push(@lines, "</pre>\n");
+ close SRCHFILE;
+
+ my $content = join("", @lines);
+ return "$content</li></ol>\n";
+}
-# Command line argument settings...
-my $NOCHECKOUT = 0;
-my $NOREMOVE = 0;
-my $NOTEST = 0;
-my $NORUNNINGTESTS = 0;
-my $MAKEOPTS = "";
-my $ENABLELINEARSCAN = "";
-# Parse arguments...
+#####################################################################
+## MAIN PROGRAM
+#####################################################################
+
+my $Template = "";
+my $PlotScriptFilename = "";
+
+# Parse arguments...
while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
shift;
last if /^--$/; # Stop processing arguments on --
# List command line options here...
if (/^-nocheckout$/) { $NOCHECKOUT = 1; next; }
- if (/^-noremove$/) { $NOREMOVE = 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 = "-j2 -l3.0"; next; }
- if (/^-enable-linscan$/) { $ENABLELINEARSCAN = "ENABLE_LINEARSCAN=1"; next; }
-
+ if (/^-parallel$/) { $MAKEOPTS = "$MAKEOPTS -j2 -l3.0"; next; }
+ if (/^-release$/) { $MAKEOPTS = "$MAKEOPTS ENABLE_OPTIMIZED=1"; 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 (/^-disable-cbe$/) { $PROGTESTOPTS .= " DISABLE_CBE=1"; 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 (/^-with-externals/) {
+ $CONFIGUREARGS .= " --with-externals=$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 (/^-cvstag/) { $CVSCOOPT .= " -r $ARGV[0]"; shift; next; }
+ if (/^-target/) {
+ $CONFIGUREARGS .= " --target=$ARGV[0]"; shift; next;
+ }
+ if (/^-cflags/) {
+ $MAKEOPTS = "$MAKEOPTS C.Flags=\'$ARGV[0]\'"; shift; next;
+ }
+ if (/^-cxxflags/) {
+ $MAKEOPTS = "$MAKEOPTS CXX.Flags=\'$ARGV[0]\'"; shift; next;
+ }
+ if (/^-ldflags/) {
+ $MAKEOPTS = "$MAKEOPTS LD.Flags=\'$ARGV[0]\'"; shift; next;
+ }
+ if (/^-compileflags/) {
+ $MAKEOPTS = "$MAKEOPTS $ARGV[0]"; shift; next;
+ }
+ if (/^-extraflags/) {
+ $CONFIGUREARGS .= " --with-extra-options=\'$ARGV[0]\'"; 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);
if (@ARGV == 3) {
$WebDir = $ARGV[2];
}
-my $Template = "$BuildDir/llvm/utils/NightlyTestTemplate.html";
my $Prefix = "$WebDir/$DATE";
-if (0) {
+#define the file names we'll use
+my $BuildLog = "$Prefix-Build-Log.txt";
+my $CVSLog = "$Prefix-CVS-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 "CVS Root = $CVSRootDir\n";
print "BuildDir = $BuildDir\n";
print "WebDir = $WebDir\n";
print "Prefix = $Prefix\n";
+ print "CVSLog = $CVSLog\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
#
if (!$NOCHECKOUT) {
+ if (-d $BuildDir) {
+ if (!$NOREMOVE) {
+ system "rm -rf $BuildDir";
+ } else {
+ die "CVS checkout directory $BuildDir already exists!";
+ }
+ }
mkdir $BuildDir or die "Could not create CVS checkout directory $BuildDir!";
}
-chdir $BuildDir or die "Could not change to CVS checkout directory $BuildDir!";
+
+ChangeDir( $BuildDir, "CVS checkout directory" );
#
# Check out the llvm tree, saving CVS messages to the cvs log...
#
-$CVSOPT = "";
-$CVSOPT = "-z3" if $CVSRootDir =~ /^:ext:/; # Use compression if going over ssh.
-system "(time -p cvs $CVSOPT -d $CVSRootDir co llvm) > $Prefix-CVS-Log.txt 2>&1"
- if (!$NOCHECKOUT);
+my $CVSOPT = "";
+# Use compression if going over ssh.
+$CVSOPT = "-z3" if $CVSRootDir =~ /^:ext:/;
+my $CVSCMD = "$NICE cvs $CVSOPT -d $CVSRootDir co $CVSCOOPT";
+if (!$NOCHECKOUT) {
+ if ( $VERBOSE ) { print "CHECKOUT STAGE\n"; }
+ system "( time -p $CVSCMD llvm; cd llvm/projects ; " .
+ "$CVSCMD llvm-test ) > $CVSLog 2>&1";
+ ChangeDir( $BuildDir , "CVS Checkout directory") ;
+}
-chdir "llvm" or die "Could not change into llvm directory!";
+ChangeDir( "llvm" , "llvm source directory") ;
-system "cvs up -P -d > /dev/null 2>&1" if (!$NOCHECKOUT);
+if (!$NOCHECKOUT) {
+ if ( $VERBOSE ) { print "UPDATE STAGE\n"; }
+ system "$NICE cvs update -PdRA >> $CVSLog 2>&1" ;
+}
+
+if ( $Template eq "" ) {
+ $Template = "$BuildDir/llvm/utils/NightlyTestTemplate.html";
+}
+die "Template file $Template is not readable" if ( ! -r "$Template" );
+
+if ( $PlotScriptFilename eq "" ) {
+ $PlotScriptFilename = "$BuildDir/llvm/utils/NightlyTest.gnuplot";
+}
+die "GNUPlot Script $PlotScriptFilename is not readable" if ( ! -r "$PlotScriptFilename" );
# Read in the HTML template file...
+if ( $VERBOSE ) { print "READING TEMPLATE\n"; }
my $TemplateContents = ReadFile $Template;
-
#
# Get some static statistics about the current state of CVS
#
-my $CVSCheckoutTime = GetRegex "([0-9.]+)", `grep '^real' $Prefix-CVS-Log.txt`;
-my $NumFilesInCVS = `egrep '^U' $Prefix-CVS-Log.txt | wc -l` + 0;
-my $NumDirsInCVS = `egrep '^cvs (checkout|server|update):' $Prefix-CVS-Log.txt | wc -l` + 0;
-$LOC = GetRegex "([0-9]+) +total", `wc -l \`utils/getsrcs.sh\` | grep total`;
+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 = `utils/countloc.sh`;
#
# Build the entire tree, saving build messages to the build log
#
if (!$NOCHECKOUT) {
- system "(time -p ./configure --enable-jit --enable-spec --with-objroot=.) > $Prefix-Build-Log.txt 2>&1";
+ if ( $VERBOSE ) { print "CONFIGURE STAGE\n"; }
+ my $EXTRAFLAGS = "--enable-spec --with-objroot=.";
+ system "(time -p $NICE ./configure $CONFIGUREARGS $EXTRAFLAGS) > $BuildLog 2>&1";
- # Build the entire tree, capturing the output into $Prefix-Build-Log.txt
- system "(time -p gmake $MAKEOPTS) >> $Prefix-Build-Log.txt 2>&1";
+ if ( $VERBOSE ) { print "BUILD STAGE\n"; }
+ # Build the entire tree, capturing the output into $BuildLog
+ system "(time -p $NICE gmake $MAKEOPTS) >> $BuildLog 2>&1";
}
-sub GetRegexNum {
- my ($Regex, $Num, $Regex2, $File) = @_;
- my @Items = split "\n", `grep '$Regex' $File`;
- return GetRegex $Regex2, $Items[$Num];
-}
-
#
# Get some statistics about the build...
#
-my @Linked = split '\n', `grep Linking $Prefix-Build-Log.txt`;
+my @Linked = split '\n', `grep Linking $BuildLog`;
my $NumExecutables = scalar(grep(/executable/, @Linked));
my $NumLibraries = scalar(grep(!/executable/, @Linked));
-my $NumObjects = `grep '^Compiling' $Prefix-Build-Log.txt | wc -l` + 0;
+my $NumObjects = `grep ']\: Compiling ' $BuildLog | wc -l` + 0;
-my $ConfigTimeU = GetRegexNum "^user", 0, "([0-9.]+)", "$Prefix-Build-Log.txt";
-my $ConfigTimeS = GetRegexNum "^sys", 0, "([0-9.]+)", "$Prefix-Build-Log.txt";
+my $ConfigTimeU = GetRegexNum "^user", 0, "([0-9.]+)", "$BuildLog";
+my $ConfigTimeS = GetRegexNum "^sys", 0, "([0-9.]+)", "$BuildLog";
my $ConfigTime = $ConfigTimeU+$ConfigTimeS; # ConfigTime = User+System
-my $ConfigWallTime = GetRegexNum "^real", 0,"([0-9.]+)","$Prefix-Build-Log.txt";
+my $ConfigWallTime = GetRegexNum "^real", 0,"([0-9.]+)","$BuildLog";
-my $BuildTimeU = GetRegexNum "^user", 1, "([0-9.]+)", "$Prefix-Build-Log.txt";
-my $BuildTimeS = GetRegexNum "^sys", 1, "([0-9.]+)", "$Prefix-Build-Log.txt";
+my $BuildTimeU = GetRegexNum "^user", 1, "([0-9.]+)", "$BuildLog";
+my $BuildTimeS = GetRegexNum "^sys", 1, "([0-9.]+)", "$BuildLog";
my $BuildTime = $BuildTimeU+$BuildTimeS; # BuildTime = User+System
-my $BuildWallTime = GetRegexNum "^real", 1, "([0-9.]+)","$Prefix-Build-Log.txt";
+my $BuildWallTime = GetRegexNum "^real", 1, "([0-9.]+)","$BuildLog";
-my $BuildError = "";
-if (`grep '^gmake[^:]*: .*Error' $Prefix-Build-Log.txt | wc -l` + 0 ||
- `grep '^gmake: \*\*\*.*Stop.' $Prefix-Build-Log.txt | wc -l`+0) {
- $BuildError = "<h3><font color='red'>Build error: compilation " .
+my $BuildError = 0, $BuildStatus = "OK";
+if (`grep '^gmake[^:]*: .*Error' $BuildLog | wc -l` + 0 ||
+ `grep '^gmake: \*\*\*.*Stop.' $BuildLog | wc -l`+0) {
+ $BuildStatus = "<h3><font color='red'>error: compilation " .
"<a href=\"$DATE-Build-Log.txt\">aborted</a></font></h3>";
- print "BUILD ERROR\n";
+ $BuildError = 1;
+ print "\n***ERROR BUILDING TREE\n\n";
}
+if ($BuildError) { $NODEJAGNU=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 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";
+
+ #Copy the testrun.log and testrun.sum to our webdir
+ CopyFile("test/testrun.log", $DejagnuLog);
+ CopyFile("test/testrun.sum", $DejagnuSum);
+
+ $DejagnuTestResults = GetDejagnuTestResults($DejagnuSum, $DejagnuLog);
+
+} else {
+ $DejagnuTestResults = "Skipped by user choice.";
+ $DejagnuTime = "0.0";
+ $DejagnuWallTime = "0.0";
+}
+
+if ($DEBUG) {
+ print $DejagnuTestResults;
+}
+
+if ( $VERBOSE ) { print "BUILD INFORMATION COLLECTION STAGE\n"; }
#
# Get warnings from the build
#
-my @Warn = split "\n", `egrep 'warning:|Entering dir' $Prefix-Build-Log.txt`;
+my @Warn = split "\n", `egrep 'warning:|Entering dir' $BuildLog`;
my @Warnings;
my $CurDir = "";
}
}
my $WarningsFile = join "\n", @Warnings;
-my $WarningsList = AddPreTag $WarningsFile;
+my $WarningsList = ArrayToList @Warnings;
$WarningsFile =~ s/:[0-9]+:/::/g;
# Emit the warnings file, so we can diff...
print "ADDED WARNINGS:\n$WarningsAdded\n\n" if (length $WarningsAdded);
print "REMOVED WARNINGS:\n$WarningsRemoved\n\n" if (length $WarningsRemoved);
-$WarningsAdded = AddPreTag $WarningsAdded;
-$WarningsRemoved = AddPreTag $WarningsRemoved;
+my @TmpWarningsAdded = split "\n", $WarningsAdded;
+my @TmpWarningsRemoved = split "\n", $WarningsRemoved;
+$WarningsAdded = ArrayToList @TmpWarningsAdded;
+$WarningsRemoved = ArrayToList @TmpWarningsRemoved;
#
# Get some statistics about CVS commits over the current day...
#
+if ($VERBOSE) { print "CVS HISTORY ANALYSIS STAGE\n"; }
@CVSHistory = split "\n", `cvs history -D '1 day ago' -a -xAMROCGUW`;
#print join "\n", @CVSHistory; print "\n";
# stuff is stored.
my (%AddedFiles, %ModifiedFiles, %RemovedFiles, %UsersCommitted, %UsersUpdated);
-my $DateRE = "[-:0-9 ]+\\+[0-9]+";
+my $DateRE = '[-/:0-9 ]+\+[0-9]+';
# Loop over every record from the CVS history, filling in the hashes.
foreach $File (@CVSHistory) {
($Type, $Date, $UID, $Rev, $Filename) = ($1, $2, $3, "", "$4/");
} else {
print "UNMATCHABLE: $File\n";
+ next;
}
# print "$File\nTy = $Type Date = '$Date' UID=$UID Rev=$Rev File = '$Filename'\n";
}
}
-my $UserCommitList = join "\n", keys %UsersCommitted;
-my $UserUpdateList = join "\n", keys %UsersUpdated;
+my $UserCommitList = join "\n", sort keys %UsersCommitted;
+my $UserUpdateList = join "\n", sort keys %UsersUpdated;
my $AddedFilesList = AddPreTag join "\n", sort keys %AddedFiles;
my $ModifiedFilesList = AddPreTag join "\n", sort keys %ModifiedFiles;
my $RemovedFilesList = AddPreTag join "\n", sort keys %RemovedFiles;
my $TestError = 1;
-my $SingleSourceProgramsTable;
-my $MultiSourceProgramsTable;
-my $ExternalProgramsTable;
+my $SingleSourceProgramsTable = "!";
+my $MultiSourceProgramsTable = "!";
+my $ExternalProgramsTable = "!";
sub TestDirectory {
my $SubDir = shift;
- chdir "test/Programs/$SubDir" or
- die "Could not change into test/Programs/$SubDir testdir!";
+ ChangeDir( "projects/llvm-test/$SubDir", "Programs Test Subdirectory" );
+
+ my $ProgramTestLog = "$Prefix-$SubDir-ProgramTest.txt";
# Run the programs tests... creating a report.nightly.html file
if (!$NOTEST) {
- system "gmake -k $MAKEOPTS $ENABLELINEARSCAN report.nightly.html "
- . "TEST=nightly > $Prefix-$SubDir-ProgramTest.txt 2>&1";
+ system "gmake -k $MAKEOPTS $PROGTESTOPTS report.nightly.html "
+ . "TEST=nightly > $ProgramTestLog 2>&1";
} else {
- system "gunzip $Prefix-$SubDir-ProgramTest.txt.gz";
+ system "gunzip ${ProgramTestLog}.gz";
}
my $ProgramsTable;
- if (`grep '^gmake[^:]: .*Error' $Prefix-$SubDir-ProgramTest.txt | wc -l` + 0){
+ if (`grep '^gmake[^:]: .*Error' $ProgramTestLog | wc -l` + 0){
$TestError = 1;
$ProgramsTable = "<font color=white><h2>Error running tests!</h2></font>";
print "ERROR TESTING\n";
- } elsif (`grep '^gmake[^:]: .*No rule to make target' $Prefix-$SubDir-ProgramTest.txt | wc -l` + 0) {
+ } elsif (`grep '^gmake[^:]: .*No rule to make target' $ProgramTestLog | wc -l` + 0) {
$TestError = 1;
$ProgramsTable =
"<font color=white><h2>Makefile error running tests!</h2></font>";
#
# Create a list of the tests which were run...
#
- system "egrep 'TEST-(PASS|FAIL)' < $Prefix-$SubDir-ProgramTest.txt "
+ system "egrep 'TEST-(PASS|FAIL)' < $ProgramTestLog "
. "| sort > $Prefix-$SubDir-Tests.txt";
}
# Compress the test output
- system "gzip -f $Prefix-$SubDir-ProgramTest.txt";
- chdir "../../.." or die "Cannot return to parent directory!";
+ system "gzip -f $ProgramTestLog";
+ ChangeDir( "../../..", "Programs Test Parent Directory" );
return $ProgramsTable;
}
-# If we build the tree successfully, run the nightly programs tests...
-if ($BuildError eq "") {
+# If we built the tree successfully, run the nightly programs tests...
+if (!$BuildError) {
+ if ( $VERBOSE ) {
+ print "SingleSource TEST STAGE\n";
+ }
$SingleSourceProgramsTable = TestDirectory("SingleSource");
+ if ( $VERBOSE ) {
+ print "MultiSource TEST STAGE\n";
+ }
$MultiSourceProgramsTable = TestDirectory("MultiSource");
- $ExternalProgramsTable = TestDirectory("External");
- system "cat $Prefix-SingleSource-Tests.txt $Prefix-MultiSource-Tests.txt ".
+ if ( ! $NOEXTERNALS ) {
+ if ( $VERBOSE ) {
+ print "External TEST STAGE\n";
+ }
+ $ExternalProgramsTable = TestDirectory("External");
+ 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";
+ }
+ system "cat $Prefix-SingleSource-Tests.txt $Prefix-MultiSource-Tests.txt ".
+ " | sort > $Prefix-Tests.txt";
+ }
}
+if ( $VERBOSE ) { print "TEST INFORMATION COLLECTION STAGE\n"; }
my ($TestsAdded, $TestsRemoved, $TestsFixed, $TestsBroken) = ("","","","");
if ($TestError) {
# If we built the tree successfully, runs of the Olden suite with
# LARGE_PROBLEM_SIZE on so that we can get some "running" statistics.
-if ($BuildError eq "") {
+if (!$BuildError) {
+ if ( $VERBOSE ) { print "OLDEN TEST SUITE STAGE\n"; }
my ($NATTime, $CBETime, $LLCTime, $JITTime, $OptTime, $BytecodeSize,
$MachCodeSize) = ("","","","","","","");
if (!$NORUNNINGTESTS) {
- chdir "test/Programs/MultiSource/Benchmarks/Olden" or die "Olden tests moved?";
+ ChangeDir( "$BuildDir/llvm/projects/llvm-test/MultiSource/Benchmarks/Olden",
+ "Olden Test Directory");
# Clean out previous results...
- system "gmake $MAKEOPTS clean > /dev/null 2>&1";
+ system "$NICE gmake $MAKEOPTS clean > /dev/null 2>&1";
- # Run the nightly test in this directory, with LARGE_PROBLEM_SIZE enabled!
- system "gmake -k $MAKEOPTS report.nightly.raw.out TEST=nightly " .
- " LARGE_PROBLEM_SIZE=1 > /dev/null 2>&1";
- system "cp report.nightly.raw.out $Prefix-Olden-tests.txt";
+ # 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 GET_STABLE_NUMBERS=1 > /dev/null 2>&1";
+ system "cp report.nightly.raw.out $OldenTestsLog";
} else {
- system "gunzip $Prefix-Olden-tests.txt.gz";
+ system "gunzip ${OldenTestsLog}.gz";
}
- # Now we know we have $Prefix-Olden-tests.txt as the raw output file. Split
+ # Now we know we have $OldenTestsLog as the raw output file. Split
# it up into records and read the useful information.
- my @Records = split />>> ========= /, ReadFile "$Prefix-Olden-tests.txt";
+ my @Records = split />>> ========= /, ReadFile "$OldenTestsLog";
shift @Records; # Delete the first (garbage) record
# 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;
$NATTime .= " " . FormatTime($rNATTime);
$CBETime .= " " . FormatTime($rCBETime);
$JITTime .= " " . FormatTime($rJITTime);
$OptTime .= " $rOptTime";
$BytecodeSize .= " $rBytecodeSize";
- $MachCodeSize .= " $rMachCodeSize";
}
# Now that we have all of the numbers we want, add them to the running totals
AddRecord($JITTime, "running_Olden_jit_time.txt");
AddRecord($OptTime, "running_Olden_opt_time.txt");
AddRecord($BytecodeSize, "running_Olden_bytecode.txt");
- AddRecord($MachCodeSize, "running_Olden_machcode.txt");
- system "gzip -f $Prefix-Olden-tests.txt";
+ system "gzip -f $OldenTestsLog";
}
-
-
#
# Get a list of the previous days that we can link to...
#
my @PrevDays = map {s/.html//; $_} GetDir ".html";
-splice @PrevDays, 20; # Trim down list to something reasonable...
+if ((scalar @PrevDays) > 20) {
+ splice @PrevDays, 20; # Trim down list to something reasonable...
+}
-my $PrevDaysList = # Format list for sidebar
-
join "\n ", map { "<a href=\"$_.html\">$_</a><br>" } @PrevDays;
+# Format list for sidebar
+
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
#
-chdir $WebDir or die "Could not change into 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_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");
+if ( $VERBOSE ) {
+ print "GRAPH GENERATION STAGE\n";
+}
#
# Rebuild the graphs now...
#
-$GNUPLOT = "/usr/dcs/software/supported/bin/gnuplot";
+$GNUPLOT = "/usr/bin/gnuplot";
$GNUPLOT = "gnuplot" if ! -x $GNUPLOT;
-$PlotScriptFilename = "$BuildDir/llvm/utils/NightlyTest.gnuplot";
-system ($GNUPLOT, $PlotScriptFilename);
+system ("$GNUPLOT", $PlotScriptFilename);
#
# Remove the cvs tree...
#
-system "rm -rf $BuildDir" if (!$NOCHECKOUT and !$NOREMOVE);
+system ( "$NICE rm -rf $BuildDir") if (!$NOCHECKOUT and !$NOREMOVE);
+
+print "\nUSERS WHO COMMITTED:\n " . (join "\n ", sort keys %UsersCommitted) . "\n"
+ if (scalar %UsersCommitted);
+
+print "\nADDED FILES:\n " . (join "\n ", sort keys %AddedFiles) . "\n"
+ if (scalar %AddedFiles);
+
+print "\nCHANGED FILES:\n " . (join "\n ", sort keys %ModifiedFiles) . "\n"
+ if (scalar %ModifiedFiles);
+
+print "\nREMOVED FILES:\n " . (join "\n ", sort keys %RemovedFiles) . "\n"
+ if (scalar %RemovedFiles);
#
# Print out information...
#
-if (0) {
+if ($VERBOSE) {
print "DateString: $DateString\n";
print "CVS Checkout: $CVSCheckoutTime seconds\n";
print "Files/Dirs/LOC in CVS: $NumFilesInCVS/$NumDirsInCVS/$LOC\n";
-
print "Build Time: $BuildTime seconds\n";
print "Libraries/Executables/Objects built: $NumLibraries/$NumExecutables/$NumObjects\n";
print "WARNINGS:\n $WarningsList\n";
-
- print "Users committed: $UserCommitList\n";
- print "Added Files: \n $AddedFilesList\n";
- print "Modified Files: \n $ModifiedFilesList\n";
- print "Removed Files: \n $RemovedFilesList\n";
-
print "Previous Days =\n $PrevDaysList\n";
}
# Output the files...
#
+if ( $VERBOSE ) {
+ print "OUTPUT STAGE\n";
+}
# Main HTML file...
my $Output;
+my $TestFinishTime = gmtime() . " GMT<br>" . localtime() . " (local)";
+
+my $TestPlatform = `uname -a`;
eval "\$Output = <<ENDOFFILE;$TemplateContents\nENDOFFILE\n";
WriteFile "$DATE.html", $Output;
+# Remove the symlink before creating it for systems that don't have "ln -sf".
+system ("rm index.html");
+system ("ln -s $DATE.html index.html");
+
# Change the index.html symlink...
-system "ln -sf $DATE.html index.html";
-sub AddRecord {
- my ($Val, $Filename) = @_;
- my @Records;
- if (open FILE, "$WebDir/$Filename") {
- @Records = grep !/$DATE/, split "\n", <FILE>;
- close FILE;
- }
- push @Records, "$DATE: $Val";
- WriteFile "$WebDir/$Filename", (join "\n", @Records) . "\n";
- return @Records;
-}
+# vim: sw=2 ai
projects / oota-llvm.git / blobdiff