Fixes to vpr/src/route/rr_graph.cpp

Enable per pin Fc

Signed-off-by: Maciej Dudek <[email protected]>

Author: mtdudek

libs/libarchfpga/src/read_fpga_interchange_arch.cpp

@@ -226,7 +226,6 @@ struct ArchReader {
 
         SyncModelsPbTypes(arch_, ltypes_);
         check_models(arch_);
-
     }
 
   private:

vpr/src/route/rr_graph.cpp

@@ -86,6 +86,7 @@ static vtr::NdMatrix<std::vector<int>, 4> alloc_and_load_pin_to_track_map(const
 static vtr::NdMatrix<int, 5> alloc_and_load_pin_to_seg_type(const e_pin_type pin_type,
                                                             const int seg_type_tracks,
                                                             const int Fc,
+                                                            const std::vector<int> seg_type_Fc,
                                                             const t_physical_tile_type_ptr Type,
                                                             const bool perturb_switch_pattern,
                                                             const e_directionality directionality);
@@ -1696,21 +1697,6 @@ static vtr::NdMatrix<std::vector<int>, 4> alloc_and_load_pin_to_track_map(const
                                                                           const e_directionality directionality,
                                                                           const int num_seg_types,
                                                                           const int* sets_per_seg_type) {
-    /* get the maximum number of tracks that any pin can connect to */
-    size_t max_pin_tracks = 0;
-    for (int iseg = 0; iseg < num_seg_types; iseg++) {
-        /* determine the maximum Fc to this segment type across all pins */
-        int max_Fc = 0;
-        for (int pin_index = 0; pin_index < Type->num_pins; ++pin_index) {
-            int pin_class = Type->pin_class[pin_index];
-            if (Fc[pin_index][iseg] > max_Fc && Type->class_inf[pin_class].type == pin_type) {
-                max_Fc = Fc[pin_index][iseg];
-            }
-        }
-
-        max_pin_tracks += max_Fc;
-    }
-
     /* allocate 'result' matrix and initialize entries to OPEN. also allocate and intialize matrix which will be
      * used to index into the correct entries when loading up 'result' */
 
@@ -1733,17 +1719,21 @@ static vtr::NdMatrix<std::vector<int>, 4> alloc_and_load_pin_to_track_map(const
         int num_seg_type_tracks = fac * sets_per_seg_type[iseg];
 
         /* determine the maximum Fc to this segment type across all pins */
+        std::vector<int> seg_type_Fc;
         int max_Fc = 0;
         for (int pin_index = 0; pin_index < Type->num_pins; ++pin_index) {
             int pin_class = Type->pin_class[pin_index];
+
+            seg_type_Fc.push_back(Fc[pin_index][iseg]); // Create Fc values for pins
+
             if (Fc[pin_index][iseg] > max_Fc && Type->class_inf[pin_class].type == pin_type) {
                 max_Fc = Fc[pin_index][iseg];
             }
         }
 
         /* get pin connections to tracks of the current segment type */
         auto pin_to_seg_type_map = alloc_and_load_pin_to_seg_type(pin_type,
-                                                                  num_seg_type_tracks, max_Fc, Type, perturb_switch_pattern[iseg], directionality);
+                                                                  num_seg_type_tracks, max_Fc, seg_type_Fc, Type, perturb_switch_pattern[iseg], directionality);
 
         /* connections in pin_to_seg_type_map are within that seg type -- i.e. in the [0,num_seg_type_tracks-1] range.
          * now load up 'result' array with these connections, but offset them so they are relative to the channel
@@ -1770,20 +1760,23 @@ static vtr::NdMatrix<std::vector<int>, 4> alloc_and_load_pin_to_track_map(const
         /* next seg type will start at this track index */
         seg_type_start_track += num_seg_type_tracks;
     }
-
     return result;
 }
 
 static vtr::NdMatrix<int, 5> alloc_and_load_pin_to_seg_type(const e_pin_type pin_type,
                                                             const int num_seg_type_tracks,
                                                             const int Fc,
+                                                            const std::vector<int> seg_type_Fc,
                                                             const t_physical_tile_type_ptr Type,
                                                             const bool perturb_switch_pattern,
                                                             const e_directionality directionality) {
     /* Note: currently a single value of Fc is used across each pin. In the future
      * the looping below will have to be modified if we want to account for pin-based
      * Fc values */
 
+    /* Note: Added support for pin-based Fc values
+     */
+
     /* NB:  This wastes some space.  Could set tracks_..._pin[ipin][ioff][iside] =
      * NULL if there is no pin on that side, or that pin is of the wrong type.
      * Probably not enough memory to worry about, esp. as it's temporary.
@@ -1848,7 +1841,7 @@ static vtr::NdMatrix<int, 5> alloc_and_load_pin_to_seg_type(const e_pin_type pin
         for (int width = 0; width < Type->width; ++width) {
             for (int height = 0; height < Type->height; ++height) {
                 for (e_side side : SIDES) {
-                    if (Type->pinloc[width][height][side][pin] == 1) {
+                    if (Type->pinloc[width][height][side][pin] == 1 && seg_type_Fc[pin] > 0) {
                         dir_list[width][height][side][num_dir[width][height][side]] = pin;
                         num_dir[width][height][side]++;
                     }