# -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)
-# -rundejagnu Runs features and regressions using Dejagnu
+# -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
+# -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.
# -verbose Turn on some debug output
@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;
+my $TestStartTime = gmtime() . "GMT<br>" . localtime() . " (local)";
# Command line argument settings...
my $NOCHECKOUT = 0;
my $NOREMOVE = 0;
-my $NOFEATURES = 0;
-my $NOREGRESSIONS = 0;
my $NOTEST = 0;
my $NORUNNINGTESTS = 0;
my $NOEXTERNALS = 0;
my $DEBUG = 0;
my $CONFIGUREARGS = "";
my $NICE = "";
-my $RUNDEJAGNU = 0;
+my $NODEJAGNU = 0;
sub ReadFile {
if (open (FILE, $_[0])) {
return GetRegex $Regex2, $Items[$Num];
}
-sub GetQMTestResults { # (filename)
- my ($filename) = @_;
- 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");
- my $first_list = 1;
- my $should_break = 1;
- my $nocopy = 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/ ) {
- $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");
- }
- }
- }
- }
- }
- close SRCHFILE;
- }
- my $content = join("",@lines);
- return "$content</li></ol>\n";
-}
-
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
- push(@lines,"<h3>UNEXPECTED TEST RESULTS</h3><ol><li>\n");
my $first_list = 1;
my $should_break = 1;
my $nocopy = 0;
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");
+ push(@lines, "<b>$_</b><br/>\n");
+ print " $_\n";
} else {
- push(@lines,"</li><li><b>$_</b><br/>\n");
+ push(@lines, "</li><li><b>$_</b><br/>\n");
+ print " $_\n";
}
} elsif ( m/Summary/ ) {
- if ( $first_list ) { push(@lines,"<b>PERFECT!</b>"); }
- push(@lines,"</li></ol><h3>STATISTICS</h3><pre>\n");
+ 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;
- #add link to complete testing log
- push(@lines, "<p>A complete log of testing <a href=\"$DejagnuLog\">Feature and Regression</a> is available for further analysis.</p>\n");
-
- my $content = join("",@lines);
+ 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 (/^-norunningtests$/) { $NORUNNINGTESTS = 1; next; }
if (/^-parallel$/) { $MAKEOPTS = "$MAKEOPTS -j2 -l3.0"; next; }
$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 (/^-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 .= " CC=$ARGV[0]/gcc CXX=$ARGV[0]/g++"; shift; next;
}
if (/^-noexternals$/) { $NOEXTERNALS = 1; next; }
- if(/^-rundejagnu$/) { $RUNDEJAGNU = 1; next; }
+ if(/^-nodejagnu$/) { $NODEJAGNU = 1; next; }
print "Unknown option: $_ : ignoring!\n";
}
#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 @Linked = split '\n', `grep Linking $BuildLog`;
my $NumExecutables = scalar(grep(/executable/, @Linked));
my $NumLibraries = scalar(grep(!/executable/, @Linked));
-my $NumObjects = `grep '^Compiling' $BuildLog | wc -l` + 0;
+my $NumObjects = `grep ']\: Compiling ' $BuildLog | wc -l` + 0;
my $ConfigTimeU = GetRegexNum "^user", 0, "([0-9.]+)", "$BuildLog";
my $ConfigTimeS = GetRegexNum "^sys", 0, "([0-9.]+)", "$BuildLog";
my $BuildTime = $BuildTimeU+$BuildTimeS; # BuildTime = User+System
my $BuildWallTime = GetRegexNum "^real", 1, "([0-9.]+)","$BuildLog";
-my $BuildError = "";
+my $BuildError = 0, $BuildStatus = "OK";
if (`grep '^gmake[^:]*: .*Error' $BuildLog | wc -l` + 0 ||
`grep '^gmake: \*\*\*.*Stop.' $BuildLog | wc -l`+0) {
- $BuildError = "<h3><font color='red'>Build error: compilation " .
+ $BuildStatus = "<h3><font color='red'>error: compilation " .
"<a href=\"$DATE-Build-Log.txt\">aborted</a></font></h3>";
+ $BuildError = 1;
if ($VERBOSE) { print "BUILD ERROR\n"; }
}
-if ($BuildError) { $NOFEATURES = 1; $NOREGRESSIONS = 1; $RUNDEJAGNU=0; }
-
-# 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";
-
- # Run the feature tests so we can summarize the results
- system "(time -p gmake $MAKEOPTS -C test Feature.t) > $feature_output 2>&1";
-
- # Extract test results
- $FeatureTestResults = GetQMTestResults("$feature_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";
-
- # Run the regression tests so we can summarize the results
- system "(time -p gmake $MAKEOPTS -C test Regression.t) > $regression_output 2>&1";
-
- # 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";
-}
+if ($BuildError) { $NODEJAGNU=1; }
my $DejangnuTestResults; # String containing the results of the dejagnu
-if($RUNDEJAGNU) {
+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 > $dejagnu_output 2>&1";
+ system "(time -p gmake $MAKEOPTS check) > $dejagnu_output 2>&1";
#Extract time of dejagnu tests
my $DejagnuTimeU = GetRegexNum "^user", 0, "([0-9.]+)", "$dejagnu_output";
CopyFile("test/testrun.sum", $DejagnuSum);
$DejagnuTestResults = GetDejagnuTestResults($DejagnuSum, $DejagnuLog);
+
} else {
$DejagnuTestResults = "Skipped by user choice.";
$DejagnuTime = "0.0";
}
if ($DEBUG) {
- print $FeatureTestResults;
- print $RegressionTestResults;
print $DejagnuTestResults;
}
}
}
-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;
}
# If we built the tree successfully, run the nightly programs tests...
-if ($BuildError eq "") {
+if (!$BuildError) {
if ( $VERBOSE ) {
print "SingleSource TEST STAGE\n";
}
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";
}
# 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) = ("","","","","","","");
# 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: 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 $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;
#
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...
#
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";
-
- 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";
}
}
# Main HTML file...
my $Output;
-my $TestFinishTime = gmtime;
+my $TestFinishTime = gmtime() . " GMT<br>" . localtime() . " (local)";
+
my $TestPlatform = `uname -a`;
eval "\$Output = <<ENDOFFILE;$TemplateContents\nENDOFFILE\n";
WriteFile "$DATE.html", $Output;
projects / oota-llvm.git / blobdiff