Extend benchmark summary

setup.py

@@ -12,25 +12,30 @@ from setuptools import setup, find_packages
 import opengeode
 
 setup(
-        name='opengeode',
-        version=opengeode.__version__,
-        packages=find_packages(),
-        author='Maxime Perrotin',
-        author_email='maxime.perrotin@esa.int',
-        description='A tiny, free SDL editor for TASTE',
-        long_description=open('README.md').read(),
-        install_requires=['antlr_python_runtime', 'pygraphviz', 'singledispatch'],
-        include_package_data=True,
-        url='http://opengeode.net',
-        classifiers=[
-            'Programming Language :: Python',
-            'License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)',
-            'Operating System :: OS Independent',
-            'Programming Language :: Python :: 2.7'
-            ],
-        entry_points= {
-            'console_scripts': [
-                'opengeode = opengeode.opengeode:opengeode'
-                ]
-            },
-        )
+    name='opengeode',
+    version=opengeode.__version__,
+    packages=find_packages(),
+    author='Maxime Perrotin',
+    author_email='maxime.perrotin@esa.int',
+    description='A tiny, free SDL editor for TASTE',
+    long_description=open('README.md').read(),
+    install_requires=[
+        'antlr_python_runtime',
+        'pygraphviz',
+        'singledispatch',
+    ],
+    tests_require=['tabulate'],
+    include_package_data=True,
+    url='http://opengeode.net',
+    classifiers=[
+        'Programming Language :: Python',
+        'License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python :: 2.7'
+    ],
+    entry_points={
+        'console_scripts': [
+            'opengeode = opengeode.opengeode:opengeode'
+        ]
+    },
+)

tests/regression/benchmark.py

@@ -3,6 +3,8 @@ import subprocess
 import sys
 import time as t
 
+from tabulate import tabulate
+
 
 def main():
     start = t.time()
@@ -37,6 +39,7 @@ def benchmark(testfolder):
             return
 
     result = {
+        "name": testfolder[:-1],
         "size": {
             "ada": os.path.getsize(llvm_bin),
             "llvm": os.path.getsize(ada_bin),
@@ -64,16 +67,28 @@ def summarize(results, errors, elapsed):
         print "No results"
         return 1
 
-    print "Summary:"
-    print "  Size: Ada %.2f%% LLVM %.2f%%" % diff(results, "size")
-    print "  Time: Ada %.2f%% LLVM %.2f%%" % diff(results, "time")
+    print "Summary"
+    print "-------"
+    print ""
+    print "Size: Ada %.2f%% LLVM %.2f%%" % diff([r["size"] for r in results])
+    print "Time: Ada %.2f%% LLVM %.2f%%" % diff([r["time"] for r in results])
+    print ""
+
+    headers = ["Benchmark", "Ada size", "LLVM size", "Ada time", "LLVM time"]
+    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")
 
     return 0 if results and not errors else 1
 
 
-def diff(results, metric):
-    metrics = [r[metric] for r in results]
-    return 100, mean(([float(m["llvm"]) / float(m["ada"]) * 100 for m in metrics]))
+def diff(results):
+    return 100, mean(([float(r["llvm"]) / float(r["ada"]) * 100 for r in results]))
 
 
 def mean(values):