[SQUASH ME] Removed helper context

Author: AlexandreSinger

vpr/src/base/vpr_api.cpp

@@ -360,9 +360,7 @@ 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_cl_helper();
     auto& device_ctx = g_vpr_ctx.mutable_device();
-    helper_ctx.lb_type_rr_graphs = vpr_setup->PackerRRGraph;
     device_ctx.pad_loc_type = vpr_setup->PlacerOpts.pad_loc_type;
 }
 
@@ -687,7 +685,9 @@ bool vpr_pack(t_vpr_setup& vpr_setup, const t_arch& arch) {
 
     return try_pack(&vpr_setup.PackerOpts, &vpr_setup.AnalysisOpts,
                     &arch, vpr_setup.user_models,
-                    vpr_setup.library_models, inter_cluster_delay);
+                    vpr_setup.library_models,
+                    vpr_setup.PackerRRGraph,
+                    inter_cluster_delay);
 }
 
 void vpr_load_packing(t_vpr_setup& vpr_setup, const t_arch& arch) {

vpr/src/base/vpr_context.h

@@ -300,20 +300,6 @@ struct ClusteringContext : public Context {
     vtr::vector<ClusterBlockId, std::unordered_set<AtomBlockId>> atoms_lookup;
 };
 
-/**
- * @brief State relating to helper data structure using in the clustering stage
- *
- * This should contain helper data structures that are useful in the clustering/packing stage.
- * They are encapsulated here as they are useful in clustering and reclustering algorithms that may be used
- * in packing or placement stages.
- */
-struct ClusteringHelperContext : public Context {
-    // A vector of routing resource nodes within each of logic cluster_ctx.blocks types [1 .. num_logical_block_type-1]
-    // FIXME: This is only used for a handoff between the vpr_setup and the packer.
-    //        This can be made cleaner.
-    std::vector<t_lb_type_rr_node>* lb_type_rr_graphs;
-};
-
 /**
  * @brief State relating to packing multithreading
  *
@@ -691,9 +677,6 @@ class VprContext : public Context {
     const ClusteringContext& clustering() const { return clustering_; }
     ClusteringContext& mutable_clustering() { return clustering_; }
 
-    const ClusteringHelperContext& cl_helper() const { return helper_; }
-    ClusteringHelperContext& mutable_cl_helper() { return helper_; }
-
     const PlacementContext& placement() const { return placement_; }
     PlacementContext& mutable_placement() { return placement_; }
 
@@ -723,8 +706,6 @@ class VprContext : public Context {
     PowerContext power_;
 
     ClusteringContext clustering_;
-    ClusteringHelperContext helper_;
-
     PlacementContext placement_;
     RoutingContext routing_;
     FloorplanningContext constraints_;

vpr/src/pack/pack.cpp

@@ -35,9 +35,9 @@ bool try_pack(t_packer_opts* packer_opts,
               const t_arch* arch,
               const t_model* user_models,
               const t_model* library_models,
+              std::vector<t_lb_type_rr_node>* lb_type_rr_graphs,
               float interc_delay) {
     const AtomContext& atom_ctx = g_vpr_ctx.atom();
-    ClusteringHelperContext& helper_ctx = g_vpr_ctx.mutable_cl_helper();
     const DeviceContext& device_ctx = g_vpr_ctx.device();
 
     std::unordered_set<AtomNetId> is_clock, is_global;
@@ -112,7 +112,7 @@ bool try_pack(t_packer_opts* packer_opts,
     ClusterLegalizer cluster_legalizer(atom_ctx.nlist,
                                        prepacker,
                                        device_ctx.logical_block_types,
-                                       helper_ctx.lb_type_rr_graphs,
+                                       lb_type_rr_graphs,
                                        num_models,
                                        packer_opts->target_external_pin_util,
                                        high_fanout_thresholds,

vpr/src/pack/pack.h

@@ -2,10 +2,12 @@
 #define PACK_H
 
 #include <unordered_set>
+#include <vector>
 
 class AtomNetId;
 struct t_analysis_opts;
 struct t_arch;
+struct t_lb_type_rr_node;
 struct t_model;
 struct t_packer_opts;
 
@@ -14,6 +16,7 @@ bool try_pack(t_packer_opts* packer_opts,
               const t_arch* arch,
               const t_model* user_models,
               const t_model* library_models,
+              std::vector<t_lb_type_rr_node>* lb_type_rr_graphs,
               float interc_delay);
 
 float get_arch_switch_info(short switch_index, int switch_fanin, float& Tdel_switch, float& R_switch, float& Cout_switch);

vpr/src/pack/re_cluster_util.cpp

@@ -56,9 +56,9 @@ void remove_mol_from_cluster(const t_pack_molecule* molecule,
                              int molecule_size,
                              ClusterBlockId& old_clb,
                              std::unordered_set<AtomBlockId>& old_clb_atoms,
-                             bool router_data_ready,
-                             t_lb_router_data*& router_data) {
-    auto& helper_ctx = g_vpr_ctx.mutable_cl_helper();
+                             bool /*router_data_ready*/,
+                             t_lb_router_data*& /*router_data*/) {
+    // auto& helper_ctx = g_vpr_ctx.mutable_cl_helper();
 
     for (int i_atom = 0; i_atom < molecule_size; i_atom++) {
         if (molecule->atom_block_ids[i_atom]) {
@@ -69,8 +69,10 @@ void remove_mol_from_cluster(const t_pack_molecule* molecule,
     }
 
     //re-build router_data structure for this cluster
+    /*
     if (!router_data_ready)
         router_data = lb_load_router_data(helper_ctx.lb_type_rr_graphs, old_clb, old_clb_atoms);
+    */
 
     update_cluster_pb_stats(molecule, molecule_size, old_clb, false);
 }
@@ -127,7 +129,7 @@ bool start_new_cluster_for_mol(t_pack_molecule* molecule,
                                int /*force_site*/) {
     auto& atom_ctx = g_vpr_ctx.atom();
     auto& floorplanning_ctx = g_vpr_ctx.mutable_floorplanning();
-    auto& helper_ctx = g_vpr_ctx.mutable_cl_helper();
+    // auto& helper_ctx = g_vpr_ctx.mutable_cl_helper();
     auto& cluster_ctx = g_vpr_ctx.mutable_clustering();
 
     /* Cluster's PartitionRegion is empty initially, meaning it has no floorplanning constraints */
@@ -146,7 +148,7 @@ bool start_new_cluster_for_mol(t_pack_molecule* molecule,
     // alloc_and_load_pb_stats(pb, feasible_block_array_size);
     pb->parent_pb = nullptr;
 
-    *router_data = alloc_and_load_router_data(&(helper_ctx.lb_type_rr_graphs[type->index]), type);
+    // *router_data = alloc_and_load_router_data(&(helper_ctx.lb_type_rr_graphs[type->index]), type);
 
     e_block_pack_status pack_result = e_block_pack_status::BLK_STATUS_UNDEFINED;
     pb->mode = mode;
@@ -229,7 +231,7 @@ bool pack_mol_in_existing_cluster(t_pack_molecule* molecule,
                                   bool /*enable_pin_feasibility_filter*/,
                                   int /*force_site*/) {
 
-    auto& helper_ctx = g_vpr_ctx.mutable_cl_helper();
+    // auto& helper_ctx = g_vpr_ctx.mutable_cl_helper();
     auto& cluster_ctx = g_vpr_ctx.mutable_clustering();
 
     // NocGroupId temp_cluster_noc_grp_id;
@@ -247,7 +249,7 @@ bool pack_mol_in_existing_cluster(t_pack_molecule* molecule,
     */
 
     //re-build router_data structure for this cluster
-    router_data = lb_load_router_data(helper_ctx.lb_type_rr_graphs, new_clb, new_clb_atoms);
+    // router_data = lb_load_router_data(helper_ctx.lb_type_rr_graphs, new_clb, new_clb_atoms);
 
     /*
     pack_result = try_pack_molecule(nullptr, // &(helper_ctx.cluster_placement_stats[block_type->index]),