@PgmArgs = ();
$PgmExitStatus = 0;
$PgmStdinFile = '/dev/null';
-$TmpPrefix = '$(TMPDIR)';
+if ( $ENV{'TMPDIR'} ) { # where to make tmp file names
+ $TmpPrefix = $ENV{'TMPDIR'};
+} else {
+ $TmpPrefix ="$(TMPDIR)";
+ $ENV{'TMPDIR'} = '$(TMPDIR)'; # set the env var as well
+}
$ScriptFile = "$TmpPrefix/run_me$$";
$DefaultStdoutFile = "$TmpPrefix/no_stdout$$"; # can't use /dev/null (e.g. Alphas)
$DefaultStderrFile = "$TmpPrefix/no_stderr$$";
@PgmStdoutFile = ();
@PgmStderrFile = ();
-$AltScript = '';
+$PreScript = '';
+$PostScript = '';
$TimeCmd = '';
$StatsFile = "$TmpPrefix/stats$$";
$SysSpecificTiming = '';
arg: while ($_ = $ARGV[0]) {
shift(@ARGV);
+ /^--$/ && do { # let anything past after --
+ push(@PgmArgs, @ARGV);
+ last arg; };
+
/^-v$/ && do { $Verbose = 1; next arg; };
/^-O(.*)/ && do { push(@PgmArgs, &grab_arg_arg('-O',$1)); next arg; };
/^-i(.*)/ && do { $PgmStdinFile = &grab_arg_arg('-i',$1);
/^-o2(.*)/ && do { $out_file = &grab_arg_arg('-o2',$1);
push(@PgmStderrFile, $out_file);
next arg; };
- /^-script(.*)/ && do { $AltScript = &grab_arg_arg('-script',$1);
- @PgmStdoutFile = (); # re-init
- @PgmStderrFile = (); # ditto
- next arg; };
+ /^-prescript(.*)/ && do { $PreScript = &grab_arg_arg('-prescript',$1);
+ next arg; };
+ /^-postscript(.*)/ && do { $PostScript = &grab_arg_arg('-postscript',$1);
+ next arg; };
+ /^-script/ && do { print STDERR "$Pgm: -script argument is obsolete;\nUse -prescript and -postscript instead.\n";
+ $Status++;
+ next arg; };
/^-(ghc|hbc)-timing$/ && do { $SysSpecificTiming = $1;
next arg; };
/^-spix-timing$/ && do { $SysSpecificTiming = 'ghcspix';
$TimingMagic = "-S$StatsFile";
}
-if ($AltScript ne '') {
- local($to_do);
- $to_do = `cat $AltScript`;
- # glue in pgm to run...
- $* = 1;
- $to_do =~ s/^\$1 /$ToRun /;
- &run_something($to_do);
- exit 0;
-# exec "$AltScript $ToRun";
-# print STDERR "Failed to exec!!! $AltScript $ToRun\n";
-# exit 1;
-}
-
$ToRunOrig = $ToRun;
if ( $SpixTiming eq 'yes' ) {
$ToRun .= '.spix';
open(SPIXNM, "nm -n $ToRunOrig |") || die "nm -n $ToRunOrig open failed!\n";
spix: while (<SPIXNM>) {
- if ( / T (_FreeMallocPtr|_([A-Za-z]+)Hook|_xmalloc|_mpz_get_si)$/ ) {
+ if ( / T +(_freeForeignObj|_([A-Za-z]+)Hook|_xmalloc|_mpz_get_si)$/ ) {
$LastSpix = $1;
last spix;
}
}
close(SPIXNM); # || die "nm -n $ToRunOrig close failed!\n";
- $SpixifyLine = "spix -o $ToRun -t$FirstSpix,$LastSpix $ToRunOrig";
- $SpixstatsLine = "spixstats -b $TmpPrefix/runtest$$.3 $ToRunOrig > $ToRunOrig.spixstats";
+ $SpixifyLine1 = "spix -o $ToRun -t$FirstSpix,$LastSpix $ToRunOrig";
+ $SpixstatsLine1 = "spixstats -b $TmpPrefix/runtest$$.3 $ToRunOrig > $ToRunOrig.spixstats1";
+ $SpixifyLine2 = "spix -o $ToRun +t$FirstSpix,$LastSpix $ToRunOrig";
+ $SpixstatsLine2 = "spixstats -b $TmpPrefix/runtest$$.3 $ToRunOrig > $ToRunOrig.spixstats2";
+} else {
+ $SpixifyLine1 = '';
+ $SpixstatsLine1 = '';
+ $SpixifyLine2 = '';
+ $SpixstatsLine2 = '';
+}
+
+if ($PreScript ne '') {
+ local($to_do);
+ $PreScriptLines = `cat $PreScript`;
+} else {
+ $PreScriptLines = '';
+}
+
+if ($PostScript ne '') {
+ local($to_do);
+ $PostScriptLines = `cat $PostScript`;
+ $* = 1;
+ $PostScriptLines =~ s#\$o1#$TmpPrefix/runtest$$.1#g;
+ $PostScriptLines =~ s#\$o2#$TmpPrefix/runtest$$.2#g;
} else {
- $SpixifyLine = '';
- $SpixstatsLine = '';
+ $PostScriptLines = '';
}
# OK, so we're gonna do the normal thing...
rm -f $DefaultStdoutFile $DefaultStderrFile
cat /dev/null > $DefaultStdoutFile
cat /dev/null > $DefaultStderrFile
-$SpixifyLine
+$PreScriptLines
+$SpixifyLine1
$TimeCmd /bin/sh -c \'$ToRun $TimingMagic @PgmArgs < $PgmStdinFile 1> $TmpPrefix/runtest$$.1 2> $TmpPrefix/runtest$$.2 3> $TmpPrefix/runtest$$.3\'
progexit=\$?
if [ \$progexit -ne $PgmExitStatus ]; then
echo expected exit status $PgmExitStatus not seen \\; got \$progexit
myexit=1
else
+ $PostScriptLines
hit='NO'
for out_file in @PgmStdoutFile ; do
if cmp -s \$out_file $TmpPrefix/runtest$$.1 ; then
myexit=1
diffsShown=1
fi
-$SpixstatsLine
+$SpixstatsLine1
+
+if [ $SpixTiming = 'yes' -a \$myexit = 0 ] ; then
+ $SpixifyLine2
+ $TimeCmd /bin/sh -c \'$ToRun $TimingMagic @PgmArgs < $PgmStdinFile 1> /dev/null 2> /dev/null 3> $TmpPrefix/runtest$$.3\'
+ $SpixstatsLine2
+fi
+
$(RM) core $ToRunOrig.spix $DefaultStdoutFile $DefaultStderrFile $TmpPrefix/runtest$$.1 $TmpPrefix/runtest$$.2 $TmpPrefix/runtest$$.3
exit \$myexit
EOSCRIPT
}
&process_stats_file();
-&process_spixstats_file() if $SpixTiming eq 'yes';
+&process_spixstats_files() if $SpixTiming eq 'yes';
# print out what we found
if ( $SpixTiming ne 'yes' ) {
print STDERR "<<$SysSpecificTiming: ",
- "$BytesAlloc bytes, $GCs GCs, $MaxResidency bytes residency ($ResidencySamples samples), $InitTime INIT ($InitElapsed elapsed), $MutTime MUT ($MutElapsed elapsed), $GcTime GC ($GcElapsed elapsed)",
+ "$BytesAlloc bytes, $GCs GCs, $AvgResidency/$MaxResidency avg/max bytes residency ($ResidencySamples samples), $InitTime INIT ($InitElapsed elapsed), $MutTime MUT ($MutElapsed elapsed), $GcTime GC ($GcElapsed elapsed)",
" :$SysSpecificTiming>>\n";
} else {
print STDERR "<<$SysSpecificTiming: ",
- "$BytesAlloc bytes, $GCs GCs, $MaxResidency bytes residency ($ResidencySamples samples), $TotalInsns instructions, $LoadInsns loads, $StoreInsns stores, $BranchInsns branches, $OtherInsns others",
+ "$BytesAlloc bytes, $GCs GCs, $AvgResidency/$MaxResidency avg/max bytes residency ($ResidencySamples samples), $TotalInsns[1]/$TotalInsns[2] instructions, $LoadInsns[1]/$LoadInsns[2] loads, $StoreInsns[1]/$StoreInsns[2] stores, $BranchInsns[1]/$BranchInsns[2] branches, $OtherInsns[1]/$OtherInsns[2] others",
" :$SysSpecificTiming>>\n";
}
#NB: nearly the same as in GHC driver's -ghc-timing stuff
open(STATS, $StatsFile) || die "Failed when opening $StatsFile\n";
+
+ local($max_live) = 0;
+ local($tot_live) = 0; # for calculating residency stuff
+ local($tot_samples) = 0;
+
while (<STATS>) {
+ if (! /Minor/ && /^\s*\d+\s+\d+\s+(\d+)\s+\d+\.\d+\%/ ) {
+ $max_live = $1 if $max_live < $1;
+ $tot_live += $1;
+ $tot_samples += 1;
+ }
+
$BytesAlloc = $1 if /^\s*([0-9,]+) bytes allocated in the heap/;
- if ( /^\s*([0-9,]+) bytes maximum residency .* (\d+) sample/ ) {
- $MaxResidency = $1; $ResidencySamples = $2;
- }
+# if ( /^\s*([0-9,]+) bytes maximum residency .* (\d+) sample/ ) {
+# $MaxResidency = $1; $ResidencySamples = $2;
+# }
$GCs = $1 if /^\s*([0-9,]+) garbage collections? performed/;
}
}
close(STATS) || die "Failed when closing $StatsFile\n";
+ if ( $tot_samples > 0 ) {
+ $ResidencySamples = $tot_samples;
+ $MaxResidency = $max_live;
+ $AvgResidency = int ($tot_live / $tot_samples) ;
+ }
} elsif ( $SysSpecificTiming eq 'hbc' ) {
# things we didn't necessarily expect to find
$MaxResidency = 0 unless defined($MaxResidency);
+ $AvgResidency = 0 unless defined($AvgResidency);
$ResidencySamples = 0 unless defined($ResidencySamples);
# a bit of tidying
$GcElapsed =~ s/,//g;
}
-sub process_spixstats_file {
+sub process_spixstats_files { # 2 of them; one for mutator, one for GC
- $TotalInsns = 0;
- $LoadInsns = 0;
- $StoreInsns = 0;
- $BranchInsns= 0;
- $OtherInsns = 0;
+ @TotalInsns = ();
+ @LoadInsns = ();
+ @StoreInsns = ();
+ @BranchInsns= ();
+ @OtherInsns = ();
- open(STATS, "< $ToRunOrig.spixstats") || die "Failed when opening $ToRunOrig.spixstats\n";
- while (<STATS>) {
- last if /^OPCODES \(STATIC\):/; # party over
+ foreach $f (1, 2) {
- next if /^OPCODES \(DYNAMIC\):/;
- next if /^$/;
- next if /^opcode\s+#executed/;
- next if /^SUBTOTAL/;
+ open(STATS, "< $ToRunOrig.spixstats$f") || die "Failed when opening $ToRunOrig.spixstats$f\n";
+ while (<STATS>) {
+ last if /^OPCODES \(STATIC\):/; # party over
- if ( /^ld\S*\s+(\d+)/ ) {
- $LoadInsns += $1;
+ next if /^OPCODES \(DYNAMIC\):/;
+ next if /^$/;
+ next if /^opcode\s+#executed/;
+ next if /^SUBTOTAL/;
- } elsif ( /^st\S*\s+(\d+)/ ) {
- $StoreInsns += $1;
+ if ( /^ld\S*\s+(\d+)/ ) {
+ $LoadInsns[$f] += $1;
- } elsif ( /^(jmpl|call|b\S*)\s+(\d+)/ ) {
- $BranchInsns += $2;
+ } elsif ( /^st\S*\s+(\d+)/ ) {
+ $StoreInsns[$f] += $1;
- } elsif ( /^TOTAL\s+(\d+)/ ) {
- $TotalInsns = $1;
- print STDERR "TotalInsns doesn't match categories total!\n"
- if $TotalInsns !=
- ($LoadInsns + $StoreInsns + $BranchInsns + $OtherInsns);
+ } elsif ( /^(jmpl|call|b\S*)\s+(\d+)/ ) {
+ $BranchInsns[$f] += $2;
- } elsif ( /^\S+\s+(\d+)/ ) {
- $OtherInsns += $1;
+ } elsif ( /^TOTAL\s+(\d+)/ ) {
+ $TotalInsns[$f] = $1;
+ print STDERR "TotalInsns doesn't match categories total!\n"
+ if $TotalInsns[$f] !=
+ ($LoadInsns[$f] + $StoreInsns[$f] + $BranchInsns[$f] + $OtherInsns[$f]);
- } else {
- die "Funny line?? $_";
- }
+ } elsif ( /^\S+\s+(\d+)/ ) {
+ $OtherInsns[$f] += $1;
+
+ } else {
+ die "Funny line?? $_";
+ }
+ }
+ close(STATS) || die "Failed when closing $ToRunOrig.spixstats\n";
}
- close(STATS) || die "Failed when closing $ToRunOrig.spixstats\n";
}
projects / ghc-hetmet.git / blobdiff