X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fscripts%2Fpublic_html%2Fbench.php;h=0ad31b26913ec3d43eb8e70a9f73d9e887a39846;hb=b6fb91511331ffb709bbd66928054b3331fc006e;hp=2ee5408257b42e1fb11aa1ac20505deac8a0e501;hpb=55b82bd235d82ff7f0a40d980effe1efde1f5073;p=helm.git

diff --git a/helm/software/matita/scripts/public_html/bench.php b/helm/software/matita/scripts/public_html/bench.php
index 2ee540825..0ad31b269 100644
--- a/helm/software/matita/scripts/public_html/bench.php
+++ b/helm/software/matita/scripts/public_html/bench.php
@@ -17,27 +17,27 @@ $query_fail = urlencode(
 );
 $query_gc = urlencode(
   "GC usage @@@" .
-  "select bench.mark, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.time)) - SUM(TIME_TO_SEC(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***"
+  "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, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.time)) - SUM(TIME_TO_SEC(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***"
+  "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, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.time)) - SUM(TIME_TO_SEC(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***"
+  "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, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.time))) as time from bench where test='auto.ma' and options = 'gc-on' group by mark order by mark desc***"
+  "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, SEC_TO_TIME(SUM(TIME_TO_SEC(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, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.time)) - SUM(TIME_TO_SEC(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"
+  "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.mark ,bench_svn.revision as revision, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.time))) as sum_time, SEC_TO_TIME(SUM(TIME_TO_SEC(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_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, COUNT(DISTINCT bench.test) as performed_tests 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_csc_opt = urlencode("Performances (opt and GC) per mark@@@select bench.mark,bench_svn.revision as revision, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.time))) as sum_time, SEC_TO_TIME(SUM(TIME_TO_SEC(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_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, COUNT(DISTINCT bench.test) as performed_tests 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_total = urlencode(
@@ -91,51 +91,71 @@ function links_of($name,$q,$limits){
       <? links_of("All table contents",$quey_all,$limits) ?>
       </ul>
     </p>
-    <h2>Custom Query</h2>
+    <h2>Custom Query - Simple Interface</h2>
     <form action="composequery.php" method="get">
     <table>
   <tr>
     <td>Marks:</td>
     <td> 
-      <? array_to_combo("mark",
-            query("select distinct mark from bench order by mark desc;")); ?>
+      <select name="mark">";
+        <option value="--">--</option>";
+        <?query("select distinct mark from bench order by mark desc;",
+            "array_to_combo");?>
+      </select>      
     </td>
   </tr>
   <tr>
     <td>Compilations:</td>
     <td> 
-      <? array_to_combo("compilation",
-           query("select distinct compilation from bench;")); ?>
+      <select name="compilation">";
+        <option value="--">--</option>";
+          <?query("select distinct compilation from bench;","array_to_combo");?>
+      </select>      
     </td>
   </tr>
   <tr>
     <td>Options:</td>
     <td>  
-      <?array_to_combo("options",query("select distinct options from bench;"));?>
+      <select name="options">";
+        <option value="--">--</option>";
+          <?query("select distinct options from bench;","array_to_combo");?>
+      </select>      
     </td>
   </tr>
   <tr>
     <td>Tests:</td>
     <td>    
-      <? array_to_combo("test",query("select distinct test from bench;")); ?>
+      <select name="test">";
+        <option value="--">--</option>";
+          <?query("select distinct test from bench;","array_to_combo");?>
+      </select>      
     </td>
   </tr>
   <tr>
     <td>Test results:</td>
     <td>
-      <? array_to_combo("result",query("select distinct result from bench;")); ?>
+      <select name="result">";
+        <option value="--">--</option>";
+          <?query("select distinct result from bench;","array_to_combo"); ?>
+      </select>      
     </td>
   </tr>
   <tr>
     <td>Group By: </td>
     <td>
-      <? array_to_combo("groupby",array(array("mark","options"))); ?>
+      <select name="groupby">";
+        <option value="--">--</option>";
+        <? array_to_combo(array("mark"));array_to_combo(array("options")); ?>
+      </select>      
     </td>
   </tr>
   <tr>
     <td>Limit: </td>
     <td>
-      <? array_to_combo("limit",array($limits)); ?>
+      <select name="limit">";
+        <option value="--">--</option>";
+      <? foreach(array($limits) as $l) {array_to_combo($l);} ?>
+      </select>      
     </td>
   </tr>
   <tr>
@@ -143,5 +163,35 @@ function links_of($name,$q,$limits){
   </tr>
  </table>
 </form>
+<h2>Custom Query - raw SQL</h2>
+<form action="showquery.php" method="get">
+<table>
+<tr><td>'bench' table description:</td></tr>
+</tr>
+<? query("describe bench","printer"); ?>
+</tr>
+<tr><td></td></tr>
+<tr><td colspan="7">
+SQL (only one query, ';' if present must terminate the query, no characters allowed after it):</td></tr>
+<tr><td colspan="7">
+<textarea rows="10" cols="120" name="query"/>
+select 
+  b1.test as test, b1.timeuser as oldtime, b2.timeuser as newtime, b1.compilation as comp, b1.options as opts
+from 
+  bench as b1, bench as b2 
+where 
+  b1.test = b2.test and 
+  b1.options = b2.options and
+  b1.compilation = b2.compilation and 
+  b1.mark = '' and b2.mark= '' and
+  ABS(b1.timeuser - b2.timeuser) &gt; 100;</textarea>
+</td>
+</tr>
+<tr><td>
+<input type="submit" value="Submit" class="button" /></td>
+</tr>
+</table>
+</form>
+
 </body>
 </html>