Merge branch 'master' into rr_graph_builder_api

Author: tangxifan

doc/src/vpr/graphics.rst

@@ -42,7 +42,7 @@ A graphical window will now pop up when you run VPR.
 Navigation
 ----------
 Click on **Zoom-Fit** buttons to zoom the view.
-Click and drag the mouse wheel to pan the view, or scroll the mouse wheel to zoom in and out.
+Click and drag with the left mouse button to pan the view, or scroll the mouse wheel to zoom in and out.
 Click on the **Window**, then on the diagonally opposite corners of a box, to zoom in on a particular area.
 
 Click on **Save** to save the image on screen to PDF, PNG, or SVG file.

vpr/src/device/rr_graph_builder.cpp

@@ -50,7 +50,3 @@ void RRGraphBuilder::add_node_to_all_locs(RRNodeId node) {
 void RRGraphBuilder::clear() {
     node_lookup_.clear();
 }
-
-void RRGraphBuilder::set_node_coordinates(RRNodeId id, short x1, short y1, short x2, short y2) {
-    node_storage_.set_node_coordinates(id, x1, y1, x2, y2);
-}

vpr/src/device/rr_graph_builder.h

@@ -59,8 +59,15 @@ class RRGraphBuilder {
     /** @brief Clear all the underlying data storage */
     void clear();
 
+    /** @brief Set capacity of this node (number of routes that can use it). */
+    inline void set_node_capacity(RRNodeId id, short new_capacity) {
+        node_storage_.set_node_capacity(id, new_capacity);
+    }
+
     /** @brief Set the node coordinate */
-    void set_node_coordinates(RRNodeId id, short x1, short y1, short x2, short y2);
+    inline void set_node_coordinates(RRNodeId id, short x1, short y1, short x2, short y2) {
+        node_storage_.set_node_coordinates(id, x1, y1, x2, y2);
+    }
 
     /* -- Internal data storage -- */
   private:

vpr/src/route/clock_connection_builders.cpp

@@ -108,7 +108,7 @@ RRNodeId RoutingToClockConnection::create_virtual_clock_network_sink_node(int x,
 
     rr_graph.set_node_ptc_num(node_index, ptc);
     rr_graph_builder.set_node_coordinates(node_index, x, y, x, y);
-    rr_graph.set_node_capacity(node_index, 1);
+    rr_graph_builder.set_node_capacity(node_index, 1);
     rr_graph.set_node_cost_index(node_index, SINK_COST_INDEX);
     rr_graph_builder.set_node_type(node_index, SINK);
     float R = 0.;

vpr/src/route/clock_network_builders.cpp

@@ -321,7 +321,7 @@ int ClockRib::create_chanx_wire(int x_start,
 
     rr_graph_builder.set_node_type(chanx_node, CHANX);
     rr_graph_builder.set_node_coordinates(chanx_node, x_start, y, x_end, y);
-    node.set_capacity(1);
+    rr_graph_builder.set_node_capacity(chanx_node, 1);
     node.set_track_num(ptc_num);
     node.set_rc_index(find_create_rr_rc_data(
         x_chan_wire.layer.r_metal, x_chan_wire.layer.c_metal));
@@ -346,7 +346,6 @@ int ClockRib::create_chanx_wire(int x_start,
 
     /* Add the node to spatial lookup */
     auto& rr_graph = (*rr_nodes);
-
     /* TODO: Will replace these codes with an API add_node_to_all_locs() of RRGraphBuilder */
     for (int ix = rr_graph.node_xlow(chanx_node); ix <= rr_graph.node_xhigh(chanx_node); ++ix) {
         for (int iy = rr_graph.node_ylow(chanx_node); iy <= rr_graph.node_yhigh(chanx_node); ++iy) {
@@ -628,7 +627,7 @@ int ClockSpine::create_chany_wire(int y_start,
 
     rr_graph_builder.set_node_type(chany_node, CHANY);
     rr_graph_builder.set_node_coordinates(chany_node, x, y_start, x, y_end);
-    node.set_capacity(1);
+    rr_graph_builder.set_node_capacity(chany_node, 1);
     node.set_track_num(ptc_num);
     node.set_rc_index(find_create_rr_rc_data(
         y_chan_wire.layer.r_metal, y_chan_wire.layer.c_metal));
@@ -653,7 +652,6 @@ int ClockSpine::create_chany_wire(int y_start,
 
     /* Add the node to spatial lookup */
     auto& rr_graph = (*rr_nodes);
-
     /* TODO: Will replace these codes with an API add_node_to_all_locs() of RRGraphBuilder */
     for (int ix = rr_graph.node_xlow(chany_node); ix <= rr_graph.node_xhigh(chany_node); ++ix) {
         for (int iy = rr_graph.node_ylow(chany_node); iy <= rr_graph.node_yhigh(chany_node); ++iy) {

vpr/src/route/rr_graph.cpp

@@ -708,11 +708,11 @@ static void build_rr_graph(const t_graph_type graph_type,
         for (int i = 0; i < num_rr_nodes; i++) {
             if (rr_graph.node_type(RRNodeId(i)) == CHANX) {
                 int ylow = rr_graph.node_ylow(RRNodeId(i));
-                device_ctx.rr_nodes[i].set_capacity(nodes_per_chan.x_list[ylow]);
+                device_ctx.rr_graph_builder.set_node_capacity(RRNodeId(i), nodes_per_chan.x_list[ylow]);
             }
             if (rr_graph.node_type(RRNodeId(i)) == CHANY) {
                 int xlow = rr_graph.node_xlow(RRNodeId(i));
-                device_ctx.rr_nodes[i].set_capacity(nodes_per_chan.y_list[xlow]);
+                device_ctx.rr_graph_builder.set_node_capacity(RRNodeId(i), nodes_per_chan.y_list[xlow]);
             }
         }
     }
@@ -1428,7 +1428,7 @@ static void build_rr_sinks_sources(RRGraphBuilder& rr_graph_builder,
         }
 
         /* Things common to both SOURCEs and SINKs.   */
-        L_rr_node.set_node_capacity(inode, class_inf[iclass].num_pins);
+        rr_graph_builder.set_node_capacity(inode, class_inf[iclass].num_pins);
         rr_graph_builder.set_node_coordinates(inode, i, j, i + type->width - 1, j + type->height - 1);
         float R = 0.;
         float C = 0.;
@@ -1477,7 +1477,7 @@ static void build_rr_sinks_sources(RRGraphBuilder& rr_graph_builder,
 
                         /* Common to both DRIVERs and RECEIVERs */
                         if (inode) {
-                            L_rr_node.set_node_capacity(inode, 1);
+                            rr_graph_builder.set_node_capacity(inode, 1);
                             float R = 0.;
                             float C = 0.;
                             L_rr_node.set_node_rc_index(inode, find_create_rr_rc_data(R, C));
@@ -1657,7 +1657,7 @@ static void build_rr_chan(RRGraphBuilder& rr_graph_builder,
 
         /* Edge arrays have now been built up.  Do everything else.  */
         L_rr_node.set_node_cost_index(node, cost_index_offset + seg_details[track].index());
-        L_rr_node.set_node_capacity(node, 1); /* GLOBAL routing handled elsewhere */
+        rr_graph_builder.set_node_capacity(node, 1); /* GLOBAL routing handled elsewhere */
 
         if (chan_type == CHANX) {
             rr_graph_builder.set_node_coordinates(node, start, y_coord, end, y_coord);

vpr/src/route/rr_graph_uxsdcxx_serializer.h

@@ -763,8 +763,8 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
         auto node = (*rr_nodes_)[id];
         RRNodeId node_id = node.id();
 
-        node.set_capacity(capacity);
         rr_graph_builder_->set_node_type(node_id, from_uxsd_node_type(type));
+        rr_graph_builder_->set_node_capacity(node_id, capacity);
 
         switch (rr_graph.node_type(node.id())) {
             case CHANX:

vpr/src/route/rr_node.cpp

@@ -75,10 +75,6 @@ void t_rr_node::set_rc_index(short new_rc_index) {
     storage_->set_node_rc_index(id_, new_rc_index);
 }
 
-void t_rr_node::set_capacity(short new_capacity) {
-    storage_->set_node_capacity(id_, new_capacity);
-}
-
 void t_rr_node::set_direction(Direction new_direction) {
     storage_->set_node_direction(id_, new_direction);
 }

vpr/src/route/rr_node.h

@@ -108,8 +108,6 @@ class t_rr_node {
     bool validate() const;
 
   public: //Mutators
-    void set_capacity(short);
-
     void set_ptc_num(short);
     void set_pin_num(short);   //Same as set_ptc_num() by checks type() is consistent
     void set_track_num(short); //Same as set_ptc_num() by checks type() is consistent