oops

Author: duck2

vpr/src/pack/sync_netlists_to_routing_flat.cpp

@@ -295,28 +295,47 @@ static void sync_clustered_netlist_to_routing(void){
     /* 1. Remove all nets, pins and ports from the clustered netlist.
      * If the clock net is not routed, don't remove entries for the clock net
      * otherwise we won't have data to rebuild them. */
+    std::vector<ClusterNetId> nets_to_remove;
+    std::vector<ClusterPinId> pins_to_remove;
+    std::vector<ClusterPortId> ports_to_remove;
+
     for(auto net_id: clb_netlist.nets()){
         auto atom_net_id = atom_lookup.atom_net(net_id);
         if(!clock_net_is_routed && route_ctx.is_clock_net[atom_net_id])
             continue;
 
-        clb_netlist.remove_net(net_id);
-        atom_lookup.remove_clb_net(net_id);
+        nets_to_remove.push_back(net_id);
     }
     for(auto pin_id: clb_netlist.pins()){
         ClusterNetId clb_net_id = clb_netlist.pin_net(pin_id);
         auto atom_net_id = atom_lookup.atom_net(clb_net_id);
         if(!clock_net_is_routed && atom_net_id && route_ctx.is_clock_net[atom_net_id])
             continue;
-        clb_netlist.remove_pin(pin_id);
+
+        pins_to_remove.push_back(pin_id);
     }
     for(auto port_id: clb_netlist.ports()){
         ClusterNetId clb_net_id = clb_netlist.port_net(port_id, 0);
         auto atom_net_id = atom_lookup.atom_net(clb_net_id);
         if(!clock_net_is_routed && atom_net_id && route_ctx.is_clock_net[atom_net_id])
             continue;
+
+        ports_to_remove.push_back(port_id);
+    }
+
+    /* ClusteredNetlist's iterators rely on internal lookups, so we mark for removal
+     * while iterating, then remove in bulk */
+    for(auto net_id: nets_to_remove){
+        clb_netlist.remove_net(net_id);
+        atom_lookup.remove_clb_net(net_id);
+    }
+    for(auto pin_id: pins_to_remove){
+        clb_netlist.remove_pin(pin_id);
+    }
+    for(auto port_id: ports_to_remove){
         clb_netlist.remove_port(port_id);
     }
+
     /* 2. Reset all internal lookups for netlist */
     auto remapped = clb_netlist.compress();
     rebuild_atom_nets_lookup(remapped);

vtr_flow/tasks/regression_tests/vtr_reg_basic/task_list.txt

@@ -7,4 +7,3 @@ regression_tests/vtr_reg_basic/basic_timing
 regression_tests/vtr_reg_basic/basic_timing_no_sdc
 regression_tests/vtr_reg_basic/hdl_include_yosys
 regression_tests/vtr_reg_basic/hdl_include_yosys
-regression_tests/vtr_reg_strong/strong_flat_router