rename ofs to offset & 4 --> e_side::num_2d_sides

Author: soheilshahrouz

vpr/src/route/rr_graph_generation/rr_graph.cpp

@@ -1575,10 +1575,10 @@ static vtr::NdMatrix<std::vector<int>, 4> alloc_and_load_pin_to_track_map(const
     // allocate 'result' matrix and initialize entries to UNDEFINED. also allocate and initialize matrix which will be used
     // to index into the correct entries when loading up 'result'
     auto result = vtr::NdMatrix<std::vector<int>, 4>({
-        size_t(tile_type->num_pins), //[0..num_pins-1]
-        size_t(tile_type->width),    //[0..width-1]
-        size_t(tile_type->height),   //[0..height-1]
-        4,                           //[0..sides-1]
+        size_t(tile_type->num_pins),    // [0..num_pins-1]
+        size_t(tile_type->width),       // [0..width-1]
+        size_t(tile_type->height),      // [0..height-1]
+        size_t(e_side::NUM_2D_SIDES),   // [0..sides-1]
     });
 
     // multiplier for unidirectional vs bidirectional architectures

vpr/src/route/rr_graph_generation/rr_graph2.cpp

@@ -657,7 +657,7 @@ void dump_track_to_pin_map(t_track_to_pin_lookup& track_to_pin_map,
     }
 }
 
-bool is_sblock(const int chan, int wire_seg, const int sb_seg, const int track, const t_chan_seg_details* seg_details, const enum e_directionality directionality) {
+bool is_sblock(const int chan, int wire_seg, const int sb_seg, const int track, const t_chan_seg_details* seg_details, const e_directionality directionality) {
     int fac = 1;
     if (UNI_DIRECTIONAL == directionality) {
         fac = 2;
@@ -668,17 +668,17 @@ bool is_sblock(const int chan, int wire_seg, const int sb_seg, const int track,
     // Make sure they gave us correct start
     wire_seg = get_seg_start(seg_details, track, chan, wire_seg);
 
-    int ofs = sb_seg - wire_seg + 1; // Offset 0 is behind us, so add 1
+    int offset = sb_seg - wire_seg + 1; // Offset 0 is behind us, so add 1
 
-    VTR_ASSERT(ofs >= 0);
-    VTR_ASSERT(ofs < (length + 1));
+    VTR_ASSERT(offset >= 0);
+    VTR_ASSERT(offset < length + 1);
 
     // If unidir segment that is going backwards, we need to flip the ofs
-    if ((ofs % fac) > 0) {
-        ofs = length - ofs;
+    if (offset % fac > 0) {
+        offset = length - offset;
     }
 
-    return seg_details[track].sb(ofs);
+    return seg_details[track].sb(offset);
 }
 
 t_sblock_pattern alloc_sblock_pattern_lookup(const DeviceGrid& grid,

vpr/src/route/rr_graph_generation/rr_graph2.h

@@ -62,7 +62,7 @@ bool is_sblock(const int chan,
                const int sb_seg,
                const int track,
                const t_chan_seg_details* seg_details,
-               const enum e_directionality directionality);
+               const e_directionality directionality);
 
 /**
  * @brief Identifies and labels all mux endpoints at a given channel segment coordinate.