Swapping function is now working (need more cleaning)

Author: MohamedElgammal

vpr/src/pack/re_cluster.cpp

@@ -14,7 +14,6 @@ bool move_mol_to_new_cluster(t_pack_molecule* molecule,
 
     bool is_removed, is_created;
     ClusterBlockId old_clb = atom_to_cluster(molecule->atom_block_ids[molecule->root]);
-    ;
     int molecule_size = get_array_size_of_molecule(molecule);
 
     PartitionRegion temp_cluster_pr;
@@ -37,7 +36,8 @@ bool move_mol_to_new_cluster(t_pack_molecule* molecule,
     }
 
     //remove the molecule from its current cluster
-    remove_mol_from_cluster(molecule, molecule_size, old_clb, old_router_data);
+    std::vector<AtomBlockId> old_clb_atoms = cluster_to_atoms(old_clb);
+    remove_mol_from_cluster(molecule, molecule_size, old_clb, old_clb_atoms, old_router_data);
 
     //check old cluster legality after removing the molecule
     is_removed = is_cluster_legal(old_router_data);
@@ -107,7 +107,8 @@ bool move_mol_to_existing_cluster(t_pack_molecule* molecule,
         return false;
 
     //remove the molecule from its current cluster
-    remove_mol_from_cluster(molecule, molecule_size, old_clb, old_router_data);
+    std::vector<AtomBlockId> old_clb_atoms = cluster_to_atoms(old_clb);
+    remove_mol_from_cluster(molecule, molecule_size, old_clb, old_clb_atoms, old_router_data);
 
     //check old cluster legality after removing the molecule
     is_removed = is_cluster_legal(old_router_data);
@@ -202,63 +203,95 @@ bool swap_two_molecules(t_pack_molecule* molecule_1,
     t_lb_router_data* old_1_router_data = nullptr;
     t_lb_router_data* old_2_router_data = nullptr;
 
+    //save the atoms of the 2 clusters
+    std::vector<AtomBlockId> clb_1_atoms = cluster_to_atoms(clb_1);
+    std::vector<AtomBlockId> clb_2_atoms = cluster_to_atoms(clb_2);
+
     //remove the molecule from its current cluster
-    remove_mol_from_cluster(molecule_1, molecule_1_size, clb_1, old_1_router_data);
-    //remove_mol_from_cluster(molecule_2, molecule_2_size, clb_2, old_2_router_data);
+    remove_mol_from_cluster(molecule_1, molecule_1_size, clb_1, clb_1_atoms, old_1_router_data);
+    //remove_mol_from_cluster(molecule_2, molecule_2_size, clb_2, clb_2_atoms, old_2_router_data);
 
     //bool is_removed = is_cluster_legal(old_1_router_data);
     //bool is_removed_2 = is_cluster_legal(old_2_router_data);
 
-    //commit_mol_removal(molecule_1, molecule_1_size, clb_1, during_packing, old_1_router_data, clustering_data);
-    //commit_mol_removal(molecule_2, molecule_2_size, clb_2, during_packing, old_2_router_data, clustering_data);
+    commit_mol_removal(molecule_1, molecule_1_size, clb_1, during_packing, old_1_router_data, clustering_data);
+    #if 0
     for (int i_atom = 0; i_atom < molecule_1_size; i_atom++) {
         if (molecule_1->atom_block_ids[i_atom]) {
             revert_place_atom_block(molecule_1->atom_block_ids[i_atom], old_1_router_data);
         }
     }
+    cleanup_pb(cluster_ctx.clb_nlist.block_pb(clb_1));
+    #endif
+    #if 0
+    for (int i_atom = 0; i_atom < molecule_2_size; i_atom++) {
+        if (molecule_2->atom_block_ids[i_atom]) {
+            revert_place_atom_block(molecule_2->atom_block_ids[i_atom], old_2_router_data);
+        }
+    }
+    cleanup_pb(cluster_ctx.clb_nlist.block_pb(clb_2));
+    #endif
+    
+    //bool is_removed = is_cluster_legal(old_1_router_data);
+    //bool is_removed_2 = is_cluster_legal(old_2_router_data);
+    
+    remove_mol_from_cluster(molecule_2, molecule_2_size, clb_2, clb_2_atoms, old_2_router_data);
+    commit_mol_removal(molecule_2, molecule_2_size, clb_2, during_packing, old_2_router_data, clustering_data); 
+    
 
-    cleanup_pb(cluster_ctx.clb_nlist.block_pb(clb_1));    
-    bool is_removed = is_cluster_legal(old_1_router_data);
+    //Add the atom to the new cluster
+    mol_1_success = pack_mol_in_existing_cluster(molecule_1, clb_2, clb_2_atoms, during_packing, clustering_data);    
+    
+    #if 1
+    /*
+    remove_mol_from_cluster(molecule_2, molecule_2_size, clb_2, old_2_router_data);
+    bool is_removed_2 = is_cluster_legal(old_2_router_data);
+    std::vector<AtomBlockId> clb_1_atoms = cluster_to_atoms(clb_1);
+    commit_mol_removal(molecule_2, molecule_2_size, clb_2, during_packing, old_2_router_data, clustering_data); 
+    */
+    mol_2_success = pack_mol_in_existing_cluster(molecule_2, clb_1, clb_1_atoms, during_packing, clustering_data);
+    #endif
+    mol_2_success = true;
+    
+    #if 0
     free_intra_lb_nets(clustering_data.intra_lb_routing[clb_1]);
     clustering_data.intra_lb_routing[clb_1] = old_1_router_data->saved_lb_nets;
     old_1_router_data->saved_lb_nets = nullptr;
-
-    //save the atoms of the 2 clusters
-    std::vector<AtomBlockId> clb_1_atoms = cluster_to_atoms(clb_1);
-    std::vector<AtomBlockId> clb_2_atoms = cluster_to_atoms(clb_2);
-    
-    //Add the atom to the new cluster
-    mol_1_success = pack_mol_in_existing_cluster(molecule_1, clb_2, clb_2_atoms, during_packing, clustering_data);
-    //mol_2_success = pack_mol_in_existing_cluster(molecule_2, clb_1, clb_1_atoms, during_packing, clustering_data);
-    mol_2_success = true;
+    #endif
 
     //commit the move if succeeded or revert if failed
     if (mol_1_success && mol_2_success) {
-        commit_mol_move(clb_1, clb_2, during_packing, false);
+        //commit_mol_move(clb_1, clb_2, during_packing, false);
         //commit_mol_move(clb_2, clb_1, during_packing, false);
         VTR_LOGV(verbosity > 4, "Molecules swap is performed successfully\n");
     } else {
-        revert_mol_move(clb_1, molecule_1, old_1_router_data, during_packing, clustering_data);
+        //revert_mol_move(clb_1, molecule_1, old_1_router_data, during_packing, clustering_data);
         //revert_mol_move(clb_2, molecule_2, old_2_router_data, during_packing, clustering_data);
         VTR_LOGV(verbosity > 4, "Molecules swap failed\n");
     }
 
 
     //If the move is done after packing not during it, some fixes need to be done on the clustered netlist
     if (mol_1_success && mol_2_success && !during_packing) {
-        fix_clustered_netlist(molecule_1, molecule_1_size, clb_1, clb_2);
+        //fix_clustered_netlist(molecule_1, molecule_1_size, clb_1, clb_2);
         //fix_clustered_netlist(molecule_2, molecule_2_size, clb_2, clb_1);
     }
 
     //free memory
-    //old_1_router_data->saved_lb_nets = nullptr;
-    //old_2_router_data->saved_lb_nets = nullptr;
+    old_1_router_data->saved_lb_nets = nullptr;
+    old_2_router_data->saved_lb_nets = nullptr;
 
     free_router_data(old_1_router_data);
-    //free_router_data(old_2_router_data);
+    free_router_data(old_2_router_data);
+    //remove_mol_from_cluster(molecule_2, molecule_2_size, clb_2, old_2_router_data);
+    //bool is_removed_2 = is_cluster_legal(old_2_router_data);
+    //commit_mol_removal(molecule_2, molecule_2_size, clb_2, during_packing, old_2_router_data, clustering_data);
+    //std::vector<AtomBlockId> clb_1_atoms = cluster_to_atoms(clb_1);
+    //mol_2_success = pack_mol_in_existing_cluster(molecule_2, clb_1, clb_1_atoms, during_packing, clustering_data);
+
 
     old_1_router_data = nullptr;
-    //old_2_router_data = nullptr;
+    old_2_router_data = nullptr;
 
     //return the move result
     return (mol_1_success && mol_2_success);

vpr/src/pack/re_cluster_util.cpp

@@ -54,12 +54,13 @@ std::vector<AtomBlockId> cluster_to_atoms(const ClusterBlockId& cluster) {
 void remove_mol_from_cluster(const t_pack_molecule* molecule,
                              int molecule_size,
                              ClusterBlockId& old_clb,
+                             std::vector<AtomBlockId>& old_clb_atoms,
                              t_lb_router_data*& router_data) {
     auto& helper_ctx = g_vpr_ctx.mutable_cl_helper();
 
     //Determine the cluster ID
     old_clb = atom_to_cluster(molecule->atom_block_ids[molecule->root]);
-    std::vector<AtomBlockId> old_clb_atoms = cluster_to_atoms(old_clb);
+    //std::vector<AtomBlockId> old_clb_atoms = cluster_to_atoms(old_clb);
 
     //re-build router_data structure for this cluster
     router_data = lb_load_router_data(helper_ctx.lb_type_rr_graphs, old_clb, old_clb_atoms);
@@ -68,6 +69,7 @@ void remove_mol_from_cluster(const t_pack_molecule* molecule,
     for (int i_atom = 0; i_atom < molecule_size; i_atom++) {
         if (molecule->atom_block_ids[i_atom]) {
             remove_atom_from_target(router_data, molecule->atom_block_ids[i_atom]);
+            old_clb_atoms.erase(std::remove(old_clb_atoms.begin(), old_clb_atoms.end(), molecule->atom_block_ids[i_atom]));
         }
     }
 }

vpr/src/pack/re_cluster_util.h

@@ -50,6 +50,7 @@ t_lb_router_data* lb_load_router_data(std::vector<t_lb_type_rr_node>* lb_type_rr
 void remove_mol_from_cluster(const t_pack_molecule* molecule,
                              int molecule_size,
                              ClusterBlockId& old_clb,
+                             std::vector<AtomBlockId>& old_clb_atoms,
                              t_lb_router_data*& router_data);
 
 /**