CHANZ is treated similar to CHANX/CHANY in area estimation

Author: soheilshahrouz

vpr/src/route/check_route.cpp

@@ -425,23 +425,17 @@ static bool check_adjacent(RRNodeId from_node, RRNodeId to_node, bool is_flat) {
                 from_xhigh = rr_graph.node_xhigh(from_node);
                 to_xhigh = rr_graph.node_xhigh(to_node);
                 if (from_ylow == to_ylow) {
-                    /* UDSD Modification by WMF Begin */
                     /*For Fs > 3, can connect to overlapping wire segment */
                     if (to_xhigh == from_xlow - 1 || from_xhigh == to_xlow - 1) {
                         num_adj++;
-                    }
-                    /* Overlapping */
-                    else {
-                        int i;
-
-                        for (i = from_xlow; i <= from_xhigh; i++) {
+                    } else { // Overlapping
+                        for (int i = from_xlow; i <= from_xhigh; i++) {
                             if (i >= to_xlow && i <= to_xhigh) {
                                 num_adj++;
                                 break;
                             }
                         }
                     }
-                    /* UDSD Modification by WMF End */
                 }
             } else if (to_type == e_rr_type::CHANY) {
                 num_adj += rr_graph.nodes_are_adjacent(from_node, to_node);
@@ -460,22 +454,16 @@ static bool check_adjacent(RRNodeId from_node, RRNodeId to_node, bool is_flat) {
                 from_yhigh = rr_graph.node_yhigh(from_node);
                 to_yhigh = rr_graph.node_yhigh(to_node);
                 if (from_xlow == to_xlow) {
-                    /* UDSD Modification by WMF Begin */
                     if (to_yhigh == from_ylow - 1 || from_yhigh == to_ylow - 1) {
                         num_adj++;
-                    }
-                    /* Overlapping */
-                    else {
-                        int j;
-
-                        for (j = from_ylow; j <= from_yhigh; j++) {
+                    } else { // Overlapping
+                        for (int j = from_ylow; j <= from_yhigh; j++) {
                             if (j >= to_ylow && j <= to_yhigh) {
                                 num_adj++;
                                 break;
                             }
                         }
                     }
-                    /* UDSD Modification by WMF End */
                 }
             } else if (to_type == e_rr_type::CHANX) {
                 num_adj += rr_graph.nodes_are_adjacent(to_node, from_node);
@@ -495,9 +483,6 @@ static bool check_adjacent(RRNodeId from_node, RRNodeId to_node, bool is_flat) {
                     num_adj++;
                 }
             } else {
-                std::cout << describe_rr_node(device_ctx.rr_graph, device_ctx.grid, device_ctx.rr_indexed_data, from_node, is_flat) << std::endl;
-                std::cout << describe_rr_node(device_ctx.rr_graph, device_ctx.grid, device_ctx.rr_indexed_data, to_node, is_flat) << std::endl;
-
                 VPR_FATAL_ERROR(VPR_ERROR_ROUTE,
                                 "in check_adjacent: %d and %d are not adjacent", from_node, to_node);
             }

vpr/src/route/rr_graph_generation/rr_graph_area.cpp

@@ -364,21 +364,23 @@ void count_unidir_routing_transistors(std::vector<t_segment_inf>& /*segment_inf*
         switch (from_rr_type) {
             case e_rr_type::CHANX:
             case e_rr_type::CHANY:
+            case e_rr_type::CHANZ:
                 num_edges = rr_graph.num_edges(RRNodeId(from_node));
 
-                /* Increment number of inputs per cblock if IPIN */
+                // Increment number of inputs per cblock if IPIN
                 for (iedge = 0; iedge < num_edges; iedge++) {
                     RRNodeId to_node = rr_graph.edge_sink_node(RRNodeId(from_node), iedge);
                     to_rr_type = rr_graph.node_type(to_node);
 
-                    /* Ignore any uninitialized rr_graph nodes */
+                    // Ignore any uninitialized rr_graph nodes
                     if (!rr_graph.node_is_initialized(to_node)) {
                         continue;
                     }
 
                     switch (to_rr_type) {
                         case e_rr_type::CHANX:
                         case e_rr_type::CHANY:
+                        case e_rr_type::CHANZ:
                             if (!chan_node_switch_done[size_t(to_node)]) {
                                 int switch_index = rr_graph.edge_switch(RRNodeId(from_node), iedge);
                                 SwitchType switch_type = rr_graph.rr_switch_inf(RRSwitchId(switch_index)).type();
@@ -433,10 +435,6 @@ void count_unidir_routing_transistors(std::vector<t_segment_inf>& /*segment_inf*
                         case e_rr_type::SINK:
                             break; //ignore virtual sinks
 
-                        case e_rr_type::CHANZ:
-                            // TODO: handle chanz
-                            break;
-
                         default:
                             VPR_ERROR(VPR_ERROR_ROUTE,
                                       "in count_routing_transistors:\n"
@@ -463,10 +461,6 @@ void count_unidir_routing_transistors(std::vector<t_segment_inf>& /*segment_inf*
             case e_rr_type::OPIN:
                 break;
 
-            case e_rr_type::CHANZ:
-                // TODO: handle chanz
-                break;
-
             default:
                 break;