An extension of the previous commit: the vg_perf --tools option is so useful

that I got rid of the "tools:" line in the .vg_perf files.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6364 a5019735-40e9-0310-863c-91ae7b9d1cf9

9 files changed, 5 insertions, 26 deletions

diff --git a/perf/bigcode1.vgperf b/perf/bigcode1.vgperf
index 1f39f38e3..2fdcb4c3a 100644
--- a/perf/bigcode1.vgperf
+++ b/perf/bigcode1.vgperf
@@ -1,2 +1 @@
 prog: bigcode
-tools: none memcheck
diff --git a/perf/bigcode2.vgperf b/perf/bigcode2.vgperf
index a7fc95431..e4a42c989 100644
--- a/perf/bigcode2.vgperf
+++ b/perf/bigcode2.vgperf
@@ -1,3 +1,2 @@
 prog: bigcode
 args: 0
-tools: none memcheck
diff --git a/perf/bz2.vgperf b/perf/bz2.vgperf
index 37c717095..4cb384863 100644
--- a/perf/bz2.vgperf
+++ b/perf/bz2.vgperf
@@ -1,2 +1 @@
 prog: bz2
-tools: none memcheck
diff --git a/perf/fbench.vgperf b/perf/fbench.vgperf
index f46b4263b..ce547271b 100644
--- a/perf/fbench.vgperf
+++ b/perf/fbench.vgperf
@@ -1,2 +1 @@
 prog: fbench
-tools: none memcheck
diff --git a/perf/ffbench.vgperf b/perf/ffbench.vgperf
index 98dae55cd..df3213c84 100644
--- a/perf/ffbench.vgperf
+++ b/perf/ffbench.vgperf
@@ -1,2 +1 @@
 prog: ffbench
-tools: none memcheck
diff --git a/perf/heap.vgperf b/perf/heap.vgperf
index a3628015c..9da6fd4c4 100644
--- a/perf/heap.vgperf
+++ b/perf/heap.vgperf
@@ -1,2 +1 @@
 prog: heap
-tools: none memcheck
diff --git a/perf/sarp.vgperf b/perf/sarp.vgperf
index 83c634a2e..00b3902d7 100644
--- a/perf/sarp.vgperf
+++ b/perf/sarp.vgperf
@@ -1,2 +1 @@
 prog: sarp
-tools: none memcheck
diff --git a/perf/tinycc.vgperf b/perf/tinycc.vgperf
index c6303ed27..c089740f9 100644
--- a/perf/tinycc.vgperf
+++ b/perf/tinycc.vgperf
@@ -1,3 +1,2 @@
 prog: tinycc
 args: -c test_input_for_tinycc.c
-tools: none memcheck
diff --git a/perf/vg_perf.in b/perf/vg_perf.in
index c9d6d95cb..b4625ec65 100644
--- a/perf/vg_perf.in
+++ b/perf/vg_perf.in
@@ -41,7 +41,6 @@
 # Each test is defined in a file <test>.vgperf, containing one or more of 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 @@ usage: vg_perf [options] [files or dirs]
     -h --help             show this message
     --all                 run all tests under this directory
     --reps=<n>            number of repeats for each program [1]
-    --tools=<t1,t2,t3>    tools to run (overrides .vgperf "tools" line)
+    --tools=<t1,t2,t3>    tools to run [Nulgrind and Memcheck]
     --vg                  Valgrind(s) to measure (can be specified multiple
                             times).  The "in-place" build is used.
                             [Valgrind in the current directory]
+
+  Any tools named in --tools must be present in all directories specified
+  with --vg.  (This is not checked.)
 END
 ;
 
@@ -77,12 +79,11 @@ my $prog;               # test prog
 my $args;               # test prog args
 my $prereq;             # prerequisite test to satisfy before running test
 my $cleanup;            # cleanup command to run
-my @tools;              # which tools are we measuring the program with
 
 # Command line options
 my $n_reps = 1;         # Run each test $n_reps times and choose the best one.
 my @vgdirs;             # Dirs of the various Valgrinds being measured.
-my $tools_specified = 0; # Indicates if --tools was given.
+my @tools = ("none", "memcheck");   # tools being measured
 
 my $num_tests_done   = 0;
 my $num_timings_done = 0;
@@ -120,14 +121,6 @@ sub validate_program ($$$$)
     return $prog;
 }
 
-sub validate_tools($)
-{
-    # XXX: should check they exist!
-    my ($toolnames) = @_;
-    my @t = split(/\s+/, $toolnames);
-    return @t;
-}
-
 sub add_vgdir($)
 {
     my ($vgdir) = @_;
@@ -153,7 +146,6 @@ sub process_command_line()
                 add_vgdir($1);
             } elsif ($arg =~ /^--tools=(.+)$/) {
                 @tools = split(/,/, $1);
-                $tools_specified = 1
             } else {
                 die $usage;
             }
@@ -199,11 +191,6 @@ sub read_vgperf_file($)
             $vgopts = $1;
         } elsif ($line =~ /^\s*prog:\s*(.*)$/) {
             $prog = validate_program(".", $1, 1, 1);
-        } elsif ($line =~ /^\s*tools:\s*(.*)$/) {
-            # Only use the "tools:" line if --tools wasn't specified.
-            if ($tools_specified == 0) {
-                @tools = validate_tools($1);
-            }
         } elsif ($line =~ /^\s*args:\s*(.*)$/) {
             $args = $1;
         } elsif ($line =~ /^\s*prereq:\s*(.*)$/) {