Added a lookup for which atoms are in a cluster in clustered_netlist_utils. Use this lookup when writing out constraints XML

Author: sfkhalid

vpr/src/base/clustered_netlist_utils.cpp

@@ -1,4 +1,5 @@
 #include "clustered_netlist_utils.h"
+#include "globals.h"
 ClusteredPinAtomPinsLookup::ClusteredPinAtomPinsLookup(const ClusteredNetlist& clustered_netlist, const AtomNetlist& atom_netlist, const IntraLbPbPinLookup& pb_gpin_lookup) {
     init_lookup(clustered_netlist, atom_netlist, pb_gpin_lookup);
 }
@@ -33,3 +34,25 @@ void ClusteredPinAtomPinsLookup::init_lookup(const ClusteredNetlist& clustered_n
         }
     }
 }
+
+ClusterAtomsLookup::ClusterAtomsLookup() {
+    init_lookup();
+}
+
+void ClusterAtomsLookup::init_lookup() {
+    auto& atom_ctx = g_vpr_ctx.atom();
+    auto& cluster_ctx = g_vpr_ctx.clustering();
+
+    cluster_atoms.resize(cluster_ctx.clb_nlist.blocks().size());
+
+    for (auto atom_blk_id : atom_ctx.nlist.blocks()) {
+        ClusterBlockId clb_index = atom_ctx.lookup.atom_clb(atom_blk_id);
+
+        cluster_atoms[clb_index].push_back(atom_blk_id);
+    }
+}
+
+std::vector<AtomBlockId> ClusterAtomsLookup::atoms_in_cluster(ClusterBlockId blk_id) {
+    std::vector<AtomBlockId> atoms = cluster_atoms[blk_id];
+    return atoms;
+}

vpr/src/base/clustered_netlist_utils.h

@@ -27,4 +27,15 @@ class ClusteredPinAtomPinsLookup {
     vtr::vector<AtomPinId, ClusterPinId> atom_pin_connected_cluster_pin_;
 };
 
+class ClusterAtomsLookup {
+  public:
+    ClusterAtomsLookup();
+    std::vector<AtomBlockId> atoms_in_cluster(ClusterBlockId blk_id);
+
+  private:
+    void init_lookup();
+
+  private:
+    vtr::vector<ClusterBlockId, std::vector<AtomBlockId>> cluster_atoms;
+};
 #endif

vpr/src/base/vpr_constraints_writer.cpp

@@ -13,6 +13,7 @@
 #include "pugixml.hpp"
 #include "pugixml_util.hpp"
 #include "echo_files.h"
+#include "clustered_netlist_utils.h"
 
 #include <fstream>
 #include "vpr_constraints_writer.h"
@@ -39,26 +40,14 @@ void write_vpr_floorplan_constraints(const char* file_name, int expand, bool sub
 }
 
 void setup_vpr_floorplan_constraints(VprConstraints& constraints, int expand, bool subtile) {
-    auto& place_ctx = g_vpr_ctx.placement();
-    auto& atom_ctx = g_vpr_ctx.atom();
     auto& cluster_ctx = g_vpr_ctx.clustering();
-
-    std::map<ClusterBlockId, std::vector<AtomBlockId>> cluster_atoms;
-
-    for (auto blk_id : cluster_ctx.clb_nlist.blocks()) {
-        cluster_atoms.insert({blk_id, std::vector<AtomBlockId>()});
-    }
-
-    for (auto atom_blk_id : atom_ctx.nlist.blocks()) {
-        ClusterBlockId clb_index = atom_ctx.lookup.atom_clb(atom_blk_id);
-
-        cluster_atoms[clb_index].push_back(atom_blk_id);
-    }
+    auto& place_ctx = g_vpr_ctx.placement();
+    ClusterAtomsLookup atoms_lookup;
 
     int part_id = 0;
-    for (auto i = cluster_atoms.begin(); i != cluster_atoms.end(); i++) {
+    for (auto blk_id : cluster_ctx.clb_nlist.blocks()) {
         std::string part_name;
-        part_name = cluster_ctx.clb_nlist.block_name(i->first);
+        part_name = cluster_ctx.clb_nlist.block_name(blk_id);
         PartitionId partid(part_id);
 
         Partition part;
@@ -67,7 +56,7 @@ void setup_vpr_floorplan_constraints(VprConstraints& constraints, int expand, bo
         PartitionRegion pr;
         Region reg;
 
-        auto loc = place_ctx.block_locs[i->first].loc;
+        auto loc = place_ctx.block_locs[blk_id].loc;
 
         reg.set_region_rect(loc.x - expand, loc.y - expand, loc.x + expand, loc.y + expand);
         if (subtile) {
@@ -79,10 +68,11 @@ void setup_vpr_floorplan_constraints(VprConstraints& constraints, int expand, bo
         part.set_part_region(pr);
         constraints.add_partition(part);
 
-        int num_atoms = i->second.size();
+        std::vector<AtomBlockId> atoms = atoms_lookup.atoms_in_cluster(blk_id);
+        int num_atoms = atoms.size();
 
-        for (auto j = 0; j < num_atoms; j++) {
-            AtomBlockId atom_id = i->second[j];
+        for (auto atm = 0; atm < num_atoms; atm++) {
+            AtomBlockId atom_id = atoms[atm];
             constraints.add_constrained_atom(atom_id, partid);
         }
         part_id++;

vpr/src/base/vpr_constraints_writer.h

@@ -16,6 +16,16 @@
 #ifndef VPR_SRC_BASE_VPR_CONSTRAINTS_WRITER_H_
 #define VPR_SRC_BASE_VPR_CONSTRAINTS_WRITER_H_
 
+/**
+ * @brief Write out floorplan constraints to an XML file based on current placement
+ *
+ *   @param file_name   The name of the file that the constraints will be written to
+ *   @param expand      The amount the floorplan region will be expanded around the current
+ *   					x, y location of the block. Ex. if location is (1, 1) and expand = 1,
+ *   					the floorplan region will be from (0, 0) to (2, 2).
+ *   @param subtile     Specifies whether to write out the constraint regions with or without
+ *                      subtile values.
+ */
 void write_vpr_floorplan_constraints(const char* file_name, int expand, bool subtile);
 
 void setup_vpr_floorplan_constraints(VprConstraints& constraints, int expand, bool subtile);