[vpr] syntax

Author: tangxifan

vpr/src/tileable_rr_graph/device_grid_annotation.h

@@ -19,7 +19,7 @@ class DeviceGridAnnotation {
 
   private: /* Private mutators */
     void alloc(const DeviceGrid& grid);
-    void init(const DeviceGrid& grid);
+    void init(const DeviceGrid& grid, const bool& perimeter_cb);
 
   public: /* Public accessors */
     /** @brief Check if at a given coordinate, a X-direction routing channel should exist or not */

vpr/src/tileable_rr_graph/rr_graph_builder_utils.cpp

@@ -286,10 +286,11 @@ bool is_chanx_right_to_multi_height_grid(const DeviceGrid& grids,
                                          const vtr::Point<size_t>& chanx_coord,
                                          const bool& perimeter_cb,
                                          const bool& through_channel) {
-    VTR_ASSERT(0 <= chanx_coord.x());
     size_t start_x = 1;
     if (perimeter_cb) {
       start_x = 0;
+    } else {
+      VTR_ASSERT(0 < chanx_coord.x());
     }
     if (start_x == chanx_coord.x()) {
         /* This is already the LEFT side of FPGA fabric,
@@ -374,10 +375,11 @@ bool is_chany_top_to_multi_width_grid(const DeviceGrid& grids,
                                       const vtr::Point<size_t>& chany_coord,
                                       const bool& perimeter_cb,
                                       const bool& through_channel) {
-    VTR_ASSERT(0 <= chany_coord.y());
     size_t start_y = 1;
     if (perimeter_cb) {
       start_y = 0;
+    } else {
+      VTR_ASSERT(0 < chany_coord.y());
     }
     if (start_y == chany_coord.y()) {
         /* This is already the BOTTOM side of FPGA fabric,

vpr/src/tileable_rr_graph/rr_graph_builder_utils.h

@@ -67,21 +67,25 @@ bool is_chany_exist(const DeviceGrid& grids,
 bool is_chanx_right_to_multi_height_grid(const DeviceGrid& grids,
                                          const size_t& layer,
                                          const vtr::Point<size_t>& chanx_coord,
+                                         const bool& perimeter_cb,
                                          const bool& through_channel);
 
 bool is_chanx_left_to_multi_height_grid(const DeviceGrid& grids,
                                         const size_t& layer,
                                         const vtr::Point<size_t>& chanx_coord,
+                                        const bool& perimeter_cb,
                                         const bool& through_channel);
 
 bool is_chany_top_to_multi_width_grid(const DeviceGrid& grids,
                                       const size_t& layer,
                                       const vtr::Point<size_t>& chany_coord,
+                                      const bool& perimeter_cb,
                                       const bool& through_channel);
 
 bool is_chany_bottom_to_multi_width_grid(const DeviceGrid& grids,
                                          const size_t& layer,
                                          const vtr::Point<size_t>& chany_coord,
+                                         const bool& perimeter_cb,
                                          const bool& through_channel);
 
 short get_rr_node_actual_track_id(const RRGraph& rr_graph,

vpr/src/tileable_rr_graph/tileable_rr_graph_node_builder.cpp

@@ -311,7 +311,7 @@ static size_t estimate_num_chany_rr_nodes(const DeviceGrid& grids,
                 force_end = true;
             }
 
-            ChanNodeDetails chany_details = build_unidir_chan_node_details(chan_width, seg_max_length, force_start, force_end, segment_infs);
+            ChanNodeDetails chany_details = build_unidir_chan_node_details(chan_width, max_seg_length, force_start, force_end, segment_infs);
             /* When an INC_DIRECTION CHANX starts, we need a new rr_node */
             num_chany_rr_nodes += chany_details.get_num_starting_tracks(Direction::INC);
             /* When an DEC_DIRECTION CHANX ends, we need a new rr_node */