/^-accept-output$/ && do { $SaveStdout = 1; $SaveStderr = 1; next arg; };
/^-stdout-binary/ && do { $StdoutBinary=1; next arg; };
- /^-stdout-binary/ && do { $StderrBinary=1; next arg; };
+ /^-stderr-binary/ && do { $StderrBinary=1; next arg; };
/^-O(.*)/ && do { push(@PgmArgs, &grab_arg_arg('-O',$1)); next arg; };
/^-i(.*)/ && do { $PgmStdinFile = &grab_arg_arg('-i',$1);
local($to_do);
$PostScriptLines = `cat $PostScript`;
$PostScriptLines =~ s/\r//g;
- $* = 1;
- $PostScriptLines =~ s#\$o1#$TmpPrefix/runtest$$.1#g;
- $PostScriptLines =~ s#\$o2#$TmpPrefix/runtest$$.2#g;
+ $PostScriptLines =~ s#\$o1#$TmpPrefix/runtest$$.1#gm;
+ $PostScriptLines =~ s#\$o2#$TmpPrefix/runtest$$.2#gm;
+# The postfix 'm' deals with recent versions of
+# Perl that removed the $* feature
} else {
$PostScriptLines = '';
}
$PreScriptLines
$SpixifyLine1
$TimeCmd /bin/sh -c \'$CachegrindPrefix $ToRun $TimingMagic @PgmArgs < $PgmStdinFile 1> $TmpPrefix/runtest$$.1.raw 2> $TmpPrefix/runtest$$.2.raw 3> $TmpPrefix/runtest$$.3.raw\'
+progexit=\$?
if [ "$StdoutBinary" = "0" ]; then
dos2unix < $TmpPrefix/runtest$$.1.raw > $TmpPrefix/runtest$$.1
else
cp $TmpPrefix/runtest$$.2.raw $TmpPrefix/runtest$$.2
fi
dos2unix < $TmpPrefix/runtest$$.3.raw > $TmpPrefix/runtest$$.3
-progexit=\$?
if [ \$progexit -eq 0 ] && [ $PgmFail -ne 0 ]; then
echo $ToRun @PgmArgs \\< $PgmStdinFile
echo "****" expected a failure, but was successful
$PostScriptLines
hit='NO'
for out_file in @PgmStdoutFile ; do
- if sed "s/\\r\$//" $TmpPrefix/runtest$$.1 | cmp -s \$out_file - ; then
+ if sed "s/\r\$//" $TmpPrefix/runtest$$.1 | cmp -s \$out_file - ; then
hit='YES'
fi
done
hit='NO'
for out_file in @PgmStderrFile ; do
- if sed "s/\\r\$//" $TmpPrefix/runtest$$.2 | cmp -s \$out_file - ; then
+ if sed "s/\r\$//" $TmpPrefix/runtest$$.2 | cmp -s \$out_file - ; then
hit='YES'
fi
done
# print out what we found
print STDERR "<<$SysSpecificTiming: ";
if ( $Cachegrind ne 'yes') {
- 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)$Counters";
+ 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), $Gc0Time GC(0) ($Gc0Elapsed elapsed), $Gc1Time GC(1) ($Gc1Elapsed elapsed), $Balance balance$Counters";
} 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, $TotMisses L2 cache misses";
+ 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), $Gc0Time GC(0) ($Gc0Elapsed elapsed), $Gc1Time GC(1) ($Gc1Elapsed elapsed), $Balance balance, $TotInstrs instructions, $TotReads memory reads, $TotWrites memory writes, $TotMisses L2 cache misses";
};
print STDERR " :$SysSpecificTiming>>\n";
local($count) = 0;
$GCWork = 0;
+ $GCs = 0;
+ $Balance = 1;
while (<STATS>) {
if (! /Gen:\s+0/ && /^\s*\d+\s+\d+\s+(\d+)\s+\d+\.\d+/ ) {
$max_live = $1 if $max_live < $1;
# $MaxResidency = $1; $ResidencySamples = $2;
# }
- $GCs = $1 if /^\s*([0-9,]+) collections? in generation 0/;
+ $GCs += $1 if /^\s*Generation\s*\d+:\s*([0-9,]+) collections/;
- if ( /^\s+([0-9]+)\s+Mb total memory/ ) {
+ if ( /^\s+([0-9]+)\s+M[Bb] total memory/ ) {
$TotMem = $1;
}
$GcTime = $1; $GcElapsed = $2;
}
+ if (/Generation (\d+):\s*\d+ collections,\s*\d+ parallel,\s*(-*\d+\.\d\d)s\s*,\s*(-*\d+\.\d\d)s elapsed/) {
+ if ($1 == 0) {
+ $Gc0Time = $2; $Gc0Elapsed = $3;
+ } elsif ($1 == 1) {
+ $Gc1Time = $2; $Gc1Elapsed = $3;
+ }
+ }
+
+ if (/work balance: ([0-9.]+)/) {
+ $Balance = $1;
+ }
+
+
if ( /CPU GC counters/ ) {
# Counters that follow correspond to GC
$into_gc_counters = 1;
print STDERR "Warning: GcElapsed not found in stats file\n" unless defined($GcElapsed);
print STDERR "Warning: total memory not found in stats file\n" unless defined($TotMem);
print STDERR "Warning: GC work not found in stats file\n" unless defined($GCWork);
+ print STDERR "Warning: Gc0Time not found in stats file\n" unless defined($Gc0Time);
+ print STDERR "Warning: Gc0Elapsed not found in stats file\n" unless defined($Gc0Elapsed);
+ print STDERR "Warning: Gc1Time not found in stats file\n" unless defined($Gc1Time);
+ print STDERR "Warning: Gc1Elapsed not found in stats file\n" unless defined($Gc1Elapsed);
+ print STDERR "Warning: Balance not found in stats file\n" unless defined($Gc1Elapsed);
# things we didn't necessarily expect to find
$MaxResidency = 0 unless defined($MaxResidency);
$AvgResidency = 0 unless defined($AvgResidency);
$ResidencySamples = 0 unless defined($ResidencySamples);
+ $Gc0Time = 0.0 unless defined($Gc0Time);
+ $Gc0Elapsed = 0.0 unless defined($Gc0Elapsed);
+ $Gc1Time = 0.0 unless defined($Gc1Time);
+ $Gc1Elapsed = 0.0 unless defined($Gc1Elapsed);
# a bit of tidying
$BytesAlloc =~ s/,//g;