ignore chanz in rr_graph_area.cpp

Author: soheilshahrouz

vpr/src/route/rr_graph_generation/rr_graph_area.cpp

@@ -33,7 +33,10 @@ static void count_unidir_routing_transistors(std::vector<t_segment_inf>& segment
                                              const float trans_sram_bit,
                                              bool is_flat);
 
-static float get_cblock_trans(int* num_inputs_to_cblock, int wire_to_ipin_switch, int max_inputs_to_cblock, float trans_sram_bit);
+static float get_cblock_trans(vtr::vector<RRNodeId, int>& num_inputs_to_cblock,
+                              int wire_to_ipin_switch,
+                              int max_inputs_to_cblock,
+                              float trans_sram_bit);
 
 static float* alloc_and_load_unsharable_switch_trans(int num_switch,
                                                      float trans_sram_bit,
@@ -108,9 +111,9 @@ void count_bidir_routing_transistors(int num_switch, int wire_to_ipin_switch, fl
     auto& device_ctx = g_vpr_ctx.device();
     const auto& rr_graph = device_ctx.rr_graph;
 
-    int* num_inputs_to_cblock; /* [0..device_ctx.rr_nodes.size()-1], but all entries not    */
+    vtr::vector<RRNodeId, int> num_inputs_to_cblock(rr_graph.num_nodes(), 0); // entries not corresponding to IPINs will be 0
+
 
-    /* corresponding to IPINs will be 0.           */
 
     bool* cblock_counted;                                   /* [0..max(device_ctx.grid.width(),device_ctx.grid.height())] -- 0th element unused. */
     float* shared_buffer_trans;                             /* [0..max(device_ctx.grid.width(),device_ctx.grid.height())] */
@@ -145,16 +148,11 @@ void count_bidir_routing_transistors(int num_switch, int wire_to_ipin_switch, fl
      * wiring C plus the fanout.                                              */
 
     if (INCLUDE_TRACK_BUFFERS) {
-        trans_track_to_cblock_buf = trans_per_buf(R_minW_nmos / 4., R_minW_nmos,
-                                                  R_minW_pmos);
+        trans_track_to_cblock_buf = trans_per_buf(R_minW_nmos / 4., R_minW_nmos, R_minW_pmos);
     } else {
         trans_track_to_cblock_buf = 0;
     }
 
-    num_inputs_to_cblock = new int[rr_graph.num_nodes()];
-    for (size_t cb = 0; cb < rr_graph.num_nodes(); cb++)
-        num_inputs_to_cblock[cb] = 0;
-
     maxlen = std::max(device_ctx.grid.width(), device_ctx.grid.height());
     cblock_counted = new bool[maxlen];
     shared_buffer_trans = new float[maxlen];
@@ -169,7 +167,7 @@ void count_bidir_routing_transistors(int num_switch, int wire_to_ipin_switch, fl
     sharable_switch_trans = alloc_and_load_sharable_switch_trans(num_switch,
                                                                  R_minW_nmos, R_minW_pmos);
 
-    for (const RRNodeId& from_rr_node : device_ctx.rr_graph.nodes()) {
+    for (const RRNodeId from_rr_node : device_ctx.rr_graph.nodes()) {
         size_t from_node = (size_t)from_rr_node;
         from_rr_type = rr_graph.node_type(from_rr_node);
 
@@ -210,9 +208,8 @@ void count_bidir_routing_transistors(int num_switch, int wire_to_ipin_switch, fl
                             break;
 
                         case e_rr_type::IPIN:
-                            num_inputs_to_cblock[size_t(to_node)]++;
-                            max_inputs_to_cblock = std::max(max_inputs_to_cblock,
-                                                            num_inputs_to_cblock[size_t(to_node)]);
+                            num_inputs_to_cblock[to_node]++;
+                            max_inputs_to_cblock = std::max(max_inputs_to_cblock, num_inputs_to_cblock[to_node]);
 
                             iseg = seg_index_of_cblock(rr_graph, from_rr_type, size_t(to_node));
 
@@ -293,8 +290,6 @@ void count_bidir_routing_transistors(int num_switch, int wire_to_ipin_switch, fl
     input_cblock_trans = get_cblock_trans(num_inputs_to_cblock, wire_to_ipin_switch,
                                           max_inputs_to_cblock, trans_sram_bit);
 
-    delete[] num_inputs_to_cblock;
-
     ntrans_sharing += input_cblock_trans;
     ntrans_no_sharing += input_cblock_trans;
 
@@ -317,17 +312,14 @@ void count_unidir_routing_transistors(std::vector<t_segment_inf>& /*segment_inf*
     const auto& rr_graph = device_ctx.rr_graph;
 
     bool* cblock_counted;      /* [0..max(device_ctx.grid.width(),device_ctx.grid.height())] -- 0th element unused. */
-    int* num_inputs_to_cblock; /* [0..device_ctx.rr_nodes.size()-1], but all entries not    */
-
-    /* corresponding to IPINs will be 0.           */
+    vtr::vector<RRNodeId, int> num_inputs_to_cblock(rr_graph.num_nodes(), 0); // entries not corresponding to IPINs will be 0
 
     e_rr_type from_rr_type, to_rr_type;
     int i, j, iseg, iedge, num_edges, maxlen;
     int max_inputs_to_cblock;
     float input_cblock_trans;
 
-    /* August 2014:
-     * In a unidirectional architecture all the fanin to a wire segment comes from
+    /* In a unidirectional architecture all the fanin to a wire segment comes from
      * a single mux. We should count this mux only once as we look at the outgoing
      * switches of all rr nodes. Thus we keep track of which muxes we have already
      * counted via the variable below. */
@@ -361,17 +353,13 @@ void count_unidir_routing_transistors(std::vector<t_segment_inf>& /*segment_inf*
         trans_track_to_cblock_buf = 0;
     }
 
-    num_inputs_to_cblock = new int[rr_graph.num_nodes()];
-    for (size_t c = 0; c < rr_graph.num_nodes(); c++)
-        num_inputs_to_cblock[c] = 0;
-
     maxlen = std::max(device_ctx.grid.width(), device_ctx.grid.height());
     cblock_counted = new bool[maxlen];
     for (auto k = 0; k < maxlen; k++)
         cblock_counted[k] = 0;
 
     ntrans = 0;
-    for (const RRNodeId& from_rr_node : device_ctx.rr_graph.nodes()) {
+    for (const RRNodeId from_rr_node : device_ctx.rr_graph.nodes()) {
         size_t from_node = size_t(from_rr_node);
         from_rr_type = rr_graph.node_type(from_rr_node);
 
@@ -395,7 +383,7 @@ void count_unidir_routing_transistors(std::vector<t_segment_inf>& /*segment_inf*
                         case e_rr_type::CHANY:
                             if (!chan_node_switch_done[size_t(to_node)]) {
                                 int switch_index = rr_graph.edge_switch(RRNodeId(from_node), iedge);
-                                auto switch_type = rr_graph.rr_switch_inf(RRSwitchId(switch_index)).type();
+                                SwitchType switch_type = rr_graph.rr_switch_inf(RRSwitchId(switch_index)).type();
 
                                 int fan_in = rr_graph.node_fan_in(to_node);
 
@@ -411,7 +399,7 @@ void count_unidir_routing_transistors(std::vector<t_segment_inf>& /*segment_inf*
                                      * the rr switches were created from the arch switches */
                                     ntrans += rr_graph.rr_switch_inf(RRSwitchId(switch_index)).buf_size;
                                 } else if (switch_type == SwitchType::SHORT) {
-                                    ntrans += 0.; //Electrical shorts contribute no transisitor area
+                                    ntrans += 0.; //Electrical shorts contribute no transistor area
                                 } else if (switch_type == SwitchType::BUFFER) {
                                     if (fan_in != 1) {
                                         std::string msg = vtr::string_fmt(
@@ -434,9 +422,8 @@ void count_unidir_routing_transistors(std::vector<t_segment_inf>& /*segment_inf*
                             break;
 
                         case e_rr_type::IPIN:
-                            num_inputs_to_cblock[size_t(to_node)]++;
-                            max_inputs_to_cblock = std::max(max_inputs_to_cblock,
-                                                            num_inputs_to_cblock[size_t(to_node)]);
+                            num_inputs_to_cblock[to_node]++;
+                            max_inputs_to_cblock = std::max(max_inputs_to_cblock, num_inputs_to_cblock[to_node]);
                             iseg = seg_index_of_cblock(rr_graph, from_rr_type, size_t(to_node));
 
                             if (cblock_counted[iseg] == false) {
@@ -448,6 +435,10 @@ 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"
@@ -470,9 +461,14 @@ void count_unidir_routing_transistors(std::vector<t_segment_inf>& /*segment_inf*
                         cblock_counted[j] = false;
                 }
                 break;
+
             case e_rr_type::OPIN:
                 break;
 
+            case e_rr_type::CHANZ:
+                // TODO: handle chanz
+                break;
+
             default:
                 break;
 
@@ -485,7 +481,6 @@ void count_unidir_routing_transistors(std::vector<t_segment_inf>& /*segment_inf*
                                           max_inputs_to_cblock, trans_sram_bit);
 
     delete[] cblock_counted;
-    delete[] num_inputs_to_cblock;
 
     ntrans += input_cblock_trans;
 
@@ -494,7 +489,10 @@ void count_unidir_routing_transistors(std::vector<t_segment_inf>& /*segment_inf*
     VTR_LOG("\tTotal routing area: %#g, per logic tile: %#g\n", ntrans, ntrans / (float)(device_ctx.grid.get_num_layers() * device_ctx.grid.width() * device_ctx.grid.height()));
 }
 
-static float get_cblock_trans(int* num_inputs_to_cblock, int wire_to_ipin_switch, int max_inputs_to_cblock, float trans_sram_bit) {
+static float get_cblock_trans(vtr::vector<RRNodeId, int>& num_inputs_to_cblock,
+                              int wire_to_ipin_switch,
+                              int max_inputs_to_cblock,
+                              float trans_sram_bit) {
     /* Computes the transistors in the input connection block multiplexers and   *
      * the buffers from connection block outputs to the logic block input pins.  *
      * For speed, I precompute the number of transistors in the multiplexers of  *
@@ -522,8 +520,8 @@ static float get_cblock_trans(int* num_inputs_to_cblock, int wire_to_ipin_switch
 
     trans_count = 0.;
 
-    for (const RRNodeId& rr_id : device_ctx.rr_graph.nodes()) {
-        num_inputs = num_inputs_to_cblock[(size_t)rr_id];
+    for (const RRNodeId rr_id : device_ctx.rr_graph.nodes()) {
+        num_inputs = num_inputs_to_cblock[rr_id];
         trans_count += trans_per_cblock[num_inputs];
     }