[project @ 1999-01-18 16:35:37 by simonm]

[ghc-hetmet.git] / glafp-utils / runstdtest / runstdtest.prl

diff --git a/glafp-utils/runstdtest/runstdtest.prl b/glafp-utils/runstdtest/runstdtest.prl
index 1ca1d5b..882dbf9 100644 (file)
--- a/glafp-utils/runstdtest/runstdtest.prl
+++ b/glafp-utils/runstdtest/runstdtest.prl
@@ -12,7 +12,7 @@
 #          [default: anything on the cmd line this script doesn't recognise ]
 #        the first opt not starting w/ "-" is taken to be an input
 #        file and (if it exists) is grepped for "what's going on here"
-#        comments (^--!!!).
+#        comments (^-- !!!).
 #      * a file to feed to stdin ( -i<file> ) [default: /dev/null ]
 #      * a "time" command to use (-t <cmd>).
 #
@@ -139,12 +139,12 @@ exit 1 if $Status;
 
 # tidy up the pgm args:
 # (1) look for the "first input file"
-#     and grep it for "interesting" comments (--!!! )
+#     and grep it for "interesting" comments (-- !!! )
 # (2) quote any args w/ whitespace in them.
 $grep_done = 0;
 foreach $a ( @PgmArgs ) {
     if (! $grep_done && $a !~ /^-/ && -f $a) {
-       print `egrep "^--!!!" $a`;
+       print `egrep "^--[ ]?!!!" $a`;
        $grep_done = 1;
     }
     if ($a =~ /\s/ || $a =~ /'/) {
@@ -374,7 +374,7 @@ sub process_stats_file {
        local($tot_samples) = 0;
 
        while (<STATS>) {
-           if (! /Minor/ && /^\s*\d+\s+\d+\s+(\d+)\s+\d+\.\d+\%/ ) {
+           if (! /Gen:\s+0/ && /^\s*\d+\s+\d+\s+(\d+)\s+\d+\.\d+/ ) {
                $max_live = $1 if $max_live < $1;
                $tot_live += $1;
                $tot_samples += 1;
@@ -386,7 +386,7 @@ sub process_stats_file {
 #              $MaxResidency = $1; $ResidencySamples = $2;
 #          }
 
-           $GCs = $1 if /^\s*([0-9,]+) garbage collections? performed/;
+           $GCs = $1 if /^\s*([0-9,]+) collections? in generation 0/;
 
            if ( /^\s*INIT\s+time\s*(\d+\.\d\d)s\s*\(\s*(\d+\.\d\d)s elapsed\)/ ) {
                $InitTime = $1; $InitElapsed = $2;