|
From: <sv...@va...> - 2006-11-22 00:52:06
|
Author: njn
Date: 2006-11-22 00:52:00 +0000 (Wed, 22 Nov 2006)
New Revision: 6364
Log:
An extension of the previous commit: the vg_perf --tools option is so us=
eful
that I got rid of the "tools:" line in the .vg_perf files.
Modified:
trunk/perf/bigcode1.vgperf
trunk/perf/bigcode2.vgperf
trunk/perf/bz2.vgperf
trunk/perf/fbench.vgperf
trunk/perf/ffbench.vgperf
trunk/perf/heap.vgperf
trunk/perf/sarp.vgperf
trunk/perf/tinycc.vgperf
trunk/perf/vg_perf.in
Modified: trunk/perf/bigcode1.vgperf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/perf/bigcode1.vgperf 2006-11-22 00:39:08 UTC (rev 6363)
+++ trunk/perf/bigcode1.vgperf 2006-11-22 00:52:00 UTC (rev 6364)
@@ -1,2 +1 @@
prog: bigcode
-tools: none memcheck
Modified: trunk/perf/bigcode2.vgperf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/perf/bigcode2.vgperf 2006-11-22 00:39:08 UTC (rev 6363)
+++ trunk/perf/bigcode2.vgperf 2006-11-22 00:52:00 UTC (rev 6364)
@@ -1,3 +1,2 @@
prog: bigcode
args: 0
-tools: none memcheck
Modified: trunk/perf/bz2.vgperf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/perf/bz2.vgperf 2006-11-22 00:39:08 UTC (rev 6363)
+++ trunk/perf/bz2.vgperf 2006-11-22 00:52:00 UTC (rev 6364)
@@ -1,2 +1 @@
prog: bz2
-tools: none memcheck
Modified: trunk/perf/fbench.vgperf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/perf/fbench.vgperf 2006-11-22 00:39:08 UTC (rev 6363)
+++ trunk/perf/fbench.vgperf 2006-11-22 00:52:00 UTC (rev 6364)
@@ -1,2 +1 @@
prog: fbench
-tools: none memcheck
Modified: trunk/perf/ffbench.vgperf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/perf/ffbench.vgperf 2006-11-22 00:39:08 UTC (rev 6363)
+++ trunk/perf/ffbench.vgperf 2006-11-22 00:52:00 UTC (rev 6364)
@@ -1,2 +1 @@
prog: ffbench
-tools: none memcheck
Modified: trunk/perf/heap.vgperf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/perf/heap.vgperf 2006-11-22 00:39:08 UTC (rev 6363)
+++ trunk/perf/heap.vgperf 2006-11-22 00:52:00 UTC (rev 6364)
@@ -1,2 +1 @@
prog: heap
-tools: none memcheck
Modified: trunk/perf/sarp.vgperf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/perf/sarp.vgperf 2006-11-22 00:39:08 UTC (rev 6363)
+++ trunk/perf/sarp.vgperf 2006-11-22 00:52:00 UTC (rev 6364)
@@ -1,2 +1 @@
prog: sarp
-tools: none memcheck
Modified: trunk/perf/tinycc.vgperf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/perf/tinycc.vgperf 2006-11-22 00:39:08 UTC (rev 6363)
+++ trunk/perf/tinycc.vgperf 2006-11-22 00:52:00 UTC (rev 6364)
@@ -1,3 +1,2 @@
prog: tinycc
args: -c test_input_for_tinycc.c
-tools: none memcheck
Modified: trunk/perf/vg_perf.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/perf/vg_perf.in 2006-11-22 00:39:08 UTC (rev 6363)
+++ trunk/perf/vg_perf.in 2006-11-22 00:52:00 UTC (rev 6364)
@@ -41,7 +41,6 @@
# Each test is defined in a file <test>.vgperf, containing one or more o=
f the
# following lines, in any order:
# - prog: <prog to run> (compulsory)
-# - tools: <Valgrind tools> (compulsory)
# - args: <args for prog> (default: none)
# - vgopts: <Valgrind options> (default: none)
# - prereq: <prerequisite command> (default: none)
@@ -64,10 +63,13 @@
-h --help show this message
--all run all tests under this directory
--reps=3D<n> number of repeats for each program [1]
- --tools=3D<t1,t2,t3> tools to run (overrides .vgperf "tools" line=
)
+ --tools=3D<t1,t2,t3> tools to run [Nulgrind and Memcheck]
--vg Valgrind(s) to measure (can be specified multi=
ple
times). The "in-place" build is used.
[Valgrind in the current directory]
+
+ Any tools named in --tools must be present in all directories specifie=
d
+ with --vg. (This is not checked.)
END
;
=20
@@ -77,12 +79,11 @@
my $args; # test prog args
my $prereq; # prerequisite test to satisfy before running te=
st
my $cleanup; # cleanup command to run
-my @tools; # which tools are we measuring the program with
=20
# Command line options
my $n_reps =3D 1; # Run each test $n_reps times and choose the b=
est one.
my @vgdirs; # Dirs of the various Valgrinds being measured.
-my $tools_specified =3D 0; # Indicates if --tools was given.
+my @tools =3D ("none", "memcheck"); # tools being measured
=20
my $num_tests_done =3D 0;
my $num_timings_done =3D 0;
@@ -120,14 +121,6 @@
return $prog;
}
=20
-sub validate_tools($)
-{
- # XXX: should check they exist!
- my ($toolnames) =3D @_;
- my @t =3D split(/\s+/, $toolnames);
- return @t;
-}
-
sub add_vgdir($)
{
my ($vgdir) =3D @_;
@@ -153,7 +146,6 @@
add_vgdir($1);
} elsif ($arg =3D~ /^--tools=3D(.+)$/) {
@tools =3D split(/,/, $1);
- $tools_specified =3D 1
} else {
die $usage;
}
@@ -199,11 +191,6 @@
$vgopts =3D $1;
} elsif ($line =3D~ /^\s*prog:\s*(.*)$/) {
$prog =3D validate_program(".", $1, 1, 1);
- } elsif ($line =3D~ /^\s*tools:\s*(.*)$/) {
- # Only use the "tools:" line if --tools wasn't specified.
- if ($tools_specified =3D=3D 0) {
- @tools =3D validate_tools($1);
- }
} elsif ($line =3D~ /^\s*args:\s*(.*)$/) {
$args =3D $1;
} elsif ($line =3D~ /^\s*prereq:\s*(.*)$/) {
|