Merge branch 'master' into improve_binary_heap

Author: Nathan Shreve

doc/src/api/vprinternals/router_heap.rst

@@ -14,6 +14,12 @@ HeapInterface
    :project: vpr
    :members:
 
+HeapStorage
+----------
+.. doxygenclass:: HeapStorage
+   :project: vpr
+   :members:
+
 KAryHeap
 ----------
 .. doxygenclass:: KAryHeap

vpr/src/base/vpr_constraints_writer.cpp

@@ -80,9 +80,9 @@ void setup_vpr_floorplan_constraints_one_loc(VprConstraints& constraints, int ex
         part.set_part_region(pr);
         constraints.mutable_place_constraints().add_partition(part);
 
-        std::unordered_set<AtomBlockId>* atoms = cluster_to_atoms(blk_id);
+        const std::unordered_set<AtomBlockId>& atoms = cluster_to_atoms(blk_id);
 
-        for (auto atom_id : *atoms) {
+        for (AtomBlockId atom_id : atoms) {
             constraints.mutable_place_constraints().add_constrained_atom(atom_id, partid);
         }
         part_id++;
@@ -156,7 +156,7 @@ void setup_vpr_floorplan_constraints_cutpoints(VprConstraints& constraints, int
      * appropriate region accordingly
      */
     for (auto blk_id : cluster_ctx.clb_nlist.blocks()) {
-        std::unordered_set<AtomBlockId>* atoms = cluster_to_atoms(blk_id);
+        const std::unordered_set<AtomBlockId>& atoms = cluster_to_atoms(blk_id);
         int x = place_ctx.block_locs[blk_id].loc.x;
         int y = place_ctx.block_locs[blk_id].loc.y;
         int width = device_ctx.grid.width();
@@ -189,7 +189,7 @@ void setup_vpr_floorplan_constraints_cutpoints(VprConstraints& constraints, int
 
         VTR_ASSERT(got != region_atoms.end());
 
-        for (auto atom_id : *atoms) {
+        for (AtomBlockId atom_id : atoms) {
             got->second.push_back(atom_id);
         }
     }

vpr/src/base/vpr_context.h

@@ -520,6 +520,17 @@ struct FloorplanningContext : public Context {
      */
     vtr::vector<ClusterBlockId, PartitionRegion> cluster_constraints;
 
+    /**
+     * @brief Floorplanning constraints in the compressed grid coordinate system.
+     *
+     * Each clustered block has a logical type with a corresponding compressed grid.
+     * Compressed floorplanning constraints are calculated by translating the grid locations
+     * of floorplanning regions to compressed grid locations. To ensure regions do not enlarge:
+     * - The bottom left corner is rounded up to the nearest compressed location.
+     * - The top right corner is rounded down to the nearest compressed location.
+     */
+    vtr::vector<ClusterBlockId, PartitionRegion> compressed_cluster_constraints;
+
     std::vector<Region> overfull_regions;
 };
 

vpr/src/pack/re_cluster.cpp

@@ -37,8 +37,8 @@ bool move_mol_to_new_cluster(t_pack_molecule* molecule,
     }
 
     //remove the molecule from its current cluster
-    std::unordered_set<AtomBlockId>* old_clb_atoms = cluster_to_atoms(old_clb);
-    if (old_clb_atoms->size() == 1) {
+    std::unordered_set<AtomBlockId>& old_clb_atoms = cluster_to_mutable_atoms(old_clb);
+    if (old_clb_atoms.size() == 1) {
         VTR_LOGV(verbosity > 4, "Atom: %zu move failed. This is the last atom in its cluster.\n");
         return false;
     }
@@ -101,17 +101,17 @@ bool move_mol_to_existing_cluster(t_pack_molecule* molecule,
     AtomBlockId root_atom_id = molecule->atom_block_ids[molecule->root];
     int molecule_size = get_array_size_of_molecule(molecule);
     t_lb_router_data* old_router_data = nullptr;
-    std::unordered_set<AtomBlockId>* new_clb_atoms = cluster_to_atoms(new_clb);
+    std::unordered_set<AtomBlockId>& new_clb_atoms = cluster_to_mutable_atoms(new_clb);
     ClusterBlockId old_clb = atom_to_cluster(root_atom_id);
 
-    //check old and new clusters compitability
-    bool is_compitable = check_type_and_mode_compitability(old_clb, new_clb, verbosity);
-    if (!is_compitable)
+    //check old and new clusters compatibility
+    bool is_compatible = check_type_and_mode_compatibility(old_clb, new_clb, verbosity);
+    if (!is_compatible)
         return false;
 
     //remove the molecule from its current cluster
-    std::unordered_set<AtomBlockId>* old_clb_atoms = cluster_to_atoms(old_clb);
-    if (old_clb_atoms->size() == 1) {
+    std::unordered_set<AtomBlockId>& old_clb_atoms = cluster_to_mutable_atoms(old_clb);
+    if (old_clb_atoms.size() == 1) {
         VTR_LOGV(verbosity > 4, "Atom: %zu move failed. This is the last atom in its cluster.\n");
         return false;
     }
@@ -181,19 +181,21 @@ bool swap_two_molecules(t_pack_molecule* molecule_1,
         return false;
     }
     //Check that the old and new clusters are of the same type
-    bool is_compitable = check_type_and_mode_compitability(clb_1, clb_2, verbosity);
+    bool is_compitable = check_type_and_mode_compatibility(clb_1, clb_2, verbosity);
     if (!is_compitable)
         return false;
 
     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::unordered_set<AtomBlockId>* clb_1_atoms = cluster_to_atoms(clb_1);
-    std::unordered_set<AtomBlockId>* clb_2_atoms = cluster_to_atoms(clb_2);
+    std::unordered_set<AtomBlockId>& clb_1_atoms = cluster_to_mutable_atoms(clb_1);
+    std::unordered_set<AtomBlockId>& clb_2_atoms = cluster_to_mutable_atoms(clb_2);
 
-    if (clb_1_atoms->size() == 1 || clb_2_atoms->size() == 1) {
-        VTR_LOGV(verbosity > 4, "Atom: %zu, %zu swap failed. This is the last atom in its cluster.\n", molecule_1->atom_block_ids[molecule_1->root], molecule_2->atom_block_ids[molecule_2->root]);
+    if (clb_1_atoms.size() == 1 || clb_2_atoms.size() == 1) {
+        VTR_LOGV(verbosity > 4, "Atom: %zu, %zu swap failed. This is the last atom in its cluster.\n",
+                 molecule_1->atom_block_ids[molecule_1->root],
+                 molecule_2->atom_block_ids[molecule_2->root]);
         return false;
     }