Merge pull request #24 from dbrabera/extended_benchmark_summary

Extended benchmark summary

README

@@ -55,8 +55,8 @@ You need to install the following dependencies before you can run Opengeode:
 - gnat - if you want to build the code you generate in Ada
   $ sudo apt-get install gnat
 
-- llvmpy (tested with 0.12.4)
-  Follow the instructions here: http://www.llvmpy.org/llvmpy-doc/0.12.4/doc/getting_started.html#installation
+- llvmpy and LLVM (tested with llvmpy 0.12.4 and LLVM 3.3)
+  Follow the instructions here: http://www.llvmpy.org/llvmpy-doc/0.12.7/doc/getting_started.html#installation
 
 
 To make a static binary on Linux with pyinstaller 2.0:

README.md

@@ -53,7 +53,8 @@ Apart from pygraphviz, all of them exist for Linux, Windows, FreeBSD, and most l
 - ASN1SCC
 - (optional) GNAT to build the generated Ada code
 - mono
-- llvmpy for the LLVM backend (tested with 0.12.4)
+- llvmpy (tested with 0.12.7)
+- LLVM (tested with 3.3)
 
 On Debian, Ubuntu, and probably other distributions:
 
@@ -79,7 +80,7 @@ Check that it works:
 $ asn1.exe
 ```
 
-To install llvmpy follow the instructions [here](http://www.llvmpy.org/llvmpy-doc/0.12.4/doc/getting_started.html#installation)
+To install llvmpy and LLVM follow the instructions [here](http://www.llvmpy.org/llvmpy-doc/0.12.7/doc/getting_started.html#installation)
 
 OpenGEODE installation
 ----------------------

tests/regression/benchmark.py

@@ -74,15 +74,18 @@ def summarize(results, errors, elapsed):
     print "Time: Ada %.2f%% LLVM %.2f%%" % diff([r["time"] for r in results])
     print ""
 
-    headers = ["Benchmark", "Ada size", "LLVM size", "Ada time", "LLVM time"]
+    headers = ["Benchmark", "Ada size (B)", "LLVM size (B)", "Ada time (us)", "LLVM time (us)"]
     table = []
     for result in results:
-        row = [result["name"]]
-        row.extend(diff([result["size"]]))
-        row.extend(diff([result["time"]]))
-        table.append(row)
-
-    print tabulate(table, headers, tablefmt="orgtbl", floatfmt=".2f")
+        table.append([
+            result["name"],
+            result["size"]["ada"],
+            result["size"]["llvm"],
+            int(round(result["time"]["ada"] * (10 ** 6))),
+            int(round(result["time"]["llvm"] * (10 ** 6))),
+        ])
+
+    print tabulate(table, headers, tablefmt="orgtbl")
 
     return 0 if results and not errors else 1