Accurate handling of reveced edges for pass and return.

Author: gsvgit

cfpq_add_context/add_contexts.py

@@ -9,6 +9,7 @@
 from cfpq_matrix.block.block_matrix_space_impl import BlockMatrixSpaceImpl
 from cfpq_model.cnf_grammar_template import Symbol
 from cfpq_model.label_decomposed_graph import LabelDecomposedGraph
+from cfpq_add_context.utils import print_matrix_to_dot
 
 import time
 
@@ -39,8 +40,11 @@ def to_label_decomposed_graph(graph):
 
     assign_r = Matrix(BOOL, graph.ncols, graph.nrows, name = "assign_r_after_intersection")
     assign_r << graph.select(graphblas.select.select_assign_r)
+    assign_r << assign_r + graph.select(graphblas.select.select_pass_and_return).T
     print("Boolean matrix for assign_r nvals: ", assign_r.nvals)
 
+    #print_matrix_to_dot(assign_r,"assign_r.dot")
+
     load_i = Matrix(UINT64, graph.ncols, graph.nrows, name = "load_i_after_intersection")
     load_i << graph.select(graphblas.select.select_load).apply(graphblas.unary.decode_load)
 

cfpq_add_context/gen_automata.py

@@ -8,21 +8,17 @@
 
 def generate (number_of_contexts):
     start = 0
-    nvertices = number_of_contexts * 2 + number_of_contexts * number_of_contexts * 4 + 1
+    nvertices = number_of_contexts + number_of_contexts * number_of_contexts + 1
     final = nvertices
-    first_level = [i for i in range(1, number_of_contexts * 2 + 1)]
+    first_level = [i for i in range(1, number_of_contexts + 1)]
     #print("First level: ", first_level)
-    second_level = [i for i in range(number_of_contexts * 2 + 1, nvertices)]
+    second_level = [i for i in range(number_of_contexts + 1, nvertices)]
     def mk_open_context(i):
-        if (i // number_of_contexts == 0):
             return mk_open_context_from_pass(i % number_of_contexts)
-        else:
-            return mk_open_context_from_ret_r(i % number_of_contexts)
+
     def mk_close_context(i):
-        if (i // number_of_contexts == 0):
             return mk_close_context_from_ret(i % number_of_contexts)
-        else:
-            return mk_close_context_from_pass_r(i % number_of_contexts)
+
     edges = (
              [(start,start,SIGMA_WITHOUT_OPEN_CONTEXTS),(final,final,SIGMA)] + 
              [
@@ -33,8 +29,8 @@ def mk_close_context(i):
              [
                 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(on_second_level % (number_of_contexts * 2))),(on_second_level, on_first_level, mk_close_context(on_second_level % (number_of_contexts * 2))))
+                for on_second_level in range(on_first_level * number_of_contexts + 1, on_first_level * number_of_contexts + number_of_contexts + 1) 
+                for edg in ((on_first_level, on_second_level, mk_open_context(on_second_level % number_of_contexts )),(on_second_level, on_first_level, mk_close_context(on_second_level % number_of_contexts )))
              ] +
              [(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/labels.py

@@ -81,6 +81,9 @@ 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_pass_and_return_op(x,i,j,k):
+    return (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)
+
 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 
@@ -97,6 +100,7 @@ def select_not_reversed_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_pass_and_return", select_pass_and_return_op)
 SelectOp.register_new("select_not_reversed", select_not_reversed_op)
 
 def decode_load_op(x):