MOre fixes.

Author: gsvgit

cfpq_add_context/gen_automata.py

@@ -11,9 +11,9 @@ def generate (number_of_contexts):
     nvertices = number_of_contexts * 2 + number_of_contexts * number_of_contexts * 4 + 1
     final = nvertices
     first_level = [i for i in range(1, number_of_contexts * 2 + 1)]
+    #print("First level: ", first_level)
     second_level = [i for i in range(number_of_contexts * 2 + 1, nvertices)]
     def mk_open_context(i):
-        i = i - 1
         if (i // number_of_contexts == 0):
             return mk_open_context_from_pass(i % number_of_contexts)
         else:
@@ -28,13 +28,13 @@ def mk_close_context(i):
              [
                 edg 
                 for on_first_level in first_level 
-                for edg in ((start, on_first_level, mk_open_context(on_first_level)),(on_first_level, start, mk_close_context(on_first_level)))
+                for edg in ((start, on_first_level, mk_open_context(on_first_level - 1)),(on_first_level, start, mk_close_context(on_first_level - 1)))
              ] + 
              [
                 edg 
                 for on_first_level in first_level 
                 for on_second_level in range(on_first_level * (number_of_contexts * 2) + 1, on_first_level * number_of_contexts * 2 + number_of_contexts * 2 + 1) 
-                for edg in ((on_first_level, on_second_level, mk_open_context(1 + on_second_level % (number_of_contexts * 2))),(on_second_level, on_first_level, mk_close_context(1 + on_second_level % (number_of_contexts * 2))))
+                for edg in ((on_first_level, on_second_level, mk_open_context(on_second_level % (number_of_contexts * 2))),(on_second_level, on_first_level, mk_close_context(on_second_level % (number_of_contexts * 2))))
              ] +
              [(i,i,SIGMA_WITHOUT_CONTEXTS) for i in first_level + second_level] +
              [(i,final,ALL_OPEN_CONTEXTS) for i in second_level]

cfpq_add_context/intersection.py

@@ -65,8 +65,16 @@ def intersection (graph, automata) :
 
 
     #print_matrix_to_dot(intersection, "kron.dot")
+
+    entrypoints = Vector(bool,graph.nrows, name="entrypoints")
+    entrypoints << graph.select(graphblas.select.select_not_reversed).reduce_columnwise(graphblas.monoid.lor)
+    entrypoints = set(range(0,graph.nrows)).difference(entrypoints.to_coo(values=False)[0])
+
+    print("entypoints:", entrypoints)
+    
+    #sources = [i * automata.nrows for i in range(0,graph.nrows)]
+    sources = [i * automata.nrows for i in entrypoints]
 
-    sources = [i * automata.nrows for i in range(0,graph.nrows)]
 
     reachable_vertices_mask = bfs(intersection, sources).diag(name="reachable_vertices_mask")
 

cfpq_add_context/labels.py

@@ -81,6 +81,14 @@ def select_store_op(x,i,j,k):
 def select_store_r_op(x,i,j,k):
     return x & SIGMA_WITHOUT_CONTEXTS >= OFFSET and ((x & SIGMA_WITHOUT_CONTEXTS) - OFFSET) % 4 == 3
 
+def select_not_reversed_op(x,i,j,k):
+    return ( (x & SIGMA_WITHOUT_CONTEXTS == ALLOC) or 
+             (x & SIGMA_WITHOUT_CONTEXTS == ASSIGN or (x & ALL_OPEN_CONTEXTS > 0 and ((x & ALL_OPEN_CONTEXTS) >> 43) % 2 == 1) or (x & ALL_CLOSE_CONTEXTS > 0 and ((x & ALL_CLOSE_CONTEXTS) >> 22) % 2 == 1)) or 
+             (x & SIGMA_WITHOUT_CONTEXTS >= OFFSET and ((x & SIGMA_WITHOUT_CONTEXTS) - OFFSET) % 4 == 0) or 
+             (x & SIGMA_WITHOUT_CONTEXTS >= OFFSET and ((x & SIGMA_WITHOUT_CONTEXTS) - OFFSET) % 4 == 2)
+    )
+
+
 SelectOp.register_new("select_alloc", select_alloc_op)
 SelectOp.register_new("select_alloc_r", select_alloc_r_op)
 SelectOp.register_new("select_assign", select_assign_op)
@@ -89,6 +97,7 @@ def select_store_r_op(x,i,j,k):
 SelectOp.register_new("select_store", select_store_op)
 SelectOp.register_new("select_load_r", select_load_r_op)
 SelectOp.register_new("select_store_r", select_store_r_op)
+SelectOp.register_new("select_not_reversed", select_not_reversed_op)
 
 def decode_load_op(x):
     return ((x & SIGMA_WITHOUT_CONTEXTS) - OFFSET) // 4

cfpq_add_context/load_graph.py

@@ -41,7 +41,7 @@ def get_edge_lbl(data_arr):
 
             number_of_contexts = max(number_of_contexts, _context)
             return res
-        else:
+        elif "close" in data_arr[2]:
             if "_r_" in data_arr[2]:
                 _context = int(data_arr[2].split('_')[2])
                 res = labels.mk_close_context_from_pass_r(_context)
@@ -51,6 +51,7 @@ def get_edge_lbl(data_arr):
 
             number_of_contexts = max(number_of_contexts, _context)
             return res
+        else: print("ERROR:", data_arr[2])
 
     def handle_line(line):
         nonlocal nvertices