[vpr] now change to a simpler rr gsb coordinate system: grid is moved to the bottom-left corner

Author: tangxifan

vpr/src/tileable_rr_graph/rr_gsb.cpp

@@ -610,9 +610,9 @@ vtr::Point<size_t> RRGSB::get_cb_coordinate(const t_rr_type& cb_type) const {
     VTR_ASSERT(validate_cb_type(cb_type));
     switch (cb_type) {
         case CHANX:
-            return get_side_block_coordinate(LEFT);
+            return coordinate_;
         case CHANY:
-            return get_side_block_coordinate(TOP);
+            return coordinate_;
         default:
             VTR_LOG("Invalid type of connection block!\n");
             exit(1);
@@ -682,10 +682,7 @@ vtr::Point<size_t> RRGSB::get_side_block_coordinate(const e_side& side) const {
 }
 
 vtr::Point<size_t> RRGSB::get_grid_coordinate() const {
-    vtr::Point<size_t> ret(get_sb_x(), get_sb_y());
-    ret.set_y(ret.y() + 1);
-
-    return ret;
+    return coordinate_;
 }
 
 /************************************************************************
@@ -1184,9 +1181,3 @@ 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

@@ -17,11 +17,6 @@
  * 2. A X-direction Connection block locates at the left side of the switch block
  * 2. A Y-direction Connection block locates at the top side of the switch block
  *
- *  +-------------+              +---------------------------------+
- *  |             |              |          Y-direction CB         |
- *  |    Grid     |              |              [x][y + 1]         |
- *  |  [x][y+1]   |              +---------------------------------+
- *  +-------------+
  *                                          TOP SIDE
  *  +-------------+              +---------------------------------+
  *  |             |              | OPIN_NODE CHAN_NODES OPIN_NODES |
@@ -38,6 +33,11 @@
  *  |             |              | OPIN_NODE CHAN_NODES OPIN_NODES |
  *  +-------------+              +---------------------------------+
  *                                             BOTTOM SIDE
+ *  +-------------+              +---------------------------------+
+ *  |    Grid     |              |          Y-direction CB         |
+ *  |  [x][y]     |              |              [x][y]             |
+ *  +-------------+              +---------------------------------+
+ *
  * num_sides: number of sides of this switch block
  * chan_rr_node: a collection of rr_nodes as routing tracks locating at each side of the Switch block <0..num_sides-1><0..chan_width-1>
  * chan_rr_node_direction: Indicate if this rr_node is an input or an output of the Switch block <0..num_sides-1><0..chan_width-1>
@@ -229,7 +229,6 @@ 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 */