Fix multiple site reader

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

Author: mtdudek

libs/libarchfpga/src/read_fpga_interchange_arch.cpp

@@ -246,7 +246,7 @@ struct ArchReader {
     // Bel Cell mappings
     std::unordered_map<uint32_t, std::vector<t_bel_cell_mapping>> bel_cell_mappings_;
 
-    std::unordered_map<std::string, int> SegmentName_to_SegmentIdx;
+    std::unordered_map<std::string, int> segment_name_to_segment_idx;
 
     // Utils
     std::string str(int idx) {
@@ -1138,14 +1138,12 @@ struct ArchReader {
         for (auto tile : tileTypeList) {
             t_physical_tile_type ptype;
             auto name = str(tile.getName());
-
-            if (name == std::string("NULL"))
+            if (name == EMPTY.name)
                 continue;
-
             ptype.name = vtr::strdup(name.c_str());
             ptype.index = ++index;
             ptype.width = ptype.height = ptype.area = 1;
-            ptype.capacity = 1;
+            ptype.capacity = 0;
 
             process_sub_tiles(ptype, tile);
 
@@ -1174,17 +1172,18 @@ struct ArchReader {
             auto site = siteTypeList[site_in_tile.getPrimaryType()];
             auto pins_to_wires = site_in_tile.getPrimaryPinsToTileWires();
 
-            sub_tile.index = 0;
+            sub_tile.index = type.capacity;
             sub_tile.name = vtr::strdup(str(site.getName()).c_str());
-            sub_tile.capacity.set(0, 0);
+            sub_tile.capacity.set(type.capacity, type.capacity);
+            type.capacity++;
 
             int port_idx = 0;
             int abs_first_pin_idx = 0;
             int icount = 0;
             int ocount = 0;
 
-            std::unordered_map<std::string, std::string> PortName_to_WireName;
-            int idx  = 0;
+            std::unordered_map<std::string, std::string> port_name_to_wire_name;
+            int idx = 0;
             for (auto dir : {LogicalNetlist::Netlist::Direction::INPUT, LogicalNetlist::Netlist::Direction::OUTPUT}) {
                 int port_idx_by_type = 0;
                 for (auto pin : site.getPins()) {
@@ -1195,12 +1194,12 @@ struct ArchReader {
 
                     port.name = vtr::strdup(str(pin.getName()).c_str());
 
-                    PortName_to_WireName[std::string(port.name)] = str(pins_to_wires[idx++]);
+                    port_name_to_wire_name[std::string(port.name)] = str(pins_to_wires[idx++]);
 
                     port.equivalent = PortEquivalence::NONE;
                     port.num_pins = 1;
 
-                    sub_tile.sub_tile_to_tile_pin_indices.push_back(port_idx);
+                    sub_tile.sub_tile_to_tile_pin_indices.push_back(type.num_pins + port_idx);
                     port.index = port_idx++;
 
                     port.absolute_first_pin_index = abs_first_pin_idx++;
@@ -1222,14 +1221,14 @@ struct ArchReader {
             }
 
             auto pins_size = site.getPins().size();
-            sub_tile.num_phy_pins += pins_size * type.capacity;
-            type.num_pins += pins_size * type.capacity;
+            sub_tile.num_phy_pins += pins_size;
+            type.num_pins += pins_size;
             type.num_inst_pins += pins_size;
 
             type.num_input_pins += icount;
             type.num_output_pins += ocount;
-            type.num_receivers += icount * type.capacity;
-            type.num_drivers += ocount * type.capacity;
+            type.num_receivers += icount;
+            type.num_drivers += ocount;
 
             type.pin_width_offset.resize(type.num_pins, 0);
             type.pin_height_offset.resize(type.num_pins, 0);
@@ -1262,7 +1261,7 @@ struct ArchReader {
             for (const auto& port : sub_tile.ports) {
                 t_fc_specification fc_spec;
 
-                fc_spec.seg_index = SegmentName_to_SegmentIdx[PortName_to_WireName[std::string(port.name)]];
+                fc_spec.seg_index = segment_name_to_segment_idx[port_name_to_wire_name[std::string(port.name)]];
 
                 //Apply type and defaults
                 if (port.type == IN_PORT) {
@@ -1302,8 +1301,8 @@ struct ArchReader {
             t_grid_def grid_def;
             grid_def.width = grid_def.height = 0;
             for (auto tile : tileList) {
-                grid_def.width = std::max(grid_def.width, tile.getCol() + 1);
-                grid_def.height = std::max(grid_def.height, tile.getRow() + 1);
+                grid_def.width = std::max(grid_def.width, tile.getCol());
+                grid_def.height = std::max(grid_def.height, tile.getRow());
             }
 
             grid_def.grid_type = GridDefType::FIXED;
@@ -1501,7 +1500,7 @@ struct ArchReader {
             arch_->Segments[index].sb.resize(2);
             arch_->Segments[index].sb[0] = true;
             arch_->Segments[index].sb[1] = true;
-            SegmentName_to_SegmentIdx[str(i)] = index;
+            segment_name_to_segment_idx[str(i)] = index;
             ++index;
         }
     }