2 files changed, 12 insertions, 37 deletions

diff --git a/baseline/summarize.py b/baseline/summarize.py
deleted file mode 100755
index 82f82d9..0000000
--- a/baseline/summarize.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/python3
-import sys
-
-f = sys.argv[1]
-res = {}
-mem_res = {}
-memw_res = {}
-samples = {}
-
-with open(f) as fp:
-    for line in fp:
-        s = line.split()
-        if s[0] not in res:
-            print(s[0])
-            res[s[0]] = int(s[5])
-            mem_res[s[0]] = int(s[8])
-            memw_res[s[0]] = int(s[9])
-            samples[s[0]] =int(s[4])
-        else:
-            res[s[0]] += int(s[5])
-            mem_res[s[0]] += int(s[8])
-            memw_res[s[0]] += int(s[9])
-
-print("Average times:")
-for r in res.keys():
-    print(res[r]/samples[r])
-
-print("Average memory read:")
-for r in mem_res.keys():
-    print(mem_res[r]/samples[r])
-
-print("Average memory write:")
-for r in memw_res.keys():
-    print(memw_res[r]/samples[r])
diff --git a/dis/summarize.py b/summarize.py
index 31dcccc..2183c41 100755
--- a/dis/summarize.py
+++ b/summarize.py
@@ -50,19 +50,28 @@ def percentile(N, percent, key=lambda x:x):
     d1 = key(N[int(c)]) * (k-f)
     return d0+d1
 ## end of http://code.activestate.com/recipes/511478/ }}}
+def memstring(memr, memw, samples):
+    if memr or memw:
+        return "\t{:>12.f}\t{:>12.f}".format(memr/samples, memw/samples)
+    else:
+        return ""
 avg_max = 0
 avg_99th = 0
 avg_avg = 0
-print("Name\t\tAverage\t\tMax\t\t99th %\t\tAvg Mem Read\tAvg Mem Write\t")
+# Only include memory info in the header if relevant
+if mem_res[s[0]] == 0:
+    print("Name\t\tAverage\t\tMax\t\t99th %")
+else:
+    print("Name\t\tAverage\t\tMax\t\t99th %\t\tAvg Mem Read\tAvg Mem Write\t")
 for r in sorted(res.keys()):
 #    print(r + "\t\t" + str(res[r]/samples[r]) + "\t\t" + str(max_res[r]))
     avg_avg += sum(res[r])/len(res[r])
     avg_max += max(res[r])
     avg_99th += percentile(sorted(res[r]), 0.99)
     if len(sys.argv) > 2 and sys.argv[2] == "--inf-precision":
-        print("{:12}\t{:>12.0f}\t{:>12.0f}\t{:>12.0f}\t{:>12.0f}\t{:>12.0f}".format(r, sum(res[r])/len(res[r]), max(res[r]), percentile(sorted(res[r]), 0.99), mem_res[r]/samples[r], memw_res[r]/samples[r]))
+        print("{:12}\t{:>12.0f}\t{:>12.0f}\t{:>12.0f}".format(r, sum(res[r])/len(res[r]), max(res[r]), percentile(sorted(res[r]), 0.99)) + memstring(mem_res[r], memw_res[r], samples[r]))
     else:
-        print("{:12.12}\t{:>12.0f}\t{:>12.0f}\t{:>12.0f}\t{:>12.0f}\t{:>12.0f}".format(r, sum(res[r])/len(res[r]), max(res[r]), percentile(sorted(res[r]), 0.99), mem_res[r]/samples[r], memw_res[r]/samples[r]))
+        print("{:12.12}\t{:>12.0f}\t{:>12.0f}\t{:>12.0f}".format(r, sum(res[r])/len(res[r]), max(res[r]), percentile(sorted(res[r]), 0.99)) + memstring(mem_res[r], memw_res[r], samples[r]))
 
 print("Average average:", avg_avg/len(res.keys()))
 print("Average max:", avg_max/len(res.keys()))