$PreScript = '';
$PostScript = '';
$TimeCmd = '';
+$Heimdall = 0;
+$HeimdallPrefix = '';
+$HeimdallStats = "heimdall.summary";
$StatsFile = "$TmpPrefix/stats$$";
$CacheProfStats = "cacheprof.out.summary";
$SysSpecificTiming = '';
/^-cacheprof$/ && do { $SysSpecificTiming = 'ghc-instrs';
$CacheProf = 'yes';
next arg };
+ /^-heimdall$/ && do { $HeimdallPrefix = 'heimdall_cp '; # must have trailing space!
+ $SysSpecificTiming = 'ghc-instrs';
+ $Heimdall = 1;
+ next arg; };
/^-t(.*)/ && do { $TimeCmd = &grab_arg_arg('-t', $1); next arg; };
# anything else is taken to be a pgm arg
cat /dev/null > $DefaultStderrFile
$PreScriptLines
$SpixifyLine1
-$TimeCmd /bin/sh -c \'$ToRun $TimingMagic @PgmArgs < $PgmStdinFile 1> $TmpPrefix/runtest$$.1 2> $TmpPrefix/runtest$$.2 3> $TmpPrefix/runtest$$.3\'
+$TimeCmd /bin/sh -c \'$HeimdallPrefix$ToRun $TimingMagic @PgmArgs < $PgmStdinFile 1> $TmpPrefix/runtest$$.1 2> $TmpPrefix/runtest$$.2 3> $TmpPrefix/runtest$$.3\'
progexit=\$?
if [ \$progexit -eq 0 ] && [ $PgmFail -ne 0 ]; then
echo $ToRun @PgmArgs \\< $PgmStdinFile
myexit=\$?
diffsShown=1
fi
- if [ $SaveStdout = 1 ] && [ \$progexit = $PgmExitStatus ] &&
+ if [ $SaveStdout = 1 ] &&
[ $PgmStdoutFile[0] != $DefaultStdoutFile ] && [ -s $TmpPrefix/runtest$$.1 ]; then
echo Saving away stdout output in $PgmStdoutFile[0] ...
if [ -f $PgmStdoutFile[0] ]; then
fi
egrep -v '^ld\.so:.*has older revision than expected' < $TmpPrefix/runtest$$.2 > $TmpPrefix/runtest$$.2b
mv -f $TmpPrefix/runtest$$.2b $TmpPrefix/runtest$$.2
+egrep '^=== HEIMDALL: ' < $TmpPrefix/runtest$$.2 > $HeimdallStats
+egrep -v '^=== HEIMDALL: ' < $TmpPrefix/runtest$$.2 > $TmpPrefix/runtest$$.2b
+mv -f $TmpPrefix/runtest$$.2b $TmpPrefix/runtest$$.2
hit='NO'
for out_file in @PgmStderrFile ; do
myexit=\$?
diffsShown=1
fi
-if [ $SaveStderr = 1 ] && [ \$progexit = $PgmExitStatus ] &&
+if [ $SaveStderr = 1 ] &&
[ $PgmStderrFile[0] != $DefaultStderrFile ] && [ -s $TmpPrefix/runtest$$.2 ]; then
echo Saving away stderr output in $PgmStderrFile[0] ...
if [ -f $PgmStderrFile[0] ]; then
&process_stats_file();
&process_cacheprof_files() if $CacheProf eq 'yes';
+&process_heimdall_file() if $Heimdall;
# print out what we found
print STDERR "<<$SysSpecificTiming: ";
-if ( $CacheProf ne 'yes' ) {
+if ( $CacheProf ne 'yes' && !$Heimdall) {
print STDERR "$BytesAlloc bytes, $GCs GCs, $AvgResidency/$MaxResidency avg/max bytes residency ($ResidencySamples samples), $GCWork bytes GC work, ${TotMem}M in use, $InitTime INIT ($InitElapsed elapsed), $MutTime MUT ($MutElapsed elapsed), $GcTime GC ($GcElapsed elapsed)";
} else {
print STDERR "$BytesAlloc bytes, $GCs GCs, $AvgResidency/$MaxResidency avg/max bytes residency ($ResidencySamples samples), $GCWork bytes GC work, ${TotMem}M in use, $InitTime INIT ($InitElapsed elapsed), $MutTime MUT ($MutElapsed elapsed), $GcTime GC ($GcElapsed elapsed), $TotInstrs instructions, $TotReads memory reads, $TotWrites memory writes";
$MutElapsed =~ s/,//g;
$GcTime =~ s/,//g;
$GcElapsed =~ s/,//g;
-
- # if timings are negative (I've seen -0.00s) then set to 0
- $InitTime = 0 unless $InitTime >= 0;
- $InitElapsed = 0 unless $InitElapsed >= 0;
- $MutTime = 0 unless $MutTime >= 0;
- $MutElapsed = 0 unless $MutElapsed >= 0;
- $GcTime = 0 unless $GcTime >= 0;
- $GcElapsed = 0 unless $GcElapsed >= 0;
-
}
sub process_cacheprof_files {
open(STATS, "< $CacheProfStats") || die("Can't open $CacheProfStats\n");
+
+ # the format of the info in this file is:
+ # OTHER(intrs,reads,writes,read-misses,write-misses)
+ # where read-misses and write-misses will both be zero if we're
+ # just counting instructions.
+ while (<STATS>) {
+ /OTHER\(\s*([0-9]+),\s*([0-9]+),\s*([0-9]+),\s*([0-9]+),\s*([0-9]+)\)/ && do {
+ $TotInstrs = $1;
+ $TotReads = $2;
+ $TotWrites = $3;
+ }
+ }
+ close(STATS);
+}
+
+sub process_heimdall_file {
+
+ open(STATS, "< $HeimdallStats") || die("Can't open $HeimdallStats\n");
+
+ # instruction counts from Julian Seward's HEIMDALL:
+ #
+ # === HEIMDALL: instruction counts: 815000 instrs, 230040 reads, 138692 writes
while (<STATS>) {
- /OTHER\(\s*([0-9]+),\s*([0-9]+),\s*([0-9]+)\)/ && do {
+ /^=== HEIMDALL: instruction counts: ([0-9]+) instrs, ([0-9]+) reads, ([0-9]+) writes/
+ && do {
$TotInstrs = $1;
$TotReads = $2;
$TotWrites = $3;
}
close(STATS);
}
+