update table

destructive_gen_data.py

@@ -251,7 +251,7 @@ stats = [ {
     "name": "#2",
     "progs": [ {
         "name": "Thread-safe allocator",
-        "abs": "wand, padded, spinlock",
+        "abs": "wand, padded, lock",
         "stats": compute_annots(["tutorial/t04_alloc.c", "tutorial/alloc.h", "tutorial/alloc_internal.h"], global_rules)
     }, {
         "name": "Page allocator",
@@ -261,11 +261,11 @@ stats = [ {
 }, {
     "name": "#3",
     "progs": [ {
-        "name": "Binary search tree (layered)",
+        "name": "Bin. search tree (layered)",
         "abs": "wand, alloc",
         "stats": compute_annots(["tutorial/t08_tree.c", "tutorial/proofs/t08_tree/t08_tree_extra.v"], global_rules)
     }, {
-        "name": "Binary search tree (direct)",
+        "name": "Bin. search tree (direct)",
         "abs": "wand, alloc",
         "stats": compute_annots(["tutorial/t11_tree_set.c"], global_rules)
     } ]
@@ -279,8 +279,8 @@ stats = [ {
 }, {
     "name": "#5",
     "progs": [ {
-        "name": "Hafnium's mpool allocator",
-        "abs": "wand, padded, spinlock",
+        "name": "Hafnium mpool allocator",
+        "abs": "wand, padded, lock",
         "stats": compute_annots(["examples/mpool.c"], global_rules)
     } ]
 }, {
@@ -314,6 +314,8 @@ for cat in stats:
 
         if prog["name"] == "Spinlock":
             prog["stats"]["annot"] += 6
+            # subtract one since there is one manual evar instantiation
+            prog["stats"]["exists"] -= 1
         prog["stats"]["overhead"] = round((prog["stats"]["annot"] + prog['stats']['annot_loop'] + prog['stats']['annot_type'] + prog['stats']['rule'] + prog["stats"]["pure"]) / prog["stats"]["LoC"], 1)
 
 for cat in stats: