Merge pull request #1715 from verilog-to-routing/fix_cluster_constraints_init

Add routine to initialize cluster_constraints data structure in the c…

Author: vaughnbetz

vpr/src/base/vpr_api.cpp

@@ -69,7 +69,10 @@
 #include "cluster.h"
 #include "output_clustering.h"
 #include "vpr_constraints_reader.h"
+#include "place_constraints.h"
+
 #include "vpr_constraints_writer.h"
+
 #include "pack_report.h"
 #include "overuse_report.h"
 
@@ -517,6 +520,8 @@ bool vpr_pack_flow(t_vpr_setup& vpr_setup, const t_arch& arch) {
             VTR_ASSERT(packer_opts.doPacking == STAGE_LOAD);
             //Load a previous packing from the .net file
             vpr_load_packing(vpr_setup, arch);
+            //Load cluster_constraints data structure here since loading pack file
+            load_cluster_constraints();
         }
 
         /* Sanity check the resulting netlist */

vpr/src/place/place_constraints.cpp

@@ -142,3 +142,37 @@ bool cluster_floorplanning_legal(ClusterBlockId blk_id, const t_pl_loc& loc) {
 
     return floorplanning_good;
 }
+
+void load_cluster_constraints() {
+    auto& floorplanning_ctx = g_vpr_ctx.mutable_floorplanning();
+    auto& cluster_ctx = g_vpr_ctx.clustering();
+    ClusterAtomsLookup atoms_lookup;
+
+    floorplanning_ctx.cluster_constraints.resize(cluster_ctx.clb_nlist.blocks().size());
+
+    for (auto cluster_id : cluster_ctx.clb_nlist.blocks()) {
+        std::vector<AtomBlockId> atoms = atoms_lookup.atoms_in_cluster(cluster_id);
+        PartitionRegion empty_pr;
+        floorplanning_ctx.cluster_constraints[cluster_id] = empty_pr;
+
+        //if there are any constrainted atoms in the cluster,
+        //we update the cluster's PartitionRegion
+        for (unsigned int i = 0; i < atoms.size(); i++) {
+            PartitionId partid = floorplanning_ctx.constraints.get_atom_partition(atoms[i]);
+
+            if (partid != PartitionId::INVALID()) {
+                PartitionRegion pr = floorplanning_ctx.constraints.get_partition_pr(partid);
+                if (floorplanning_ctx.cluster_constraints[cluster_id].empty()) {
+                    floorplanning_ctx.cluster_constraints[cluster_id] = pr;
+                } else {
+                    PartitionRegion intersect_pr = intersection(pr, floorplanning_ctx.cluster_constraints[cluster_id]);
+                    if (intersect_pr.empty()) {
+                        VTR_LOG_ERROR("Cluster block %zu has atoms with incompatible floorplan constraints.\n", size_t(cluster_id));
+                    } else {
+                        floorplanning_ctx.cluster_constraints[cluster_id] = intersect_pr;
+                    }
+                }
+            }
+        }
+    }
+}

vpr/src/place/place_constraints.h

@@ -6,6 +6,7 @@
  *      Author: khalid88
  */
 #include "move_transactions.h"
+#include "clustered_netlist_utils.h"
 
 #ifndef VPR_SRC_PLACE_PLACE_CONSTRAINTS_H_
 #    define VPR_SRC_PLACE_PLACE_CONSTRAINTS_H_
@@ -51,4 +52,15 @@ inline bool floorplan_legal(const t_pl_blocks_to_be_moved& blocks_affected) {
     return true;
 }
 
+/*
+ * Load cluster_constraints if the pack stage of VPR is skipped. The cluster_constraints
+ * data structure is normally loaded during packing, so this routine is called when the packing stage is not performed.
+ * If no constraints file is specified, every cluster is assigned
+ * an empty PartitionRegion. If a constraints file is specified, cluster_constraints is loaded according to
+ * the floorplan constraints specified in the file.
+ * Load cluster_constraints according to the floorplan constraints specified in
+ * the constraints XML file.
+ */
+void load_cluster_constraints();
+
 #endif /* VPR_SRC_PLACE_PLACE_CONSTRAINTS_H_ */