updates + ttest

varats/varats/data/reports/phasar_iter_ide.py

@@ -43,16 +43,58 @@ class PhasarBCStats():
 
     def __init__(self, path: Path) -> None:
         self._num_instructions = -1
+        self._num_functions = -1
+        self._num_addr_functions = -1
+        self._num_globals = -1
+        self._num_calls = -1
+        self._num_ind_calls = -1
+        self._num_basic_blocks = -1
 
         with open(path, "r", encoding="utf-8") as stats_file:
             for line in stats_file.readlines():
-                if line.startswith("> LLVM IR instructions"):
+                if line.startswith("LLVM IR instructions:"):
                     self._num_instructions = int(line.split(":")[1])
+                elif line.startswith("Functions:"):
+                    self._num_functions = int(line.split(':')[1])
+                elif line.startswith("Address-Taken Functions:"):
+                    self._num_addr_functions = int(line.split(':')[1])
+                elif line.startswith("Globals:"):
+                    self._num_globals = int(line.split(':')[1])
+                elif line.startswith("Call Sites:"):
+                    self._num_calls = int(line.split(':')[1])
+                elif line.startswith("Indirect Call Sites:"):
+                    self._num_ind_calls = int(line.split(':')[1])
+                elif line.startswith("Basic Blocks:"):
+                    self._num_basic_blocks = int(line.split(':')[1])
 
     @property
     def num_instructions(self) -> int:
         return self._num_instructions
 
+    @property
+    def num_functions(self) -> int:
+        return self._num_functions
+
+    @property
+    def num_address_taken_functions(self) -> int:
+        return self._num_addr_functions
+
+    @property
+    def num_globals(self) -> int:
+        return self._num_globals
+
+    @property
+    def num_calls(self) -> int:
+        return self._num_calls
+
+    @property
+    def num_indirect_calls(self) -> int:
+        return self._num_ind_calls
+
+    @property
+    def num_basic_blocks(self) -> int:
+        return self._num_basic_blocks
+
 
 class PhasarIterIDESolverStats():
 
@@ -959,33 +1001,37 @@ def get_state(report: TimeReportAggregate) -> str:
                 return "server"
             return "dev"
 
-        if self.old_taint is not None and self.new_taint_nested is not None:
+        def append_relation(
+            name: str, old_report: TimeReportAggregate,
+            new_report: TimeReportAggregate
+        ):
+            nonlocal ret
+            nonlocal cs
+
+            new_val = get_state(new_report)
+            old_val = get_state(old_report)
+            if old_val != "oom" and old_val != "timeout" and (
+                new_val == "oom" or new_val == "timeout"
+            ):
+                print(
+                    f"WARNING: Transition from {old_val} to {new_val} for {name} at {cs}"
+                )
             ret.append({
-                "Analysis": "Taint",
-                "Old": get_state(self.old_taint),
-                "New": get_state(self.new_taint_nested),
+                "Analysis": name,
+                "Old": new_val,
+                "New": old_val,
                 "Target": cs,
             })
+
+        if self.old_taint is not None and self.new_taint_nested is not None:
+            append_relation("Taint", self.old_taint, self.new_taint_nested)
         if self.old_typestate is not None and self.new_typestate_nested is not None:
-            ret.append({
-                "Analysis": "Typestate",
-                "Old": get_state(self.old_typestate),
-                "New": get_state(self.new_typestate_nested),
-                "Target": cs,
-            })
+            append_relation(
+                "Typestate", self.old_typestate, self.new_typestate_nested
+            )
         if self.old_lca is not None and self.new_lca_nested is not None:
-            ret.append({
-                "Analysis": "LCA",
-                "Old": get_state(self.old_lca),
-                "New": get_state(self.new_lca_nested),
-                "Target": cs,
-            })
+            append_relation("LCA", self.old_lca, self.new_lca_nested)
         if self.old_iia is not None and self.new_iia_nested is not None:
-            ret.append({
-                "Analysis": "IIA",
-                "Target": cs,
-                "Old": get_state(self.old_iia),
-                "New": get_state(self.new_iia_nested),
-            })
+            append_relation("IIA", self.old_iia, self.new_iia_nested)
 
         return ret