fixed Issue When Re-Creating Elements in Atom and Clustered Netlists

Author: ZohairZaidi

vpr/src/base/atom_netlist.cpp

@@ -141,8 +141,9 @@ AtomBlockId AtomNetlist::create_block(const std::string& name, const t_model* mo
     AtomBlockId blk_id = Netlist::create_block(name);
 
     //Initialize the data
-    block_models_.push_back(model);
-    block_truth_tables_.push_back(truth_table);
+    // Use insert instead of push_back
+    block_models_.insert(blk_id, model);
+    block_truth_tables_.insert(blk_id, truth_table);
 
     //Check post-conditions: size
     VTR_ASSERT(validate_block_sizes());
@@ -174,7 +175,8 @@ AtomPortId AtomNetlist::create_port(const AtomBlockId blk_id, const t_model_port
     if (!port_id) {
         port_id = Netlist::create_port(blk_id, model_port->name, model_port->size, type);
 
-        port_models_.push_back(model_port);
+        // Use insert instead of push_back
+        port_models_.insert(port_id, model_port);
         associate_port_with_block(port_id, port_type(port_id), blk_id);
     }
 

vpr/src/base/clustered_netlist.cpp

@@ -144,7 +144,8 @@ ClusterPortId ClusteredNetlist::create_port(const ClusterBlockId blk_id, const s
 ClusterPinId ClusteredNetlist::create_pin(const ClusterPortId port_id, BitIndex port_bit, const ClusterNetId net_id, const PinType pin_type_, int pin_index, bool is_const) {
     ClusterPinId pin_id = Netlist::create_pin(port_id, port_bit, net_id, pin_type_, is_const);
 
-    pin_logical_index_.push_back(pin_index);
+    // insert
+    pin_logical_index_.insert(pin_id, pin_index); 
 
     ClusterBlockId block_id = port_block(port_id);
     block_logical_pins_[block_id][pin_index] = pin_id;