#
use POSIX qw(strftime);
+my $HOME = $ENV{HOME};
+my $CVSRootDir = "/home/vadve/vadve/Research/DynOpt/CVSRepository";
+my $BuildDir = "$HOME/buildtest";
+my $WebDir = "$HOME/cvs/testresults-X86";
+
+# 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;
+
+sub ReadFile {
+ if (open (FILE, $_[0])) {
+ my $Ret = <FILE>;
+ close FILE;
+ return $Ret;
+ } else {
+ print "Could not open file '$_[0]' for reading!";
+ return "";
+ }
+}
+
+sub WriteFile { # (filename, contents)
+ open (FILE, ">$_[0]") or die "Could not open file '$_[0]' for writing!";
+ print FILE $_[1];
+ close FILE;
+}
+
+sub GetRegex { # (Regex with ()'s, value)
+ $_[1] =~ /$_[0]/m;
+ return $1;
+}
+
+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>"; }
+}
+
+sub GetDir {
+ my $Suffix = shift;
+ opendir DH, $WebDir;
+ my @Result = reverse sort grep !/$DATE/, grep /[-0-9]+$Suffix/, readdir DH;
+ closedir DH;
+ return @Result;
+}
+
+# DiffFiles - Diff the current version of the file against the last version of
+# the file, reporting things added and removed. This is used to report, for
+# example, added and removed warnings. This returns a pair (added, removed)
+#
+sub DiffFiles {
+ my $Suffix = shift;
+ my @Others = GetDir $Suffix;
+ if (@Others == 0) { # No other files? We added all entries...
+ return (`cat $WebDir/$DATE$Suffix`, "");
+ }
+ # Diff the files now...
+ my @Diffs = split "\n", `diff $WebDir/$DATE$Suffix $WebDir/$Others[0]`;
+ my $Added = join "\n", grep /^</, @Diffs;
+ my $Removed = join "\n", grep /^>/, @Diffs;
+ $Added =~ s/^< //gm;
+ $Removed =~ s/^> //gm;
+ return ($Added, $Removed);
+}
+
+
# Command line argument settings...
my $NOCHECKOUT = 0;
my $NOREMOVE = 0;
+my $NOTEST = 0;
my $MAKEOPTS = "";
# Parse arguments...
# List command line options here...
if (/^-nocheckout$/) { $NOCHECKOUT = 1; next; }
if (/^-noremove$/) { $NOREMOVE = 1; next; }
+ if (/^-notest$/) { $NOTEST = 1; next; }
if (/^-parallel$/) { $MAKEOPTS = "-j2 -l3.0"; next; }
print "Unknown option: $_ : ignoring!\n";
}
-die "Must specify 0 or 4 options!" if (@ARGV != 0 and @ARGV != 4);
-
-my $HOME = $ENV{HOME};
-my $CVSRootDir = "/home/vadve/vadve/Research/DynOpt/CVSRepository";
-my $BuildDir = "$HOME/buildtest";
-my $WebDir = "$HOME/cvs/testresults-X86";
+die "Must specify 0 or 3 options!" if (@ARGV != 0 and @ARGV != 3);
# FIXME: This should just be utils/...
my $Template = "$HOME/llvm/utils/NightlyTestTemplate.html";
$WebDir = $ARGV[2];
}
-# 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 $Prefix = "$WebDir/$DATE";
if (0) {
print "Prefix = $Prefix\n";
}
+
+#
# Create the CVS repository directory
+#
if (!$NOCHECKOUT) {
mkdir $BuildDir or die "Could not create CVS checkout directory!";
}
chdir $BuildDir or die "Could not change to CVS checkout directory!";
+
+#
# Check out the llvm tree, saving CVS messages to the cvs log...
+#
system "(time -p cvs -d $CVSRootDir co llvm) > $Prefix-CVS-Log.txt 2>&1"
if (!$NOCHECKOUT);
chdir "llvm" or die "Could not change into llvm directory!";
+system "cvs up -P -d > /dev/null 2>&1" if (!$NOCHECKOUT);
+
# Read in the HTML template file...
undef $/;
-open (TEMPLATEFILE, $Template) or die "Could not open file 'llvm/$Template'!";
-my $TemplateContents = <TEMPLATEFILE>;
-close(TEMPLATEFILE);
+my $TemplateContents = ReadFile $Template;
-sub GetRegex {
- $_[1] =~ /$_[0]/;
- return $1;
-}
+#
# Get some static statistics about the current state of CVS
+#
my $CVSCheckoutTime = GetRegex "([0-9.]+)", `grep '^real' $Prefix-CVS-Log.txt`;
my $NumFilesInCVS = `grep ^U $Prefix-CVS-Log.txt | wc -l` + 0;
my $NumDirsInCVS = `grep '^cvs checkout' $Prefix-CVS-Log.txt | wc -l` + 0;
$LOC = GetRegex "([0-9]+) +total", `wc -l \`utils/getsrcs.sh\` | grep total`;
+#
# Build the entire tree, saving build messages to the build log
+#
if (!$NOCHECKOUT) {
# Change the Makefile.config to build into the local directory...
rename "Makefile.config", "Makefile.config.orig";
- system "sed '/^LLVM_OBJ_DIR/d' < Makefile.config.orig > Makefile.config";
+ system "sed '/^OBJ_ROOT/d' < Makefile.config.orig > Makefile.config";
system "echo >> Makefile.config";
- system "echo 'LLVM_OBJ_DIR := .' >> Makefile.config";
+ system "echo 'OBJ_ROOT := .' >> Makefile.config";
# Change the Makefile.config to not strip executables...
system "echo 'KEEP_SYMBOLS := 1' >> Makefile.config";
system "(time -p gmake $MAKEOPTS) > $Prefix-Build-Log.txt 2>&1";
}
+
+#
# Get some statistics about the build...
+#
my @Linked = split '\n', `grep Linking $Prefix-Build-Log.txt`;
my $NumExecutables = scalar(grep(/executable/, @Linked));
my $NumLibraries = scalar(grep(!/executable/, @Linked));
my $NumObjects = `grep '^Compiling' $Prefix-Build-Log.txt | wc -l` + 0;
-my $BuildTime = GetRegex "([0-9.]+)", `grep '^real' $Prefix-Build-Log.txt`;
-
-
-sub AddPreTag { # Add pre tags around nonempty list, or convert to "none"
- $_ = shift;
- if (length) { return "<pre> $_</pre>"; } else { "<b>none</b><br>"; }
+my $BuildTimeU = GetRegex "([0-9.]+)", `grep '^user' $Prefix-Build-Log.txt`;
+my $BuildTimeS = GetRegex "([0-9.]+)", `grep '^sys' $Prefix-Build-Log.txt`;
+my $BuildWallTime = GetRegex "([0-9.]+)", `grep '^real' $Prefix-Build-Log.txt`;
+my $BuildTime = $BuildTimeU+$BuildTimeS; # BuildTime = User+System
+my $BuildError = "";
+if (`grep '^gmake: .*Error' $Prefix-Build-Log.txt | wc -l` + 0) {
+ $BuildError = "<h3>Build error: compilation <a href=\"$DATE-Build-Log.txt\">"
+ . "aborted</a></h3>";
}
+
+#
# Get warnings from the build
+#
my @Warn = split "\n", `grep -E 'warning:|Entering dir' $Prefix-Build-Log.txt`;
my @Warnings;
my $CurDir = "";
push @Warnings, "$CurDir/$Warning"; # Add directory to warning...
}
}
-my $WarningsList = AddPreTag join "\n ", @Warnings;
+my $WarningsFile = join "\n", @Warnings;
+my $WarningsList = AddPreTag $WarningsFile;
+$WarningsFile =~ s/:[0-9]+:/::/g;
+
+# Emit the warnings file, so we can diff...
+WriteFile "$WebDir/$DATE-Warnings.txt", $WarningsFile . "\n";
+my ($WarningsAdded, $WarningsRemoved) = DiffFiles "-Warnings.txt";
+$WarningsAdded = AddPreTag $WarningsAdded;
+$WarningsRemoved = AddPreTag $WarningsRemoved;
+#
# Get some statistics about CVS commits over the current day...
+#
@CVSHistory = split "\n", `cvs history -D '1 day ago' -a -xAMROCGUW`;
#print join "\n", @CVSHistory; print "\n";
my (%AddedFiles, %ModifiedFiles, %RemovedFiles,
%UsersCommitted, %UsersUpdated);
+my $DateRE = "[-:0-9 ]+\\+[0-9]+";
+
# Loop over every record from the CVS history, filling in the hashes.
foreach $File (@CVSHistory) {
my ($Type, $Date, $UID, $Rev, $Filename);
- if ($File =~ /([AMR]) ([-:0-9 ]+\+[0-9]+) ([^ ]+) ([0-9.]+) +([^ ]+) +([^ ]+)/) {
+ if ($File =~ /([AMRUGC])\s($DateRE)\s([^\s]+)\s+([0-9.]+)\s+([^\s]+)\s+([^\s]+)/) {
($Type, $Date, $UID, $Rev, $Filename) = ($1, $2, $3, $4, "$6/$5");
- } elsif ($File =~ /([OCGUW]) ([-:0-9 ]+\+[0-9]+) ([^ ]+)/) {
- ($Type, $Date, $UID, $Rev, $Filename) = ($1, $2, $3, "", "");
+ } elsif ($File =~ /([W])\s($DateRE)\s([^\s]+) +([^\s]+)\s+([^\s]+)/) {
+ ($Type, $Date, $UID, $Rev, $Filename) = ($1, $2, $3, $4, "$6/$5");
+ } elsif ($File =~ /([O]) ($DateRE) ([^ ]+) +([^\s]+)/) {
+ ($Type, $Date, $UID, $Rev, $Filename) = ($1, $2, $3, "", "$4/");
+ } else {
+ print "UNMATCHABLE: $File\n";
+ }
+ # print "$File\nTy = $Type Date = '$Date' UID=$UID Rev=$Rev File = '$Filename'\n";
+
+ if ($Filename =~ /^llvm/) {
+ if ($Type eq 'M') { # Modified
+ $ModifiedFiles{$Filename} = 1;
+ $UsersCommitted{$UID} = 1;
+ } elsif ($Type eq 'A') { # Added
+ $AddedFiles{$Filename} = 1;
+ $UsersCommitted{$UID} = 1;
+ } elsif ($Type eq 'R') { # Removed
+ $RemovedFiles{$Filename} = 1;
+ $UsersCommitted{$UID} = 1;
+ } else {
+ $UsersUpdated{$UID} = 1;
+ }
+ }
+}
+
+my $UserCommitList = join "\n", keys %UsersCommitted;
+my $UserUpdateList = join "\n", keys %UsersUpdated;
+my $AddedFilesList = AddPreTag join "\n", keys %AddedFiles;
+my $ModifiedFilesList = AddPreTag join "\n", keys %ModifiedFiles;
+my $RemovedFilesList = AddPreTag join "\n", keys %RemovedFiles;
+
+my $TestError = 1;
+my $ProgramsTable;
+
+# If we build the tree successfully, the nightly programs tests...
+if ($BuildError eq "") {
+ chdir "test/Programs" or die "Could not change into programs testdir!";
+
+ # Run the programs tests... creating a report.nightly.html file
+ if (!$NOTEST) {
+ system "gmake $MAKEOPTS report.nightly.html TEST=nightly "
+ . "RUNTIMELIMIT=300 > $Prefix-ProgramTest.txt 2>&1";
+ } else {
+ system "gunzip $Prefix-ProgramTest.txt.gz";
}
- #print "Ty = $Type Date = '$Date' UID=$UID Rev=$Rev File = '$Filename'\n";
-
- if ($Type eq 'M') { # Modified
- $ModifiedFiles{$Filename} = 1;
- $UsersCommitted{$UID} = 1;
- } elsif ($Type eq 'A') { # Added
- $AddedFiles{$Filename} = 1;
- $UsersCommitted{$UID} = 1;
- } elsif ($Type eq 'R') { # Removed
- $RemovedFiles{$Filename} = 1;
- $UsersCommitted{$UID} = 1;
+
+ if (`grep '^gmake: .*Error' $Prefix-ProgramTest.txt | wc -l` + 0) {
+ $TestError = 1;
+ $ProgramsTable = "<font color=white><h2>Error running tests!</h2></font>";
+ } elsif (`grep '^gmake: .*No rule to make target' $Prefix-ProgramTest.txt | wc -l` + 0) {
+ $TestError = 1;
+ $ProgramsTable =
+ "<font color=white><h2>Makefile error running tests!</h2></font>";
} else {
- $UsersUpdated{$UID} = 1;
+ $TestError = 0;
+ $ProgramsTable = ReadFile "report.nightly.html";
+
+ #
+ # Create a list of the tests which were run...
+ #
+ system "grep -E 'TEST-(PASS|FAIL)' < $Prefix-ProgramTest.txt "
+ . "| sort > $Prefix-Tests.txt";
}
+
+ # Compress the test output
+ system "gzip -f $Prefix-ProgramTest.txt";
}
-my $UserCommitList = join "\n ", keys %UsersCommitted;
-my $UserUpdateList = join "\n ", keys %UsersUpdated;
-my $AddedFilesList = AddPreTag join "\n ", keys %AddedFiles;
-my $ModifiedFilesList = AddPreTag join "\n ", keys %ModifiedFiles;
-my $RemovedFilesList = AddPreTag join "\n ", keys %RemovedFiles;
+my ($TestsAdded, $TestsRemoved, $TestsFixed, $TestsBroken) = ("","","","");
+
+if ($TestError) {
+ $TestsAdded = "<b>error testing</b><br>";
+ $TestsRemoved = "<b>error testing</b><br>";
+ $TestsFixed = "<b>error testing</b><br>";
+ $TestsBroken = "<b>error testing</b><br>";
+} else {
+ my ($RTestsAdded, $RTestsRemoved) = DiffFiles "-Tests.txt";
+
+ my @RawTestsAddedArray = split '\n', $RTestsAdded;
+ my @RawTestsRemovedArray = split '\n', $RTestsRemoved;
+
+ my %OldTests = map {GetRegex('TEST-....: (.+)', $_)=>$_}
+ @RawTestsRemovedArray;
+ my %NewTests = map {GetRegex('TEST-....: (.+)', $_)=>$_}
+ @RawTestsAddedArray;
+
+ foreach $Test (keys %NewTests) {
+ if (!exists $OldTests{$Test}) { # TestAdded if in New but not old
+ $TestsAdded = "$TestsAdded$Test\n";
+ } else {
+ if ($OldTests{$Test} =~ /TEST-PASS/) { # Was the old one a pass?
+ $TestsBroken = "$TestsBroken$Test\n"; # New one must be a failure
+ } else {
+ $TestsFixed = "$TestsFixed$Test\n"; # No, new one is a pass.
+ }
+ }
+ }
+ foreach $Test (keys %OldTests) { # TestRemoved if in Old but not New
+ $TestsRemoved = "$TestsRemoved$Test\n" if (!exists $NewTests{$Test});
+ }
+ $TestsAdded = AddPreTag $TestsAdded;
+ $TestsRemoved = AddPreTag $TestsRemoved;
+ $TestsFixed = AddPreTag $TestsFixed;
+ $TestsBroken = AddPreTag $TestsBroken;
+}
+
+#
# Get a list of the previous days that we can link to...
-system "rm -f $WebDir/$DATE.html"; # Don't relist self if regenerating...
-opendir DH, $WebDir;
-my @PrevDays =
- map {s/.html//; $_} reverse sort grep /[-0-9]+.html/, readdir DH;
-closedir DH;
+#
+my @PrevDays = map {s/.html//; $_} GetDir ".html";
splice @PrevDays, 20; # Trim down list to something reasonable...
my $PrevDaysList = # Format list for sidebar
join "\n ", map { "<a href=\"$_.html\">$_</a><br>" } @PrevDays;
+
#
# Remove the cvs tree...
#
+chdir $WebDir or die "Could not change into web directory!";
system "rm -rf $BuildDir" if (!$NOCHECKOUT and !$NOREMOVE);
+
+#
# Print out information...
+#
if (0) {
print "DateString: $DateString\n";
print "CVS Checkout: $CVSCheckoutTime seconds\n";
print "Previous Days =\n $PrevDaysList\n";
}
-# Output the file...
-chdir $WebDir or die "Could not change into web directory!";
+
+#
+# Output the files...
+#
+
+# Main HTML file...
my $Output;
eval "\$Output = <<ENDOFFILE;$TemplateContents\nENDOFFILE\n";
-open(OUTFILE, ">$DATE.html") or die "Cannot open output file!";
-print OUTFILE $Output;
-close(OUTFILE);
+WriteFile "$DATE.html", $Output;
# Change the index.html symlink...
system "ln -sf $DATE.html index.html";
close FILE;
}
push @Records, "$DATE: $Val";
- open FILE, ">$Filename" or die "Couldn't open data file $Filename";
- print FILE (join "\n", @Records), "\n";
- close FILE;
+ WriteFile $Filename, (join "\n", @Records) . "\n";
return @Records;
}
projects / oota-llvm.git / blobdiff