X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fscripts%2Fpublic_html%2Fbench.php;h=1ee4d9ae46c8556b43dd6c92965abecc6d0f312f;hb=536be1abc85882d042c31e301299c90786c9a355;hp=57f2d40b52dcb90c594f865424144887918fc05a;hpb=6a02b1404e9e1ec8eb204e84414dec05148a4e87;p=helm.git

diff --git a/helm/software/matita/scripts/public_html/bench.php b/helm/software/matita/scripts/public_html/bench.php
index 57f2d40b5..1ee4d9ae4 100644
--- a/helm/software/matita/scripts/public_html/bench.php
+++ b/helm/software/matita/scripts/public_html/bench.php
@@ -7,45 +7,180 @@
 //
 $limits = array("20","50","100");
   
-$quey_all = urlencode("Whole content:@@@select * from bench order by mark desc***");
-$query_fail = urlencode(
-  "Number of failures@@@" .
-  "select mark, count(distinct test) as fail_no from bench where result = 'fail' group by mark order by mark desc***"
-  . "###" . 
-  "Tests failed@@@" .
-  "select distinct mark, test, result from bench where result = 'fail' order by mark desc***" 
-);
-$query_gc = urlencode(
-  "GC usage @@@" .
-  "select bench.mark, SUM(bench.time) - SUM(bench1.time) as gc_hoverhead from bench, bench as bench1 where bench.mark = bench1.mark and bench.test = bench1.test and bench.options = 'gc-on' and bench1.options = 'gc-off' and bench.compilation = bench1.compilation group by mark***"
-  . "###" . 
-  "GC usage (opt)@@@" .
-  "select bench.mark, SUM(bench.time) - SUM(bench1.time) as gc_hoverhead from bench, bench as bench1 where bench.mark = bench1.mark and bench.test = bench1.test and bench.options = 'gc-on' and bench1.options = 'gc-off' and bench.compilation = bench1.compilation and bench.compilation = 'opt' group by mark***"
-  . "###" . 
-  "GC usage (byte)@@@" .
-  "select bench.mark, SUM(bench.time) - SUM(bench1.time) as gc_hoverhead from bench, bench as bench1 where bench.mark = bench1.mark and bench.test = bench1.test and bench.options = 'gc-on' and bench1.options = 'gc-off' and bench.compilation = bench1.compilation and bench.compilation = 'byte' group by mark***"
-  
-);
-$query_auto = urlencode(
-  "Auto (with GC)@@@select mark, SUM(bench.time) as time from bench where test='auto.ma' and options = 'gc-on' group by mark order by mark desc***"
-  . "###" . 
-  "Auto (without GC)@@@select mark, SUM(bench.time) as time from bench where test='auto.ma' and options = 'gc-off' group by mark order by mark desc***"
-    . "###" . 
-   "GC overhead@@@select bench.mark, SUM(bench.time) - SUM(bench1.time) as gc_hoverhead from bench, bench as bench1 where bench.mark = bench1.mark and bench.test = bench1.test and bench.options = 'gc-on' and bench1.options = 'gc-off' and bench.compilation = bench1.compilation and bench.test = 'auto.ma' group by mark"
-);
+$quey_all = urlencode("
+Whole content:
+@@@
+select * from bench order by mark desc***");
 
-$query_csc = urlencode("Performances (byte and GC) per mark@@@select bench.mark ,bench_svn.revision as revision, SUM(bench.time) as sum_time, SUM(bench.timeuser) as sum_timeuser from bench, bench_svn where bench.options = 'gc-on' and bench.compilation = 'byte' and bench_svn.mark = bench.mark group by bench.mark order by bench.mark desc"
-);
+$query_fail = urlencode("
+Number of failures
+@@@
+select 
+  mark, count(distinct test) as fail_no 
+from bench 
+where result = 'fail' group by mark order by mark desc***
+###
+Tests failed
+@@@
+select distinct mark, test, result 
+from bench 
+where result = 'fail' order by mark desc***");
 
-$query_csc_opt = urlencode("Performances (opt and GC) per mark@@@select bench.mark,bench_svn.revision as revision, SUM(bench.time) as sum_time, SUM(bench.timeuser) as sum_timeuser from bench, bench_svn where bench.options = 'gc-on' and bench.compilation = 'opt' and bench_svn.mark = bench.mark group by bench.mark order by bench.mark desc"
-);
+$query_gc = urlencode("
+GC usage 
+@@@
+select 
+  bench.mark, SUM(bench.time) - SUM(bench1.time) as gc_hoverhead 
+from bench, bench as bench1 
+where 
+  bench.mark = bench1.mark and 
+  bench.test = bench1.test and 
+  bench.options = 'gc-on' and
+  bench1.options = 'gc-off' and 
+  bench.compilation = bench1.compilation 
+group by mark***
+###
+GC usage (opt)
+@@@
+select 
+  bench.mark, SUM(bench.time) - SUM(bench1.time) as gc_hoverhead 
+from bench, bench as bench1
+where 
+  bench.mark = bench1.mark and 
+  bench.test = bench1.test and 
+  bench.options = 'gc-on' and 
+  bench1.options = 'gc-off' and 
+  bench.compilation = bench1.compilation and 
+  bench.compilation = 'opt' 
+group by mark***
+###
+GC usage (byte)
+@@@
+select 
+  bench.mark, SUM(bench.time) - SUM(bench1.time) as gc_hoverhead 
+from bench, bench as bench1 
+where 
+  bench.mark = bench1.mark and
+  bench.test = bench1.test and 
+  bench.options = 'gc-on' and 
+  bench1.options = 'gc-off' and 
+  bench.compilation = bench1.compilation and 
+  bench.compilation = 'byte' 
+group by mark***");
 
-$query_total = urlencode(
-  
-"Max N@@@select COUNT(DISTINCT test) as MAX from bench group by mark order by MAX desc LIMIT 0,1;"
-  . "###" .
-  "Number of compiled tests@@@select mark, COUNT(DISTINCT test) as N from bench group by mark order by mark desc***"
-);
+$query_auto = urlencode("
+Auto (with GC)
+@@@
+select 
+  mark, SUM(bench.time) as time 
+from 
+  bench 
+where 
+  test='auto.ma' and options = 'gc-on' 
+group by mark 
+order by mark desc***
+### 
+Auto (without GC)
+@@@
+select 
+  mark, SUM(bench.time) as time 
+from 
+  bench 
+where 
+  test='auto.ma' and options = 'gc-off' 
+group by mark 
+order by mark desc
+***
+### 
+GC overhead
+@@@
+select 
+  bench.mark, SUM(bench.time) - SUM(bench1.time) as gc_hoverhead 
+from 
+  bench, bench as bench1 
+where 
+  bench.mark = bench1.mark and 
+  bench.test = bench1.test and 
+  bench.options = 'gc-on' and 
+  bench1.options = 'gc-off' and 
+  bench.compilation = bench1.compilation and 
+  bench.test = 'auto.ma' 
+group by mark
+***");
+
+$query_csc = urlencode("
+Performances (byte and GC) per mark
+@@@
+select 
+  bench_times.mark as mark,
+  bench_svn.revision,
+  bench_times.time         as time,
+  bench_times.timeuser     as timeuser,
+  bench_times_opt.time     as time_opt,
+  bench_times_opt.timeuser as timeuser_opt,
+  bench_times.tests     as tests,
+  bench_times_opt.tests as tests_opt,
+  bench_fails.count     as fail,
+  bench_fails_opt.count as fail_opt
+from 
+  bench_svn, 
+  (select 
+    b1.mark as mark, SUM(b1.time) as time, 
+    SUM(b1.timeuser) as timeuser,COUNT(DISTINCT b1.test) as tests
+   from bench as b1
+   where 
+     b1.options = 'gc-on' and 
+     b1.compilation = 'opt' 
+     group by b1.mark) as bench_times_opt,
+  (select 
+    b1.mark as mark, SUM(b1.time) as time, 
+    SUM(b1.timeuser) as timeuser,COUNT(DISTINCT b1.test) as tests
+   from bench as b1
+   where 
+     b1.options = 'gc-on' and 
+     b1.compilation = 'byte' 
+     group by b1.mark) as bench_times,
+  (select
+    b1.mark as mark,
+    SUM(if(b1.result='fail' and b1.compilation='byte' and b1.options='gc-on',1,0))
+    as count
+   from bench as b1
+   group by b1.mark) as bench_fails,
+  (select
+    b1.mark as mark,
+    SUM(if(b1.result='fail' and b1.compilation='opt' and b1.options='gc-on',1,0))
+    as count
+   from bench as b1
+   group by b1.mark) as bench_fails_opt
+where 
+  bench_times.mark = bench_fails.mark and 
+  bench_times_opt.mark = bench_fails_opt.mark and 
+  bench_times.mark = bench_times_opt.mark and 
+  bench_svn.mark = bench_times.mark 
+  order by bench_svn.mark desc
+***");
+
+$query_total = urlencode("
+Max N
+@@@
+select 
+  COUNT(DISTINCT test) as MAX 
+from 
+  bench 
+group by mark 
+order by MAX desc 
+LIMIT 0,1;
+###
+Number of compiled tests
+@@@
+select 
+  mark, 
+  COUNT(DISTINCT test) as N 
+from 
+  bench 
+group by mark 
+order by mark desc
+***");
 
 function minus1_to_all($s){
   if ($s == "-1") 
@@ -85,8 +220,7 @@ function links_of($name,$q,$limits){
       <? links_of("Broken tests",$query_fail,$limits) ?>
       <? links_of("Garbage collector killer",$query_gc,$limits) ?>
       <? links_of("Auto performances",$query_auto,$limits) ?>
-      <? links_of("Global performances (bytecode)",$query_csc,$limits) ?>
-      <? links_of("Global performances (nativecode)",$query_csc_opt,$limits) ?>
+      <? links_of("Global performances",$query_csc,$limits) ?>
       <? links_of("Number of compiled tests",$query_total,$limits) ?>
       <? links_of("All table contents",$quey_all,$limits) ?>
       </ul>
@@ -127,7 +261,7 @@ function links_of($name,$q,$limits){
     <td>    
       <select name="test">";
         <option value="--">--</option>";
-          <?query("select distinct test from bench;","array_to_combo");?>
+          <?query("select distinct test from bench order by test;","array_to_combo");?>
       </select>      
     </td>
   </tr>