Starting benchmarks test enhancement

tests/benchmark.py

@@ -5,6 +5,9 @@ import random
 import time
 import warnings
 
+def usage():
+    print("Usage : %s [expr_count [max_iter [argc [sz]]]]" %sys.argv[0],
+          file=sys.stderr)
 
 try:
     import pyrpn
@@ -13,14 +16,31 @@ except (ImportError, NameError) as e:
           file=sys.stderr)
     raise e
 
+if len(sys.argv) > 5:
+    usage()
+    exit(1)
+
 #expr_count = 0x200
 #max_iter = 0x3000
 #argc = 2
 #sz = 0x20
-expr_count = 5000
+expr_count = 0x200
 max_iter = 0x5000
-argc = 2
-sz = 0x30
+#argc = 2
+#sz = 0x30
+argc = 5
+sz = 0x50
+
+try:
+    expr_count = int(sys.argv[1], base=0)
+    max_iter = int(sys.argv[2], base=0)
+    argc = int(sys.argv[3], base=0)
+    sz = int(sys.argv[4], base=0)
+except IndexError:
+    pass
+except Exception:
+    usage()
+    exit(2)
 
 try:
     from tqdm import tqdm
@@ -48,9 +68,9 @@ start = time.time()
 IMAX = (1<<63)-1
 samples = 8
 
-print("Running %dK iter on %d expressions with %d op" % (max_iter//1000,
+print("Running %dK iter on %d expressions with %d op and %d args" % (max_iter//1000,
                                                          expr_count,
-                                                         sz))
+                                                         sz, argc))
 
 rnd_samples = [[[random.randint(0, IMAX) for _ in range(argc)] for _ in range(max_iter)]
                for _ in range(samples)]
@@ -58,6 +78,7 @@ for i in tqr(expr_count):
     rnd_expr = pyrpn.random_expr(argc, sz)
     all_start = time.time()
     expr = pyrpn.RPNExpr(rnd_expr, argc)
+    expr.eval(*[0 for _ in range(argc)])
     start_op = time.time()
     rnds = random.choice(rnd_samples)
     for rnd in rnds:
@@ -72,7 +93,10 @@ if write:
 total = time.time() - start
 print("Runned %dK iter on %d expressions in %.2fs" % (max_iter//1000,
                                                      expr_count, total))
-msg = "%.1fK iter/s %.1fms per expr (%dK iter, %d op per expr)"
-msg %= (max_iter*expr_count/time_op/1000, tot/expr_count*1000,
+ops = max_iter*expr_count*sz/time_op/(1000*1000)
+msg = "%5.1fM op/s %6.1fK iter/s %.1fms per expr (%dK iter, %d op per expr)"
+msg %= (ops,
+        max_iter*expr_count/time_op/1000,
+        tot/expr_count*1000,
         max_iter//1000, sz)
 print(msg)