Mapping to cgra

sam/onyx/hw_nodes/compute_node.py

@@ -115,7 +115,7 @@ def connect(self, other, edge, kwargs=None):
 
             new_conns = {
                 f'pe_to_crddrop_res_to_{conn}': [
-                    ([(pe, "res"), (crddrop, f"cmrg_coord_in_{conn}")], 17),
+                    ([(pe, "res"), (crddrop, f"coord_in_{conn}")], 17),
                 ]
             }
             return new_conns

sam/onyx/hw_nodes/intersect_node.py

@@ -150,7 +150,7 @@ def connect(self, other, edge, kwargs=None):
             new_conns = {
                 f'isect_to_merger_{conn}': [
                     # Send isect row and isect col to merger inside isect_col
-                    ([(isect, "coord_out"), (merge, f"cmrg_coord_in_{conn}")], 17),
+                    ([(isect, "coord_out"), (merge, f"coord_in_{conn}")], 17),
                 ]
             }
 

sam/onyx/hw_nodes/merge_node.py

@@ -56,7 +56,7 @@ def connect(self, other, edge, kwargs=None):
             print(conn)
             new_conns = {
                 f'merge_{conn}_to_wr_scan': [
-                    ([(merge, f"cmrg_coord_out_{conn}"), (wr_scan, f"data_in")], 17),
+                    ([(merge, f"coord_out_{conn}"), (wr_scan, f"data_in")], 17),
                 ]
             }
 
@@ -66,7 +66,7 @@ def connect(self, other, edge, kwargs=None):
             print("MERGE TO UNION FOR VECTOR REDUCE")
             new_conns = {
                 f'merge_to_union_inner': [
-                    ([(merge, f"cmrg_coord_out_{0}"), (isect, f"coord_in_{0}")], 17),
+                    ([(merge, f"coord_out_{0}"), (isect, f"coord_in_{0}")], 17),
                 ]
             }
 
@@ -77,7 +77,7 @@ def connect(self, other, edge, kwargs=None):
             other_red = other.get_name()
             new_conns = {
                 f'merge_to_reduce_inner': [
-                    ([(merge, f"cmrg_coord_out_{0}"), (other_red, f"reduce_data_in")], 17),
+                    ([(merge, f"coord_out_{0}"), (other_red, f"reduce_data_in")], 17),
                 ]
             }
 
@@ -103,7 +103,7 @@ def connect(self, other, edge, kwargs=None):
 
             new_conns = {
                 f'merger_to_merger_{out_conn}_to_{in_conn}': [
-                    ([(merge, f"cmrg_coord_out_{out_conn}"), (other_merge, f"cmrg_coord_in_{in_conn}")], 17),
+                    ([(merge, f"coord_out_{out_conn}"), (other_merge, f"coord_in_{in_conn}")], 17),
                 ]
             }
 

sam/onyx/hw_nodes/read_scanner_node.py

@@ -177,7 +177,7 @@ def connect(self, other, edge, kwargs=None):
 
             new_conns = {
                 f'rd_scan_to_crddrop_{conn}': [
-                    ([(rd_scan, out_conn), (crddrop, f"cmrg_coord_in_{conn}")], 17),
+                    ([(rd_scan, out_conn), (crddrop, f"coord_in_{conn}")], 17),
                 ]
             }