Refactoring clustering/packing code and building re-cluster API

vpr/src/base/read_netlist.cpp

@@ -60,7 +60,6 @@ static size_t mark_constant_generators_rec(const t_pb* pb, const t_pb_routes& pb
 static t_pb_routes alloc_pb_route(t_pb_graph_node* pb_graph_node);
 
 static void load_atom_pin_mapping(const ClusteredNetlist& clb_nlist);
-static void set_atom_pin_mapping(const ClusteredNetlist& clb_nlist, const AtomBlockId atom_blk, const AtomPortId atom_port, const t_pb_graph_pin* gpin);
 
 /**
  * @brief Initializes the clb_nlist with info from a netlist
@@ -1219,7 +1218,7 @@ static void load_atom_pin_mapping(const ClusteredNetlist& clb_nlist) {
     }
 }
 
-static void set_atom_pin_mapping(const ClusteredNetlist& clb_nlist, const AtomBlockId atom_blk, const AtomPortId atom_port, const t_pb_graph_pin* gpin) {
+void set_atom_pin_mapping(const ClusteredNetlist& clb_nlist, const AtomBlockId atom_blk, const AtomPortId atom_port, const t_pb_graph_pin* gpin) {
     auto& atom_ctx = g_vpr_ctx.mutable_atom();
 
     VTR_ASSERT(atom_ctx.nlist.port_block(atom_port) == atom_blk);

vpr/src/base/read_netlist.h

@@ -17,4 +17,9 @@ ClusteredNetlist read_netlist(const char* net_file,
                               bool verify_file_digests,
                               int verbosity);
 
+void set_atom_pin_mapping(const ClusteredNetlist& clb_nlist,
+                          const AtomBlockId atom_blk,
+                          const AtomPortId atom_port,
+                          const t_pb_graph_pin* gpin);
+
 #endif

vpr/src/base/vpr_api.cpp

@@ -348,6 +348,9 @@ void vpr_init_with_options(const t_options* options, t_vpr_setup* vpr_setup, t_a
     }
 
     fflush(stdout);
+
+    auto& helper_ctx = g_vpr_ctx.mutable_helper();
+    helper_ctx.lb_type_rr_graphs = vpr_setup->PackerRRGraph;
 }
 
 bool vpr_flow(t_vpr_setup& vpr_setup, t_arch& arch) {
@@ -382,6 +385,14 @@ bool vpr_flow(t_vpr_setup& vpr_setup, t_arch& arch) {
     { //Analysis
         vpr_analysis_flow(vpr_setup, arch, route_status);
     }
+
+    //clean packing-placement data
+    if (vpr_setup.PackerOpts.doPacking == STAGE_DO) {
+        auto& helper_ctx = g_vpr_ctx.mutable_helper();
+        free_cluster_placement_stats(helper_ctx.cluster_placement_stats);
+    }
+
+    //close the graphics
     vpr_close_graphics(vpr_setup);
 
     return route_status.success();

vpr/src/base/vpr_context.h

@@ -55,12 +55,18 @@ struct AtomContext : public Context {
     /********************************************************************
      * Atom Netlist
      ********************************************************************/
-
+    AtomContext()
+        : list_of_pack_molecules(nullptr, free_pack_molecules) {}
     ///@brief Atom netlist
     AtomNetlist nlist;
 
     ///@brief Mappings to/from the Atom Netlist to physically described .blif models
     AtomLookup lookup;
+
+    ///@brief The molecules associated with each atom block
+    std::multimap<AtomBlockId, t_pack_molecule*> atom_molecules;
+
+    std::unique_ptr<t_pack_molecule, decltype(&free_pack_molecules)> list_of_pack_molecules;
 };
 
 /**
@@ -259,6 +265,26 @@ struct ClusteringContext : public Context {
      */
     std::map<ClusterBlockId, std::map<int, ClusterNetId>> post_routing_clb_pin_nets;
     std::map<ClusterBlockId, std::map<int, int>> pre_routing_net_pin_mapping;
