non-static member variable in CentroidMoveGenerator

Author: soheilshahrouz

vpr/src/place/centroid_move_generator.cpp

@@ -7,14 +7,6 @@
 
 #include <queue>
 
-
-// Static member variable definitions
-vtr::vector<NocGroupId, std::vector<ClusterBlockId>> CentroidMoveGenerator::noc_group_clusters_;
-vtr::vector<NocGroupId, std::vector<ClusterBlockId>> CentroidMoveGenerator::noc_group_routers_;
-vtr::vector<ClusterBlockId, NocGroupId> CentroidMoveGenerator::cluster_to_noc_grp_;
-std::map<ClusterBlockId, NocGroupId> CentroidMoveGenerator::noc_router_to_noc_group_;
-
-
 CentroidMoveGenerator::CentroidMoveGenerator(PlacerState& placer_state,
                                              e_reward_function reward_function)
     : MoveGenerator(placer_state, reward_function)
@@ -31,14 +23,7 @@ CentroidMoveGenerator::CentroidMoveGenerator(PlacerState& placer_state,
     , noc_attraction_enabled_(true) {
     VTR_ASSERT(noc_attraction_weight > 0.0 && noc_attraction_weight <= 1.0);
 
-
-    // check if static member variables are already initialized
-    if (!noc_group_clusters_.empty() && !noc_group_routers_.empty() &&
-        !cluster_to_noc_grp_.empty() && !noc_router_to_noc_group_.empty()) {
-        return;
-    } else {
-        initialize_noc_groups(high_fanout_net);
-    }
+    initialize_noc_groups(high_fanout_net);
 }
 
 e_create_move CentroidMoveGenerator::propose_move(t_pl_blocks_to_be_moved& blocks_affected,
@@ -105,11 +90,11 @@ e_create_move CentroidMoveGenerator::propose_move(t_pl_blocks_to_be_moved& block
 }
 
 const std::vector<ClusterBlockId>& CentroidMoveGenerator::get_noc_group_routers(NocGroupId noc_grp_id) {
-    return CentroidMoveGenerator::noc_group_routers_[noc_grp_id];
+    return noc_group_routers_[noc_grp_id];
 }
 
 NocGroupId CentroidMoveGenerator::get_cluster_noc_group(ClusterBlockId blk_id) {
-    return CentroidMoveGenerator::cluster_to_noc_grp_[blk_id];
+    return cluster_to_noc_grp_[blk_id];
 }
 
 void CentroidMoveGenerator::initialize_noc_groups(size_t high_fanout_net) {

vpr/src/place/centroid_move_generator.h

@@ -58,15 +58,15 @@ class CentroidMoveGenerator : public MoveGenerator {
      * @param noc_grp_id The NoC group ID whose NoC routers are requested.
      * @return The clustered block ID of all NoC routers in the given NoC group.
      */
-    static const std::vector<ClusterBlockId>& get_noc_group_routers(NocGroupId noc_grp_id);
+    const std::vector<ClusterBlockId>& get_noc_group_routers(NocGroupId noc_grp_id);
 
     /**
      * Returns the NoC group ID of clustered block.
      * @param blk_id The clustered block whose NoC group ID is requested.
      * @return The NoC group ID of the given clustered block or INVALID if
      * the given clustered block does not belong to any NoC groups.
      */
-    static NocGroupId get_cluster_noc_group(ClusterBlockId blk_id);
+    NocGroupId get_cluster_noc_group(ClusterBlockId blk_id);
 
   private:
     e_create_move propose_move(t_pl_blocks_to_be_moved& blocks_affected,
@@ -112,20 +112,20 @@ class CentroidMoveGenerator : public MoveGenerator {
     bool noc_attraction_enabled_;
 
     /** Stores the ids of all non-router clustered blocks for each NoC group*/
-    static vtr::vector<NocGroupId, std::vector<ClusterBlockId>> noc_group_clusters_;
+    vtr::vector<NocGroupId, std::vector<ClusterBlockId>> noc_group_clusters_;
 
     /** Stores NoC routers in each NoC group*/
-    static vtr::vector<NocGroupId, std::vector<ClusterBlockId>> noc_group_routers_;
+    vtr::vector<NocGroupId, std::vector<ClusterBlockId>> noc_group_routers_;
 
     /** Specifies the NoC group that each block belongs to. A block cannot belong to more
      * than one NoC because this means those NoC groups can reach each other and form
      * a single NoC group. We use NocGroupId::INVALID to show that a block does not belong
      * to any NoC groups. This happens when a block is not reachable from any NoC router.
      * */
-    static vtr::vector<ClusterBlockId, NocGroupId> cluster_to_noc_grp_;
+    vtr::vector<ClusterBlockId, NocGroupId> cluster_to_noc_grp_;
 
     /** Specifies the NoC group for each NoC router*/
-    static std::map<ClusterBlockId, NocGroupId> noc_router_to_noc_group_;
+    std::map<ClusterBlockId, NocGroupId> noc_router_to_noc_group_;
 
     /**
      * @brief This function forms NoC groups by finding connected components
@@ -135,7 +135,7 @@ class CentroidMoveGenerator : public MoveGenerator {
      * @param high_fanout_net All nets with a fanout larger than this number are
      * ignored when forming NoC groups.
      */
-    static void initialize_noc_groups(size_t high_fanout_net);
+    void initialize_noc_groups(size_t high_fanout_net);
 };
 
 #endif