[vpr][route][crr] pass rr_node_driver_switches and use it in build_crr_gsb_track_to_track_edges

Author: amin1377

vpr/src/route/rr_graph_generation/tileable_rr_graph/crr_generator/crr_edge_builder.cpp

@@ -53,14 +53,21 @@ static RRSwitchId find_or_create_crr_switch_id(const int delay_ps) {
 }
 
 void build_crr_gsb_track_to_track_edges(RRGraphBuilder& rr_graph_builder,
+                                        const vtr::vector<RRNodeId, RRSwitchId>& rr_node_driver_switches,
                                         const RRGSB& rr_gsb,
                                         const crrgenerator::CRRConnectionBuilder& connection_builder) {
     size_t gsb_x = rr_gsb.get_sb_x();
     size_t gsb_y = rr_gsb.get_sb_y();
 
     std::vector<crrgenerator::Connection> gsb_connections = connection_builder.get_tile_connections(gsb_x, gsb_y);
     for (const auto& connection : gsb_connections) {
-        RRSwitchId rr_switch_id = find_or_create_crr_switch_id(connection.delay_ps());
+        RRSwitchId rr_switch_id;
+        int delay_ps = connection.delay_ps();
+        if (delay_ps == -1) {
+            rr_switch_id = rr_node_driver_switches[connection.sink_node()];
+        } else {
+            rr_switch_id = find_or_create_crr_switch_id(delay_ps, segment_inf_x, segment_inf_y);
+        }
         VTR_ASSERT(rr_switch_id != RRSwitchId::INVALID());
         rr_graph_builder.create_edge_in_cache(connection.src_node(), connection.sink_node(), rr_switch_id, false, connection.sw_template_id());
     }

vpr/src/route/rr_graph_generation/tileable_rr_graph/crr_generator/crr_edge_builder.h

@@ -17,5 +17,6 @@
 #include "crr_connection_builder.h"
 
 void build_crr_gsb_track_to_track_edges(RRGraphBuilder& rr_graph_builder,
+                                        const vtr::vector<RRNodeId, RRSwitchId>& rr_node_driver_switches,
                                         const RRGSB& rr_gsb,
                                         const crrgenerator::CRRConnectionBuilder& connection_builder);

vpr/src/route/rr_graph_generation/tileable_rr_graph/tileable_rr_graph_edge_builder.cpp

@@ -365,7 +365,10 @@ void build_rr_graph_regular_edges(const RRGraphView& rr_graph,
             t_track2track_map sb_conn; /* [0..from_gsb_side][0..chan_width-1][track_indices] */
             if (build_crr_edges) {
                 if (ix != gsb_range.x() && iy != gsb_range.y()) {
-                    build_crr_gsb_track_to_track_edges(rr_graph_builder, rr_gsb, *crr_connection_builder);
+                    build_crr_gsb_track_to_track_edges(rr_graph_builder,
+                                                       rr_node_driver_switches,
+                                                       rr_gsb,
+                                                       *crr_connection_builder);
                 }
             } else {
                 sb_conn = build_gsb_track_to_track_map(rr_graph,