my $DateString = strftime "%B %d, %Y", localtime;
sub ReadFile {
+ undef $/;
if (open (FILE, $_[0])) {
my $Ret = <FILE>;
close FILE;
}
sub GetRegex { # (Regex with ()'s, value)
- $_[1] =~ /$_[0]/;
- return $1;
+ $_[1] =~ /$_[0]/m;
+ if (defined($1)) {
+ return $1;
+ }
+ return "?";
}
sub AddPreTag { # Add pre tags around nonempty list, or convert to "none"
return ($Added, $Removed);
}
+# FormatTime - Convert a time from 1m23.45 into 83.45
+sub FormatTime {
+ my $Time = shift;
+ if ($Time =~ m/([0-9]+)m([0-9.]+)/) {
+ $Time = sprintf("%7.4f", $1*60.0+$2);
+ }
+ return $Time;
+}
+
# Command line argument settings...
my $NOCHECKOUT = 0;
my $NOREMOVE = 0;
my $NOTEST = 0;
+my $NORUNNINGTESTS = 0;
my $MAKEOPTS = "";
# Parse arguments...
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; next; }
- if (/^-parallel$/) { $MAKEOPTS = "-j2 -l3.0"; next; }
+ if (/^-nocheckout$/) { $NOCHECKOUT = 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; }
print "Unknown option: $_ : ignoring!\n";
}
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";
-
if (@ARGV == 3) {
$CVSRootDir = $ARGV[0];
$BuildDir = $ARGV[1];
$WebDir = $ARGV[2];
}
+my $Template = "$BuildDir/llvm/utils/NightlyTestTemplate.html";
my $Prefix = "$WebDir/$DATE";
if (0) {
# Create the CVS repository directory
#
if (!$NOCHECKOUT) {
- mkdir $BuildDir or die "Could not create CVS checkout directory!";
+ mkdir $BuildDir or die "Could not create CVS checkout directory $BuildDir!";
}
-chdir $BuildDir or die "Could not change to CVS checkout directory!";
+chdir $BuildDir or die "Could not change to CVS checkout directory $BuildDir!";
#
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 $/;
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 = `grep ^U $Prefix-CVS-Log.txt | wc -l` + 0;
+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 "echo >> Makefile.config";
- system "echo 'LLVM_OBJ_DIR := .' >> Makefile.config";
-
- # Change the Makefile.config to not strip executables...
- system "echo 'KEEP_SYMBOLS := 1' >> Makefile.config";
+ system "(time -p ./configure --enable-jit --enable-spec --with-objroot=.) > $Prefix-Build-Log.txt 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";
+ system "(time -p gmake $MAKEOPTS) >> $Prefix-Build-Log.txt 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 $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`;
+
+my $ConfigTimeU = GetRegexNum "^user", 0, "([0-9.]+)", "$Prefix-Build-Log.txt";
+my $ConfigTimeS = GetRegexNum "^sys", 0, "([0-9.]+)", "$Prefix-Build-Log.txt";
+my $ConfigTime = $ConfigTimeU+$ConfigTimeS; # ConfigTime = User+System
+my $ConfigWallTime = GetRegexNum "^real", 0,"([0-9.]+)","$Prefix-Build-Log.txt";
+
+my $BuildTimeU = GetRegexNum "^user", 1, "([0-9.]+)", "$Prefix-Build-Log.txt";
+my $BuildTimeS = GetRegexNum "^sys", 1, "([0-9.]+)", "$Prefix-Build-Log.txt";
+my $BuildTime = $BuildTimeU+$BuildTimeS; # BuildTime = User+System
+my $BuildWallTime = GetRegexNum "^real", 1, "([0-9.]+)","$Prefix-Build-Log.txt";
+
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>";
+if (`grep '^gmake[^:]*: .*Error' $Prefix-Build-Log.txt | wc -l` + 0) {
+ $BuildError = "<h3><font color='red'>Build error: compilation " .
+ "<a href=\"$DATE-Build-Log.txt\">aborted</a></font></h3>";
}
-
#
# Get warnings from the build
#
-my @Warn = split "\n", `grep -E 'warning:|Entering dir' $Prefix-Build-Log.txt`;
+my @Warn = split "\n", `egrep 'warning:|Entering dir' $Prefix-Build-Log.txt`;
my @Warnings;
my $CurDir = "";
foreach $Warning (@Warn) {
if ($Warning =~ m/Entering directory \`([^\`]+)\'/) {
$CurDir = $1; # Keep track of directory warning is in...
- if ($CurDir =~ m|$BuildDir/llvm/(.*)|) { # Remove buildir prefix if included
+ if ($CurDir =~ m#$BuildDir/llvm/(.*)#) { # Remove buildir prefix if included
$CurDir = $1;
}
} else {
# Extract some information from the CVS history... use a hash so no duplicate
# stuff is stored.
-my (%AddedFiles, %ModifiedFiles, %RemovedFiles,
- %UsersCommitted, %UsersUpdated);
+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]) ($DateRE) ([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+)/) {
($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, "", "");
- }
- #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;
+ } elsif ($File =~ /([W]) ($DateRE) ([^ ]+) +([^ ]+) +([^ ]+)/) {
+ ($Type, $Date, $UID, $Rev, $Filename) = ($1, $2, $3, $4, "$6/$5");
+ } elsif ($File =~ /([O]) ($DateRE) ([^ ]+) +([^ ]+)/) {
+ ($Type, $Date, $UID, $Rev, $Filename) = ($1, $2, $3, "", "$4/");
} else {
- $UsersUpdated{$UID} = 1;
+ 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 $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;
+
+
+sub TestDirectory {
+ my $SubDir = shift;
+
+ chdir "test/Programs/$SubDir" or
+ die "Could not change into test/Programs/$SubDir testdir!";
+
+ # Run the programs tests... creating a report.nightly.html file
+ if (!$NOTEST) {
+ system "gmake $MAKEOPTS report.nightly.html TEST=nightly "
+ . "> $Prefix-$SubDir-ProgramTest.txt 2>&1";
+ } else {
+ system "gunzip $Prefix-$SubDir-ProgramTest.txt.gz";
+ }
+
+ my $ProgramsTable;
+ if (`grep '^gmake[^:]: .*Error' $Prefix-$SubDir-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-$SubDir-ProgramTest.txt | wc -l` + 0) {
+ $TestError = 1;
+ $ProgramsTable =
+ "<font color=white><h2>Makefile error running tests!</h2></font>";
+ } else {
+ $TestError = 0;
+ $ProgramsTable = ReadFile "report.nightly.html";
+
+ #
+ # Create a list of the tests which were run...
+ #
+ system "egrep 'TEST-(PASS|FAIL)' < $Prefix-$SubDir-ProgramTest.txt "
+ . "| sort > $Prefix-$SubDir-Tests.txt";
+ }
+
+ # Compress the test output
+ system "gzip -f $Prefix-$SubDir-ProgramTest.txt";
+ chdir "../../.." or die "Cannot return to parent directory!";
+ return $ProgramsTable;
+}
+
+# If we build the tree successfully, run the nightly programs tests...
+if ($BuildError eq "") {
+ $SingleSourceProgramsTable = TestDirectory("SingleSource");
+ $MultiSourceProgramsTable = TestDirectory("MultiSource");
+ $ExternalProgramsTable = TestDirectory("External");
+ system "cat $Prefix-SingleSource-Tests.txt $Prefix-MultiSource-Tests.txt ".
+ " $Prefix-External-Tests.txt | sort > $Prefix-Tests.txt";
+}
+
+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;
+}
+
+# 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 "") {
+ my ($NATTime, $CBETime, $LLCTime, $JITTime, $OptTime, $BytecodeSize,
+ $MachCodeSize) = ("","","","","","","");
+ if (!$NORUNNINGTESTS) {
+ chdir "test/Programs/MultiSource/Olden" or die "Olden tests moved?";
+
+ # Clean out previous results...
+ system "gmake $MAKEOPTS clean > /dev/null 2>&1";
+
+ # Run the nightly test in this directory, with LARGE_PROBLEM_SIZE enabled!
+ system "gmake $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";
+ } else {
+ system "gunzip $Prefix-Olden-tests.txt.gz";
+ }
+
+ # Now we know we have $Prefix-Olden-tests.txt as the raw output file. Split
+ # it up into records and read the useful information.
+ my @Records = split />>> ========= /, ReadFile "$Prefix-Olden-tests.txt";
+ 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";
+ 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 $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);
+ $LLCTime .= " " . FormatTime($rLLCTime);
+ $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
+ # files.
+ AddRecord($NATTime, "running_Olden_nat_time.txt");
+ AddRecord($CBETime, "running_Olden_cbe_time.txt");
+ AddRecord($LLCTime, "running_Olden_llc_time.txt");
+ 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";
+}
-#
-# Run the nightly programs tests...
-#
-chdir "test/Programs" or die "Could not change into programs testdir!";
-# Run the programs tests... creating a report.nightly.html file
-system "gmake $MAKEOPTS report.nightly.html TEST=nightly "
- . "> $Prefix-ProgramTest.txt 2>&1" if (!$NOTEST);
-my $ProgramsTable = ReadFile "report.nightly.html";
#
# Get a list of the previous days that we can link to...
my $PrevDaysList = # Format list for sidebar
join "\n ", map { "<a href=\"$_.html\">$_</a><br>" } @PrevDays;
+#
+# Start outputing files into the web directory
+#
+chdir $WebDir or die "Could not change into web directory!";
+
+# 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...
+#
+system "/usr/dcs/software/supported/bin/gnuplot " .
+ "$BuildDir/llvm/utils/NightlyTest.gnuplot";
#
# 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...
#
sub AddRecord {
my ($Val, $Filename) = @_;
my @Records;
- if (open FILE, $Filename) {
+ if (open FILE, "$WebDir/$Filename") {
@Records = grep !/$DATE/, split "\n", <FILE>;
close FILE;
}
push @Records, "$DATE: $Val";
- WriteFile $Filename, (join "\n", @Records) . "\n";
+ WriteFile "$WebDir/$Filename", (join "\n", @Records) . "\n";
return @Records;
}
-
-# Add information to the files which accumulate information for graphs...
-AddRecord($LOC, "running_loc.txt");
-AddRecord($BuildTime, "running_build_time.txt");
projects / oota-llvm.git / blobdiff