Fix minor styling issues

AmirhosseinPoolad · AmirhosseinPoolad · commit dfb6462b22b4 · 2025-03-18T20:38:07.000-04:00
diff --git a/vpr/src/base/atom_lookup.h b/vpr/src/base/atom_lookup.h
@@ -31,7 +31,6 @@ class AtomLookup {
      * PBs
      */
 
-
     /**
      * @brief Sets the atom to pb bimap access lock to value.
      * If set to true, access to the bimap is prohibited and will result in failing assertions.
@@ -41,11 +40,10 @@ class AtomLookup {
     inline void set_atom_pb_bimap_lock(bool value) {
         VTR_ASSERT_SAFE_MSG(lock_atom_pb_bimap_ != value, "Double locking or unlocking the atom pb bimap lock");
         lock_atom_pb_bimap_ = value;
-      }
-    
-    /// @brief Gets the current atom to pb bimap lock value.
-    inline bool atom_pb_bimap_islocked() const {return lock_atom_pb_bimap_;}
+    }
 
+    /// @brief Gets the current atom to pb bimap lock value.
+    inline bool atom_pb_bimap_islocked() const { return lock_atom_pb_bimap_; }
 
     // All accesses, mutable or immutable, to the atom to pb bimap
     // will result in failing assertions if the lock is set to true.
@@ -55,18 +53,24 @@ class AtomLookup {
 
     /// @brief Returns a mutable reference to the atom to pb bimap, provided that access to it is unlocked. It will result in a crash otherwise.
     /// @return Mutable reference to the atom pb bimap.
-    inline AtomPBBimap &mutable_atom_pb_bimap() {VTR_ASSERT(!lock_atom_pb_bimap_); return atom_to_pb_bimap_;}
+    inline AtomPBBimap& mutable_atom_pb_bimap() {
+        VTR_ASSERT(!lock_atom_pb_bimap_);
+        return atom_to_pb_bimap_;
+    }
 
     /// @brief Returns an immutable reference to the atom to pb bimap, provided that access to it is unlocked. It will result in a crash otherwise.
     /// @return Immutable reference to the atom pb bimap.
-    inline const AtomPBBimap &atom_pb_bimap() const {VTR_ASSERT(!lock_atom_pb_bimap_); return atom_to_pb_bimap_;}
+    inline const AtomPBBimap& atom_pb_bimap() const {
+        VTR_ASSERT(!lock_atom_pb_bimap_);
+        return atom_to_pb_bimap_;
+    }
 
     /**
      * @brief Set atom to pb bimap
      * 
      * @param atom_to_pb Reference to AtomPBBimab to be copied from
      */
-    void set_atom_to_pb_bimap(const AtomPBBimap& atom_to_pb){atom_to_pb_bimap_ = atom_to_pb;}
+    void set_atom_to_pb_bimap(const AtomPBBimap& atom_to_pb) { atom_to_pb_bimap_ = atom_to_pb; }
 
     /*
      * PB Pins
@@ -131,11 +135,10 @@ class AtomLookup {
 
   private: //Types
   private:
-    
-  /**
-   * @brief Allows or disallows access to the AtomPBBimap data.
-   * Useful to make sure global context is not accessed in places you don't want it to.
-   */  
+    /**
+     * @brief Allows or disallows access to the AtomPBBimap data.
+     * Useful to make sure global context is not accessed in places you don't want it to.
+     */
     bool lock_atom_pb_bimap_ = false;
     AtomPBBimap atom_to_pb_bimap_;
 
diff --git a/vpr/src/pack/atom_pb_bimap.h b/vpr/src/pack/atom_pb_bimap.h
@@ -23,10 +23,9 @@ class t_pb_graph_node;
  *        Used in the global AtomLookup context and in ClusterLegalizer
  */
 class AtomPBBimap {
-    public:
+  public:
     AtomPBBimap() = default;
-    AtomPBBimap(const vtr::bimap<AtomBlockId, const t_pb*, vtr::linear_map, std::unordered_map> &atom_to_pb);
-
+    AtomPBBimap(const vtr::bimap<AtomBlockId, const t_pb*, vtr::linear_map, std::unordered_map>& atom_to_pb);
 
     /**
      * @brief Returns the leaf pb associated with the atom blk_id
@@ -53,7 +52,7 @@ class AtomPBBimap {
     /// @brief Returns if the bimap is empty
     bool is_empty() const;
 
-    private:
-        /// @brief Two way map between AtomBlockIds and t_pb
-        vtr::bimap<AtomBlockId, const t_pb*, vtr::linear_map, std::unordered_map> atom_to_pb_;
-    };
+  private:
+    /// @brief Two way map between AtomBlockIds and t_pb
+    vtr::bimap<AtomBlockId, const t_pb*, vtr::linear_map, std::unordered_map> atom_to_pb_;
+};
diff --git a/vpr/src/pack/cluster_legalizer.cpp b/vpr/src/pack/cluster_legalizer.cpp
@@ -45,7 +45,7 @@
  */
 static void alloc_and_load_pb_stats(t_pb* pb) {
     /* Call this routine when starting to fill up a new cluster.  It resets *
-    * the gain vector, etc.                                                */
+     * the gain vector, etc.                                                */
 
     pb->pb_stats = new t_pb_stats;
 
@@ -61,7 +61,7 @@ static void alloc_and_load_pb_stats(t_pb* pb) {
  * @brief Check the atom blocks of a cluster pb. Used in the verify method.
  */
 /* TODO: May want to check that all atom blocks are actually reached */
-static void check_cluster_atom_blocks(t_pb* pb, std::unordered_set<AtomBlockId>& blocks_checked, const AtomPBBimap &atom_pb_lookup) {
+static void check_cluster_atom_blocks(t_pb* pb, std::unordered_set<AtomBlockId>& blocks_checked, const AtomPBBimap& atom_pb_lookup) {
     const AtomContext& atom_ctx = g_vpr_ctx.atom();
 
     const t_pb_type* pb_type = pb->pb_graph_node->pb_type;
@@ -191,7 +191,7 @@ static bool check_cluster_floorplanning(AtomBlockId atom_blk_id,
     VTR_LOGV(log_verbosity > 3,
              "\t\t\t Intersect: Atom block %d passed cluster, cluster PR was updated with intersection result \n",
              atom_blk_id);
-return true;
+    return true;
 }
 
 /**
@@ -390,8 +390,8 @@ static bool primitive_memory_sibling_feasible(const AtomBlockId blk_id, const t_
 }
 
 /*
-* @brief Check if the given atom is feasible in the given pb.
-*/
+ * @brief Check if the given atom is feasible in the given pb.
+ */
 static bool primitive_feasible(const AtomBlockId blk_id, t_pb* cur_pb, const AtomPBBimap& atom_to_pb) {
     const t_pb_type* cur_pb_type = cur_pb->pb_graph_node->pb_type;
 
@@ -408,7 +408,7 @@ static bool primitive_feasible(const AtomBlockId blk_id, t_pb* cur_pb, const Ato
          *   - all siblings must share all nets, including open nets, with the exception of data nets */
 
         /* find sibling if one exists */
-        const t_pb *sibling_memory_pb = find_memory_sibling(cur_pb);
+        const t_pb* sibling_memory_pb = find_memory_sibling(cur_pb);
         AtomBlockId sibling_memory_blk_id = atom_to_pb.pb_atom(sibling_memory_pb);
 
         if (sibling_memory_blk_id) {
@@ -429,17 +429,17 @@ static bool primitive_feasible(const AtomBlockId blk_id, t_pb* cur_pb, const Ato
  */
 static enum e_block_pack_status
 try_place_atom_block_rec(const t_pb_graph_node* pb_graph_node,
-                        const AtomBlockId blk_id,
-                        t_pb* cb,
-                        t_pb** parent,
-                        const LegalizationClusterId cluster_id,
-                        vtr::vector_map<AtomBlockId, LegalizationClusterId>& atom_cluster,
-                        const PackMoleculeId molecule_id,
-                        t_lb_router_data* router_data,
-                        int verbosity,
-                        const Prepacker& prepacker,
-                        const vtr::vector_map<MoleculeChainId, t_clustering_chain_info>& clustering_chain_info,
-                        AtomPBBimap& atom_to_pb) {
+                         const AtomBlockId blk_id,
+                         t_pb* cb,
+                         t_pb** parent,
+                         const LegalizationClusterId cluster_id,
+                         vtr::vector_map<AtomBlockId, LegalizationClusterId>& atom_cluster,
+                         const PackMoleculeId molecule_id,
+                         t_lb_router_data* router_data,
+                         int verbosity,
+                         const Prepacker& prepacker,
+                         const vtr::vector_map<MoleculeChainId, t_clustering_chain_info>& clustering_chain_info,
+                         AtomPBBimap& atom_to_pb) {
     const AtomContext& atom_ctx = g_vpr_ctx.atom();
 
     VTR_ASSERT_SAFE(cb != nullptr);
@@ -450,11 +450,11 @@ try_place_atom_block_rec(const t_pb_graph_node* pb_graph_node,
     if (pb_graph_node->parent_pb_graph_node != cb->pb_graph_node) {
         t_pb* my_parent = nullptr;
         block_pack_status = try_place_atom_block_rec(pb_graph_node->parent_pb_graph_node, blk_id, cb,
-                                                    &my_parent, cluster_id,
-                                                    atom_cluster,
-                                                    molecule_id, router_data,
-                                                    verbosity,
-                                                    prepacker, clustering_chain_info, atom_to_pb);
+                                                     &my_parent, cluster_id,
+                                                     atom_cluster,
+                                                     molecule_id, router_data,
+                                                     verbosity,
+                                                     prepacker, clustering_chain_info, atom_to_pb);
         parent_pb = my_parent;
     } else {
         parent_pb = cb;
@@ -543,10 +543,10 @@ try_place_atom_block_rec(const t_pb_graph_node* pb_graph_node,
                 VTR_ASSERT(molecule.chain_id.is_valid());
                 const t_chain_info& prepack_chain_info = prepacker.get_molecule_chain_info(molecule.chain_id);
                 block_pack_status = check_chain_root_placement_feasibility(pb_graph_node,
-                                                                        prepack_chain_info,
-                                                                        clustering_chain_info[molecule.chain_id],
-                                                                        molecule.pack_pattern,
-                                                                        blk_id);
+                                                                           prepack_chain_info,
+                                                                           clustering_chain_info[molecule.chain_id],
+                                                                           molecule.pack_pattern,
+                                                                           blk_id);
             }
         }
 
@@ -629,7 +629,7 @@ static int net_sinks_reachable_in_cluster(const t_pb_graph_pin* driver_pb_gpin,
 
 /**
  * @brief Returns the pb_graph_pin of the atom pin defined by the driver_pin_id in the driver_pb
-*/
+ */
 static t_pb_graph_pin* get_driver_pb_graph_pin(const t_pb* driver_pb, const AtomPinId driver_pin_id) {
     const AtomNetlist& atom_netlist = g_vpr_ctx.atom().netlist();
 
@@ -792,8 +792,8 @@ static void compute_and_mark_lookahead_pins_used_for_pin(const t_pb_graph_pin* p
  * @brief Determine if pins of speculatively packed pb are legal
  */
 static void compute_and_mark_lookahead_pins_used(const AtomBlockId blk_id,
-                                                const vtr::vector_map<AtomBlockId, LegalizationClusterId>& atom_cluster,
-                                                const AtomPBBimap& atom_to_pb) {
+                                                 const vtr::vector_map<AtomBlockId, LegalizationClusterId>& atom_cluster,
+                                                 const AtomPBBimap& atom_to_pb) {
     const AtomNetlist& atom_netlist = g_vpr_ctx.atom().netlist();
 
     const t_pb* cur_pb = atom_to_pb.atom_pb(blk_id);
@@ -1417,7 +1417,7 @@ ClusterLegalizer::start_new_cluster(PackMoleculeId molecule_id,
 
     // Allocate and load the LB router data
     t_lb_router_data* router_data = alloc_and_load_router_data(&lb_type_rr_graphs_[cluster_type->index],
-                                                            cluster_type);
+                                                               cluster_type);
 
     // Allocate and load the cluster's placement stats
     t_intra_cluster_placement_stats* cluster_placement_stats = alloc_and_load_cluster_placement_stats(cluster_type, cluster_mode);
@@ -1468,7 +1468,7 @@ ClusterLegalizer::start_new_cluster(PackMoleculeId molecule_id,
 }
 
 e_block_pack_status ClusterLegalizer::add_mol_to_cluster(PackMoleculeId molecule_id,
-                                                        LegalizationClusterId cluster_id) {
+                                                         LegalizationClusterId cluster_id) {
     // Safety asserts to make sure the inputs are valid.
     VTR_ASSERT_SAFE(cluster_id.is_valid() && (size_t)cluster_id < legalization_clusters_.size());
     VTR_ASSERT(legalization_cluster_ids_[cluster_id].is_valid() && "Cannot add to a destroyed cluster");
diff --git a/vpr/src/pack/cluster_legalizer.h b/vpr/src/pack/cluster_legalizer.h
@@ -514,8 +514,8 @@ class ClusterLegalizer {
         log_verbosity_ = verbosity;
     }
 
-    inline const AtomPBBimap &atom_pb_lookup() const {return atom_pb_lookup_;}
-    inline AtomPBBimap &mutable_atom_pb_lookup() {return atom_pb_lookup_;}
+    inline const AtomPBBimap& atom_pb_lookup() const { return atom_pb_lookup_; }
+    inline AtomPBBimap& mutable_atom_pb_lookup() { return atom_pb_lookup_; }
 
     /// @brief Destructor of the class. Frees allocated data.
     ~ClusterLegalizer();
@@ -588,5 +588,4 @@ class ClusterLegalizer {
     /// @brief A two way map between AtomBlockIds and pb types. This is a copy
     /// of the AtomPBBimap in the global context's AtomLookup
     AtomPBBimap atom_pb_lookup_;
-
 };
diff --git a/vpr/src/pack/cluster_router.cpp b/vpr/src/pack/cluster_router.cpp
@@ -75,10 +75,10 @@ class reservable_pq : public std::priority_queue<T, U, V> {
  ******************************************************************************************/
 static void free_lb_net_rt(t_lb_trace* lb_trace);
 static void free_lb_trace(t_lb_trace* lb_trace);
-static void add_pin_to_rt_terminals(t_lb_router_data* router_data, const AtomPinId pin_id, const AtomPBBimap &atom_to_pb);
-static void remove_pin_from_rt_terminals(t_lb_router_data* router_data, const AtomPinId pin_id, const AtomPBBimap &atom_to_pb);
+static void add_pin_to_rt_terminals(t_lb_router_data* router_data, const AtomPinId pin_id, const AtomPBBimap& atom_to_pb);
+static void remove_pin_from_rt_terminals(t_lb_router_data* router_data, const AtomPinId pin_id, const AtomPBBimap& atom_to_pb);
 
-static void fix_duplicate_equivalent_pins(t_lb_router_data* router_data, const AtomPBBimap &atom_to_pb);
+static void fix_duplicate_equivalent_pins(t_lb_router_data* router_data, const AtomPBBimap& atom_to_pb);
 
 static void commit_remove_rt(t_lb_trace* rt, t_lb_router_data* router_data, e_commit_remove op, std::unordered_map<const t_pb_graph_node*, const t_mode*>* mode_map, t_mode_selection_status* mode_status);
 static bool is_skip_route_net(t_lb_trace* rt, t_lb_router_data* router_data);
@@ -249,7 +249,7 @@ static bool check_edge_for_route_conflicts(std::unordered_map<const t_pb_graph_n
  ******************************************************************************************/
 
 /* Add pins of netlist atom to to current routing drivers/targets */
-void add_atom_as_target(t_lb_router_data* router_data, const AtomBlockId blk_id, const AtomPBBimap &atom_to_pb) {
+void add_atom_as_target(t_lb_router_data* router_data, const AtomBlockId blk_id, const AtomPBBimap& atom_to_pb) {
     const t_pb* pb;
     auto& atom_ctx = g_vpr_ctx.atom();
 
@@ -275,7 +275,7 @@ void add_atom_as_target(t_lb_router_data* router_data, const AtomBlockId blk_id,
 }
 
 /* Remove pins of netlist atom from current routing drivers/targets */
-void remove_atom_from_target(t_lb_router_data* router_data, const AtomBlockId blk_id, const AtomPBBimap &atom_to_pb) {
+void remove_atom_from_target(t_lb_router_data* router_data, const AtomBlockId blk_id, const AtomPBBimap& atom_to_pb) {
     auto& atom_ctx = g_vpr_ctx.atom();
 
     std::map<AtomBlockId, bool>& atoms_added = *router_data->atoms_added;
@@ -626,7 +626,7 @@ static void free_lb_trace(t_lb_trace* lb_trace) {
 /* Given a pin of a net, assign route tree terminals for it
  * Assumes that pin is not already assigned
  */
-static void add_pin_to_rt_terminals(t_lb_router_data* router_data, const AtomPinId pin_id, const AtomPBBimap &atom_to_pb) {
+static void add_pin_to_rt_terminals(t_lb_router_data* router_data, const AtomPinId pin_id, const AtomPBBimap& atom_to_pb) {
     std::vector<t_intra_lb_net>& lb_nets = *router_data->intra_lb_nets;
     std::vector<t_lb_type_rr_node>& lb_type_graph = *router_data->lb_type_graph;
     t_logical_block_type_ptr lb_type = router_data->lb_type;
@@ -793,7 +793,7 @@ static void add_pin_to_rt_terminals(t_lb_router_data* router_data, const AtomPin
 
 /* Given a pin of a net, remove route tree terminals from it
  */
-static void remove_pin_from_rt_terminals(t_lb_router_data* router_data, const AtomPinId pin_id, const AtomPBBimap &atom_to_pb) {
+static void remove_pin_from_rt_terminals(t_lb_router_data* router_data, const AtomPinId pin_id, const AtomPBBimap& atom_to_pb) {
     std::vector<t_intra_lb_net>& lb_nets = *router_data->intra_lb_nets;
     std::vector<t_lb_type_rr_node>& lb_type_graph = *router_data->lb_type_graph;
     t_logical_block_type_ptr lb_type = router_data->lb_type;
@@ -918,7 +918,7 @@ static void remove_pin_from_rt_terminals(t_lb_router_data* router_data, const At
 //To work around this, we fix all but one of these duplicate connections to route to specific pins,
 //(instead of the common sink). This ensures a legal routing is produced and that the duplicate pins
 //are not 'missing' in the clustered netlist.
-static void fix_duplicate_equivalent_pins(t_lb_router_data* router_data, const AtomPBBimap &atom_to_pb) {
+static void fix_duplicate_equivalent_pins(t_lb_router_data* router_data, const AtomPBBimap& atom_to_pb) {
     auto& atom_ctx = g_vpr_ctx.atom();
 
     std::vector<t_lb_type_rr_node>& lb_type_graph = *router_data->lb_type_graph;
diff --git a/vpr/src/pack/cluster_router.h b/vpr/src/pack/cluster_router.h
@@ -16,8 +16,8 @@ void free_router_data(t_lb_router_data* router_data);
 void free_intra_lb_nets(std::vector<t_intra_lb_net>* intra_lb_nets);
 
 /* Routing Functions */
-void add_atom_as_target(t_lb_router_data* router_data, const AtomBlockId blk_id, const AtomPBBimap &atom_to_pb);
-void remove_atom_from_target(t_lb_router_data* router_data, const AtomBlockId blk_id, const AtomPBBimap &atom_to_pb);
+void add_atom_as_target(t_lb_router_data* router_data, const AtomBlockId blk_id, const AtomPBBimap& atom_to_pb);
+void remove_atom_from_target(t_lb_router_data* router_data, const AtomBlockId blk_id, const AtomPBBimap& atom_to_pb);
 void set_reset_pb_modes(t_lb_router_data* router_data, const t_pb* pb, const bool set);
 bool try_intra_lb_route(t_lb_router_data* router_data, int verbosity, t_mode_selection_status* mode_status);
 void reset_intra_lb_route(t_lb_router_data* router_data);
diff --git a/vpr/src/pack/greedy_candidate_selector.cpp b/vpr/src/pack/greedy_candidate_selector.cpp
@@ -406,8 +406,8 @@ void GreedyCandidateSelector::update_connection_gain_values(
         AtomBlockId blk_id = atom_netlist_.pin_block(pin_id);
         // TODO: Should investigate this. Using the atom pb bimap through is_atom_blk_in_cluster_block
         // in this class is very strange
-        const t_pb *pin_block_pb = cluster_legalizer.atom_pb_lookup().atom_pb(blk_id);
-        const t_pb *cluster_pb = cluster_legalizer.atom_pb_lookup().atom_pb(clustered_blk_id);
+        const t_pb* pin_block_pb = cluster_legalizer.atom_pb_lookup().atom_pb(blk_id);
+        const t_pb* cluster_pb = cluster_legalizer.atom_pb_lookup().atom_pb(clustered_blk_id);
 
         if (cluster_legalizer.get_atom_cluster(blk_id) == legalization_cluster_id && is_pb_in_cluster_pb(pin_block_pb, cluster_pb)) {
             num_internal_connections++;
