[vpr] syntax

Author: tangxifan

vpr/src/tileable_rr_graph/rr_gsb.cpp

@@ -1181,3 +1181,8 @@ bool RRGSB::validate_ipin_node_id(const e_side& side, const size_t& node_id) con
 bool RRGSB::validate_cb_type(const t_rr_type& cb_type) const {
     return ((CHANX == cb_type) || (CHANY == cb_type));
 }
+
+size_t RRGSB::get_cb_opin_type_id(const t_rr_type& cb_type) const {
+    VTR_ASSERT(validate_cb_type(cb_type));
+    return cb_type == CHANX ? 0 : 1;
+}

vpr/src/tileable_rr_graph/rr_gsb.h

@@ -229,6 +229,7 @@ class RRGSB {
     bool validate_opin_node_id(const e_side& side, const size_t& node_id) const;
     bool validate_ipin_node_id(const e_side& side, const size_t& node_id) const;
     bool validate_cb_type(const t_rr_type& cb_type) const;
+    size_t get_cb_opin_type_id(const t_rr_type& cb_type) const;
 
   private: /* Internal Data */
     /* Coordinator */

vpr/src/tileable_rr_graph/tileable_rr_graph_gsb.cpp

@@ -637,16 +637,16 @@ RRGSB build_one_tileable_rr_gsb(const DeviceGrid& grids,
      * - bottom side routing tracks for any GSB exist on y = [0, H)
      * - left side routing tracks for any GSB exist on x = [0, W)
      */
-    size_t std::map<e_side, vtr:Point<size_t>> track_range;
-    track_range[TOP] = vtr:Point<size_t>(0, grids.height() - 2);
-    track_range[RIGHT] = vtr:Point<size_t>(0, grids.width() - 2);
-    track_range[BOTTOM] = vtr:Point<size_t>(1, grids.height() - 2);
-    track_range[LEFT] = vtr:Point<size_t>(1, grids.width() - 2);
+    std::map<e_side, vtr::Point<size_t>> track_range;
+    track_range[TOP] = vtr::Point<size_t>(0, grids.height() - 2);
+    track_range[RIGHT] = vtr::Point<size_t>(0, grids.width() - 2);
+    track_range[BOTTOM] = vtr::Point<size_t>(1, grids.height() - 2);
+    track_range[LEFT] = vtr::Point<size_t>(1, grids.width() - 2);
     if (perimeter_cb) {
-        track_range[TOP] = vtr:Point<size_t>(0, grids.height() - 1);
-        track_range[RIGHT] = vtr:Point<size_t>(0, grids.width() - 1);
-        track_range[BOTTOM] = vtr:Point<size_t>(0, grids.height());
-        track_range[LEFT] = vtr:Point<size_t>(0, grids.width());
+        track_range[TOP] = vtr::Point<size_t>(0, grids.height() - 1);
+        track_range[RIGHT] = vtr::Point<size_t>(0, grids.width() - 1);
+        track_range[BOTTOM] = vtr::Point<size_t>(0, grids.height());
+        track_range[LEFT] = vtr::Point<size_t>(0, grids.width());
     }
 
     /* Create an object to return */
@@ -684,7 +684,7 @@ RRGSB build_one_tileable_rr_gsb(const DeviceGrid& grids,
         switch (side) {
             case TOP: /* TOP = 0 */
                 /* For the border, we should take special care. The top column (H-1) does not have any top side routing channel. Any lower column may have (<= H-2) */
-                if (track_range[side].x() > gsb_coordinate.y() || gsb_coordinate.y() >= track_range[side].y()) {
+                if (track_range[side_manager.get_side()].x() > gsb_coordinate.y() || gsb_coordinate.y() >= track_range[side_manager.get_side()].y()) {
                     rr_gsb.clear_one_side(side_manager.get_side());
                     break;
                 }
@@ -714,7 +714,7 @@ RRGSB build_one_tileable_rr_gsb(const DeviceGrid& grids,
                 break;
             case RIGHT: /* RIGHT = 1 */
                 /* For the border, we should take special care. The rightmost column (W-1) does not have any right side routing channel. If perimeter connection block is not enabled, even the last second rightmost column (W-2) does not have any right side routing channel  */
-                if (track_range[side].x() > gsb_coordinate.x() || gsb_coordinate.x() >= track_range[side].y()) {
+                if (track_range[side_manager.get_side()].x() > gsb_coordinate.x() || gsb_coordinate.x() >= track_range[side_manager.get_side()].y()) {
                     rr_gsb.clear_one_side(side_manager.get_side());
                     break;
                 }
@@ -744,7 +744,7 @@ RRGSB build_one_tileable_rr_gsb(const DeviceGrid& grids,
                 break;
             case BOTTOM: /* BOTTOM = 2*/
                 /* For the border, we should take special care */
-                if (track_range[side].x() > gsb_coordinate.y() || gsb_coordinate.y() >= track_range[side].y()) {
+                if (track_range[side_manager.get_side()].x() > gsb_coordinate.y() || gsb_coordinate.y() >= track_range[side_manager.get_side()].y()) {
                     rr_gsb.clear_one_side(side_manager.get_side());
                     break;
                 }
@@ -774,7 +774,7 @@ RRGSB build_one_tileable_rr_gsb(const DeviceGrid& grids,
                 break;
             case LEFT: /* LEFT = 3 */
                 /* For the border, we should take special care */
-                if (track_range[side].x() > gsb_coordinate.x() || gsb_coordinate.x() >= track_range[side].y()) {
+                if (track_range[side_manager.get_side()].x() > gsb_coordinate.x() || gsb_coordinate.x() >= track_range[side_manager.get_side()].y()) {
                     rr_gsb.clear_one_side(side_manager.get_side());
                     break;
                 }