+
+    std::map<t_logical_block_type_ptr, size_t> num_used_type_instances;
+};
+
+struct ClusteringHelperContext : public Context {
+    std::map<t_logical_block_type_ptr, size_t> num_used_type_instances;
+    t_cluster_placement_stats* cluster_placement_stats;
+    int num_models;
+    int max_cluster_size;
+    t_pb_graph_node** primitives_list;
+
+    bool enable_pin_feasibility_filter;
+    int feasible_block_array_size;
+
+    int total_clb_num;
+    std::vector<t_lb_type_rr_node>* lb_type_rr_graphs;
+
+    ~ClusteringHelperContext() {
+        free(primitives_list);
+    }
 };
 
 /**
@@ -446,6 +472,9 @@ class VprContext : public Context {
     const ClusteringContext& clustering() const { return clustering_; }
     ClusteringContext& mutable_clustering() { return clustering_; }
 
+    const ClusteringHelperContext& helper() const { return helper_; }
+    ClusteringHelperContext& mutable_helper() { return helper_; }
+
     const PlacementContext& placement() const { return placement_; }
     PlacementContext& mutable_placement() { return placement_; }
 
@@ -464,6 +493,8 @@ class VprContext : public Context {
     PowerContext power_;
 
     ClusteringContext clustering_;
+    ClusteringHelperContext helper_;
+
     PlacementContext placement_;
     RoutingContext routing_;
     FloorplanningContext constraints_;

vpr/src/base/vpr_types.cpp

@@ -1,5 +1,6 @@
 #include <cmath>
 #include "vpr_types.h"
+#include "globals.h"
 
 t_ext_pin_util_targets::t_ext_pin_util_targets(float default_in_util, float default_out_util) {
     defaults_.input_pin_util = default_in_util;
@@ -213,3 +214,53 @@ BitIndex t_pb::atom_pin_bit_index(const t_pb_graph_pin* gpin) const {
 void t_pb::set_atom_pin_bit_index(const t_pb_graph_pin* gpin, BitIndex atom_pin_bit_idx) {
     pin_rotations_[gpin] = atom_pin_bit_idx;
 }
+
+void free_pack_molecules(t_pack_molecule* list_of_pack_molecules) {
+    t_pack_molecule* cur_pack_molecule = list_of_pack_molecules;
+    while (cur_pack_molecule != nullptr) {
+        cur_pack_molecule = list_of_pack_molecules->next;
+        delete list_of_pack_molecules;
+        list_of_pack_molecules = cur_pack_molecule;
+    }
+}
+
+/**
+ * Free linked lists found in cluster_placement_stats_list
+ */
+void free_cluster_placement_stats(t_cluster_placement_stats* cluster_placement_stats_list) {
+    t_cluster_placement_primitive *cur, *next;
+    auto& device_ctx = g_vpr_ctx.device();
+
+    for (const auto& type : device_ctx.logical_block_types) {
+        int index = type.index;
+        cur = cluster_placement_stats_list[index].tried;
+        while (cur != nullptr) {
+            next = cur->next_primitive;
+            free(cur);
+            cur = next;
+        }
+        cur = cluster_placement_stats_list[index].in_flight;
+        while (cur != nullptr) {
+            next = cur->next_primitive;
+            free(cur);
+            cur = next;
+        }
+        cur = cluster_placement_stats_list[index].invalid;
+        while (cur != nullptr) {
+            next = cur->next_primitive;
+            free(cur);
+            cur = next;
+        }
+        for (int j = 0; j < cluster_placement_stats_list[index].num_pb_types; j++) {
+            cur = cluster_placement_stats_list[index].valid_primitives[j]->next_primitive;
+            while (cur != nullptr) {
+                next = cur->next_primitive;
+                free(cur);
+                cur = next;
+            }
+            free(cluster_placement_stats_list[index].valid_primitives[j]);
+        }
+        free(cluster_placement_stats_list[index].valid_primitives);
+    }
+    free(cluster_placement_stats_list);
+}

vpr/src/base/vpr_types.h

@@ -1654,4 +1654,9 @@ class RouteStatus {
 
 typedef vtr::vector<ClusterBlockId, std::vector<std::vector<int>>> t_clb_opins_used; //[0..num_blocks-1][0..class-1][0..used_pins-1]
 
+typedef std::vector<std::map<int, int>> t_arch_switch_fanin;
+
+void free_pack_molecules(t_pack_molecule* list_of_pack_molecules);
+void free_cluster_placement_stats(t_cluster_placement_stats* cluster_placement_stats);
+
 #endif