Update of /cvsroot/compbench/CompBenchmarks++
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28290
Modified Files:
compbenchmarks-config
Log Message:
Results given as 7.782e9 are understood and modified to standard form.
Index: compbenchmarks-config
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-config,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** compbenchmarks-config 3 Oct 2006 15:44:48 -0000 1.20
--- compbenchmarks-config 4 Oct 2006 15:48:49 -0000 1.21
***************
*** 871,880 ****
cbmc_dialog_gauge("Benchmarking $i/$tot (ETA. $eta)\nCompiler : $r_c\nOptions : $r_o\nBenchmark : $r_b (" . ($r_n+1) . "/$CBM_BENCHMARKS_RUNS)", sprintf("%d", $i*100.0/$tot), 11, 70);
}
-
next;
}
my $beg = time();
$SIG{INT} = \&sigint_compbenchmark;
! my $r = `$cmd`;
$SIG{INT} = 'DEFAULT';
my $end = time();
--- 871,879 ----
cbmc_dialog_gauge("Benchmarking $i/$tot (ETA. $eta)\nCompiler : $r_c\nOptions : $r_o\nBenchmark : $r_b (" . ($r_n+1) . "/$CBM_BENCHMARKS_RUNS)", sprintf("%d", $i*100.0/$tot), 11, 70);
}
next;
}
my $beg = time();
$SIG{INT} = \&sigint_compbenchmark;
! my $r = `$cmd`;
$SIG{INT} = 'DEFAULT';
my $end = time();
***************
*** 885,888 ****
--- 884,900 ----
$r=~s/ //g;
cbmc_dialog_gauge("Benchmarking $i/$tot (ETA. $eta)\nCompiler : $r_c\nOptions : $r_o\nBenchmark : $r_b (" . ($r_n+1) . "/$CBM_BENCHMARKS_RUNS)", sprintf("%d", $i*100.0/$tot), 11, 70);
+
+ if ($r =~ /^([\d|\.]*)e\+(\d*)$/) {
+ my $pow = 1;
+ my $p = $2;
+
+ if ($p>1) {
+ while ($p--) {
+ $pow*=10;
+ }
+ $r=$1*$pow;
+ }
+ }
+
my $F = $CBM_CURRENT_BENCH_RESULTS_FILE;
open(FD, ">>$F"); # file must exists for archiving
|