add rr_graph_chan_chan_edges

Author: soheilshahrouz

vpr/src/route/rr_graph_generation/rr_graph.cpp

@@ -45,6 +45,7 @@ int get_seg_start(const t_chan_seg_details* seg_details,
                   const int itrack,
                   const int chan_num,
                   const int seg_num);
+
 int get_seg_end(const t_chan_seg_details* seg_details,
                 const int itrack,
                 const int istart,
@@ -63,44 +64,6 @@ bool is_sblock(const int chan,
                const t_chan_seg_details* seg_details,
                const enum e_directionality directionality);
 
-/// Adds the fan-out edges from wire segment at (chan, seg, track) to adjacent blocks along the wire's length
-int get_track_to_pins(RRGraphBuilder& rr_graph_builder,
-                      int layer,
-                      int seg,
-                      int chan,
-                      int track,
-                      int tracks_per_chan,
-                      RRNodeId from_rr_node,
-                      t_rr_edge_info_set& rr_edges_to_create,
-                      const t_track_to_pin_lookup& track_to_pin_lookup,
-                      const t_chan_seg_details* seg_details,
-                      e_rr_type chan_type,
-                      int chan_length,
-                      int wire_to_ipin_switch,
-                      e_directionality directionality);
-
-int get_track_to_tracks(RRGraphBuilder& rr_graph_builder,
-                        const int layer,
-                        const int from_chan,
-                        const int from_seg,
-                        const int from_track,
-                        const e_rr_type from_type,
-                        const int to_seg,
-                        const e_rr_type to_type,
-                        const int chan_len,
-                        const int max_chan_width,
-                        const DeviceGrid& grid,
-                        const int Fs_per_side,
-                        t_sblock_pattern& sblock_pattern,
-                        RRNodeId from_rr_node,
-                        t_rr_edge_info_set& rr_edges_to_create,
-                        const t_chan_seg_details* from_seg_details,
-                        const t_chan_seg_details* to_seg_details,
-                        const t_chan_details& to_chan_details,
-                        const e_directionality directionality,
-                        const vtr::NdMatrix<std::vector<int>, 3>& switch_block_conn,
-                        const t_sb_connection_map* sb_conn_map);
-
 /**
  * @brief Identifies and labels all mux endpoints at a given channel segment coordinate.
  *

vpr/src/route/rr_graph_generation/rr_graph2.cpp

@@ -0,0 +1,26 @@
+#pragma once
+
+#include "rr_types.h"
+#include "build_switchblocks.h"
+
+class RRGraphBuilder;
+struct t_chan_width;
+struct t_bottleneck_link;
+
+void add_chan_chan_edges(RRGraphBuilder& rr_graph_builder,
+                         size_t num_seg_types_x,
+                         size_t num_seg_types_y,
+                         const t_track_to_pin_lookup& track_to_pin_lookup_x,
+                         const t_track_to_pin_lookup& track_to_pin_lookup_y,
+                         const t_chan_width& chan_width,
+                         const t_chan_details& chan_details_x,
+                         const t_chan_details& chan_details_y,
+                         t_sb_connection_map* sb_conn_map,
+                         const vtr::NdMatrix<std::vector<int>, 3>& switch_block_conn,
+                         const vtr::NdMatrix<std::vector<t_bottleneck_link>, 2>& interdie_3d_links,
+                         t_sblock_pattern& sblock_pattern,
+                         int Fs,
+                         int wire_to_ipin_switch,
+                         e_directionality directionality,
+                         bool is_global_graph,
+                         int& num_edges);

vpr/src/route/rr_graph_generation/rr_graph2.h

@@ -658,12 +658,13 @@ void add_opin_chan_edges(RRGraphBuilder& rr_graph_builder,
                          const std::vector<t_direct_inf>& directs,
                          const std::vector<t_clb_to_clb_directs>& clb_to_clb_directs,
                          e_directionality directionality,
-                         t_rr_edge_info_set& rr_edges_to_create,
                          int& num_edges,
                          int& rr_edges_before_directs,
                          bool* Fc_clipped) {
     const DeviceGrid& grid = g_vpr_ctx.device().grid;
 
+    t_rr_edge_info_set rr_edges_to_create;
+
     // These are data structures used by the unidir opin mapping. They are used
     // to spread connections evenly for each segment type among the available
     // wire start points

vpr/src/route/rr_graph_generation/rr_graph_chan_chan_edges.cpp

@@ -37,7 +37,6 @@ void add_opin_chan_edges(RRGraphBuilder& rr_graph_builder,
                          const std::vector<t_direct_inf>& directs,
                          const std::vector<t_clb_to_clb_directs>& clb_to_clb_directs,
                          e_directionality directionality,
-                         t_rr_edge_info_set& rr_edges_to_create,
                          int& num_edges,
                          int& rr_edges_before_directs,
                          bool* Fc_clipped);

vpr/src/route/rr_graph_generation/rr_graph_chan_chan_edges.h

@@ -264,11 +264,14 @@ void add_and_connect_non_3d_sg_links(RRGraphBuilder& rr_graph_builder,
                                      const t_chan_details& chan_details_x,
                                      const t_chan_details& chan_details_y,
                                      size_t num_seg_types_x,
-                                     t_rr_edge_info_set& non_3d_sg_rr_edges_to_create) {
+                                     int& num_edges) {
     // Each SG link should have a corresponding RR node index
     VTR_ASSERT(sg_links.size() == sg_node_indices.size());
     const size_t num_links = sg_links.size();
 
+    t_rr_edge_info_set rr_edges_to_create;
+    num_edges = 0;
+
     for (size_t i = 0; i < num_links; i++) {
 
         const t_bottleneck_link& link = sg_links[i];
@@ -320,7 +323,7 @@ void add_and_connect_non_3d_sg_links(RRGraphBuilder& rr_graph_builder,
                                                                             gather_chan_type,
                                                                             gather_wire.wire_switchpoint.wire);
             // Record deferred edge creation (gather_node --> sg_node)
-            non_3d_sg_rr_edges_to_create.emplace_back(gather_node, node_id, link.arch_wire_switch, false);
+            rr_edges_to_create.emplace_back(gather_node, node_id, link.arch_wire_switch, false);
         }
 
         // Step 7: Add outgoing edges to scatter (fanout) channel wires
@@ -339,7 +342,11 @@ void add_and_connect_non_3d_sg_links(RRGraphBuilder& rr_graph_builder,
             // Determine which architecture switch this edge should use
             int switch_index = chan_details[chan_loc.x][chan_loc.y][scatter_wire.wire_switchpoint.wire].arch_wire_switch();
             // Record deferred edge creation (sg_node --> scatter_node)
-            non_3d_sg_rr_edges_to_create.emplace_back(node_id, scatter_node, switch_index, false);
+            rr_edges_to_create.emplace_back(node_id, scatter_node, switch_index, false);
         }
     }
+
+    uniquify_edges(rr_edges_to_create);
+    rr_graph_builder.alloc_and_load_edges(&rr_edges_to_create);
+    num_edges += rr_edges_to_create.size();
 }

vpr/src/route/rr_graph_generation/rr_graph_opin_chan_edges.cpp

@@ -67,12 +67,12 @@ void add_edges_opin_chanz_per_block(const RRGraphView& rr_graph,
  * @param chan_details_x       Channel details for CHANX segments.
  * @param chan_details_y       Channel details for CHANY segments.
  * @param num_seg_types_x      Number of segment types in the X direction.
- * @param non_3d_sg_rr_edges_to_create  Set collecting RR edges to create later.
+ * @param num_edges            Total number of edges added to RR graph.
  */
 void add_and_connect_non_3d_sg_links(RRGraphBuilder& rr_graph_builder,
                                      const std::vector<t_bottleneck_link>& sg_links,
                                      const std::vector<std::pair<RRNodeId, int>>& sg_node_indices,
                                      const t_chan_details& chan_details_x,
                                      const t_chan_details& chan_details_y,
                                      size_t num_seg_types_x,
-                                     t_rr_edge_info_set& non_3d_sg_rr_edges_to_create);
+                                     int& num_edges);