Changes in directory llvm/utils:
NightlyTest.gnuplot updated: 1.13 -> 1.13.2.1
NightlyTest.pl updated: 1.97 -> 1.97.2.1
NightlyTestTemplate.html updated: 1.41 -> 1.41.4.1
---
Log message:
Merged mainline into Vector LLVM branch
---
Diffs of the changes: (+24 -60)
NightlyTest.gnuplot | 47 -----------------------------------------------
NightlyTest.pl | 29 +++++++++++++++++++++++------
NightlyTestTemplate.html | 8 +-------
3 files changed, 24 insertions(+), 60 deletions(-)
Index: llvm/utils/NightlyTest.gnuplot
diff -u llvm/utils/NightlyTest.gnuplot:1.13
llvm/utils/NightlyTest.gnuplot:1.13.2.1
--- llvm/utils/NightlyTest.gnuplot:1.13 Sun Oct 2 16:51:38 2005
+++ llvm/utils/NightlyTest.gnuplot Wed Nov 16 12:33:43 2005
@@ -8,15 +8,6 @@
set timefmt "%Y-%m-%d-%H:%M:%S:"
set format x "%b %d, %Y"
-## Various labels for the graph
-set label "Reoptimizer\n checkins" at "2003-02-18:", 114000
-set label "Modulo Sched\n checkin" at "2003-03-28:", 119500
-set label "Reoptimizer\n checkins" at "2003-06-01:", 134000
-set label "'dummy'\nfunction" at "2003-07-20:", 150000
-set label "Reoptimizer\n removal" at "2003-08-10:", 132000
-set label "llvm-db\ncheckin" at "2004-01-04:", 145000
-set label "llvm/projects" at "2004-01-04:", 151000
-
set size .75,.75
set xtics rotate
set xlabel 0,-1
@@ -185,44 +176,6 @@
with lines
-##------- Machine code size ----
-
-set size .75,.75
-set xtics rotate
-set xlabel 0,-1
-set output "running_Olden_machcode.png"
-set ylabel "Program machine code size (bytes)"
-plot "running_Olden_machcode.txt" u 1:2 t '' with lines, \
- "running_Olden_machcode.txt" u 1:2 t "bh" with lines, \
- "running_Olden_machcode.txt" u 1:3 t "em3d" with lines, \
- "running_Olden_machcode.txt" u 1:4 t "mst" with lines, \
- "running_Olden_machcode.txt" u 1:5 t "power" with lines, \
- "running_Olden_machcode.txt" u 1:6 t "tsp" with lines, \
- "running_Olden_machcode.txt" u 1:7 t "bisort" with lines, \
- "running_Olden_machcode.txt" u 1:8 t "health" with lines, \
- "running_Olden_machcode.txt" u 1:9 t "perimeter" with lines, \
- "running_Olden_machcode.txt" u 1:10 t "treeadd" with lines, \
- "running_Olden_machcode.txt" u 1:11 t "voronoi" \
- with lines
-
-set size 1.5,1.5
-set xtics norotate
-set xlabel 0,0
-set output "running_Olden_machcode_large.png"
-plot "running_Olden_machcode.txt" u 1:2 t '' with lines, \
- "running_Olden_machcode.txt" u 1:2 t "bh" with lines, \
- "running_Olden_machcode.txt" u 1:3 t "em3d" with lines, \
- "running_Olden_machcode.txt" u 1:4 t "mst" with lines, \
- "running_Olden_machcode.txt" u 1:5 t "power" with lines, \
- "running_Olden_machcode.txt" u 1:6 t "tsp" with lines, \
- "running_Olden_machcode.txt" u 1:7 t "bisort" with lines, \
- "running_Olden_machcode.txt" u 1:8 t "health" with lines, \
- "running_Olden_machcode.txt" u 1:9 t "perimeter" with lines, \
- "running_Olden_machcode.txt" u 1:10 t "treeadd" with lines, \
- "running_Olden_machcode.txt" u 1:11 t "voronoi" \
- with lines
-
-
##------- Bytecode size ----
set size .75,.75
Index: llvm/utils/NightlyTest.pl
diff -u llvm/utils/NightlyTest.pl:1.97 llvm/utils/NightlyTest.pl:1.97.2.1
--- llvm/utils/NightlyTest.pl:1.97 Mon Jun 6 14:17:05 2005
+++ llvm/utils/NightlyTest.pl Wed Nov 16 12:33:43 2005
@@ -38,6 +38,12 @@
# testing release branches)
# -target Specify the target triplet
#
+# ---------------- Options to configure llvm-test ----------------------------
+# -spec2000path Path to the benchspec directory in the SPEC 2000 distro
+# -spec95path Path to the benchspec directory in the SPEC 95 distro.
+# -povraypath Path to the povray sources
+# -namdpath Path to the namd sources
+#
# CVSROOT is the CVS repository from which the tree will be checked out,
# specified either in the full :method:[EMAIL PROTECTED]:/dir syntax, or
# just /dir if using a local repo.
@@ -86,6 +92,8 @@
my $NICE = "";
my $NODEJAGNU = 0;
+my $LLVMTESTCONFIGARGS = "";
+
sub ReadFile {
if (open (FILE, $_[0])) {
undef $/;
@@ -298,7 +306,18 @@
}
if (/^-noexternals$/) { $NOEXTERNALS = 1; next; }
if (/^-nodejagnu$/) { $NODEJAGNU = 1; next; }
-
+ if (/^-spec2000path$/) {
+ $LLVMTESTCONFIGARGS .= " --enable-spec2000=$ARGV[0]"; shift; next;
+ }
+ if (/^-spec95path$/) {
+ $LLVMTESTCONFIGARGS .= " --enable-spec95=$ARGV[0]"; shift; next;
+ }
+ if (/^-povraypath$/) {
+ $LLVMTESTCONFIGARGS .= " --enable-povray=$ARGV[0]"; shift; next;
+ }
+ if (/^-namdpath$/) {
+ $LLVMTESTCONFIGARGS .= " --enable-namd=$ARGV[0]"; shift; next;
+ }
print "Unknown option: $_ : ignoring!\n";
}
@@ -410,7 +429,8 @@
#
if (!$NOCHECKOUT) {
if ( $VERBOSE ) { print "CONFIGURE STAGE\n"; }
- system "(time -p $NICE ./configure $CONFIGUREARGS --enable-spec
--with-objroot=.) > $BuildLog 2>&1";
+ my $EXTRAFLAGS = "--enable-spec --with-objroot=.$LLVMTESTCONFIGARGS";
+ system "(time -p $NICE ./configure $CONFIGUREARGS $EXTRAFLAGS) > $BuildLog
2>&1";
if ( $VERBOSE ) { print "BUILD STAGE\n"; }
# Build the entire tree, capturing the output into $BuildLog
@@ -720,7 +740,6 @@
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);
@@ -728,7 +747,6 @@
$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
@@ -739,7 +757,6 @@
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 $OldenTestsLog";
}
@@ -765,7 +782,7 @@
# 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_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');
Index: llvm/utils/NightlyTestTemplate.html
diff -u llvm/utils/NightlyTestTemplate.html:1.41
llvm/utils/NightlyTestTemplate.html:1.41.4.1
--- llvm/utils/NightlyTestTemplate.html:1.41 Sun Feb 13 10:08:30 2005
+++ llvm/utils/NightlyTestTemplate.html Wed Nov 16 12:33:43 2005
@@ -142,15 +142,9 @@
Size of LLVM bytecode files
</td>
<td width=50% align=center>
-<a href="running_Olden_machcode_large.png"><img width=480 height=360 border=0
src="running_Olden_machcode.png"></a><br>
-Size of native machine code for each program (generated by the JIT)
-</td></tr>
-<tr>
-<td align=center>
<a href="running_Olden_opt_time_large.png"><img width=480 height=360 border=0
src="running_Olden_opt_time.png"></a><br>
Time to run the LLVM optimizer on each program
-</td>
-<td></td></tr>
+</td></tr>
</table>
<h2>Program Execution Measurements:</h2>
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
