make member variables of Placer private

Author: soheilshahrouz

vpr/src/place/place.cpp

@@ -97,13 +97,13 @@ void try_place(const Netlist<>& net_list,
     Placer placer(net_list, placer_opts, analysis_opts, noc_opts, directs, place_delay_model, cube_bb);
 
 #ifndef NO_GRAPHICS
-    if (placer.noc_cost_handler_.has_value()) {
-        get_draw_state_vars()->set_noc_link_bandwidth_usages_ref(placer.noc_cost_handler_->get_link_bandwidth_usages());
+    if (placer.noc_cost_handler().has_value()) {
+        get_draw_state_vars()->set_noc_link_bandwidth_usages_ref(placer.noc_cost_handler()->get_link_bandwidth_usages());
     }
 #endif
 
     const int width_fac = placer_opts.place_chan_width;
-    init_draw_coords((float)width_fac, placer.placer_state_.blk_loc_registry());
+    init_draw_coords((float)width_fac, placer.placer_state().blk_loc_registry());
 
     placer.place();
 

vpr/src/place/place_log_util.cpp

@@ -13,7 +13,7 @@ PlacementLogPrinter::PlacementLogPrinter(const Placer& placer)
     : placer_(placer) {}
 
 void PlacementLogPrinter::print_place_status_header() const {
-    const bool noc_enabled = placer_.noc_opts_.noc;
+    const bool noc_enabled = placer_.noc_opts().noc;
 
     VTR_LOG("\n");
     if (!noc_enabled) {
@@ -38,16 +38,18 @@ void PlacementLogPrinter::print_place_status_header() const {
 }
 
 void PlacementLogPrinter::print_place_status(float elapsed_sec) const {
-    const t_annealing_state& annealing_state = placer_.annealer_->get_annealing_state();
-    const auto& [swap_stats, move_type_stats, placer_stats] = placer_.annealer_->get_stats();
-    const int tot_moves = placer_.annealer_->get_total_iteration();
-    const bool noc_enabled = placer_.noc_opts_.noc;
-    const NocCostTerms& noc_cost_terms = placer_.costs_.noc_cost_terms;
+    const PlacementAnnealer& annealer = placer_.annealer();
+    const t_annealing_state& annealing_state = annealer.get_annealing_state();
+    const auto& [swap_stats, move_type_stats, placer_stats] = annealer.get_stats();
+    const int tot_moves = annealer.get_total_iteration();
 
-    const bool is_timing_driven = placer_.placer_opts_.place_algorithm.is_timing_driven();
-    const float cpd = is_timing_driven ? placer_.critical_path_.delay() : std::numeric_limits<float>::quiet_NaN();
-    const float sTNS = is_timing_driven ? placer_.timing_info_->setup_total_negative_slack() : std::numeric_limits<float>::quiet_NaN();
-    const float sWNS = is_timing_driven ? placer_.timing_info_->setup_worst_negative_slack() : std::numeric_limits<float>::quiet_NaN();
+    const bool noc_enabled = placer_.noc_opts().noc;
+    const NocCostTerms& noc_cost_terms = placer_.costs().noc_cost_terms;
+
+    const bool is_timing_driven = placer_.placer_opts().place_algorithm.is_timing_driven();
+    const float cpd = is_timing_driven ? placer_.critical_path().delay() : std::numeric_limits<float>::quiet_NaN();
+    const float sTNS = is_timing_driven ? placer_.timing_info()->setup_total_negative_slack() : std::numeric_limits<float>::quiet_NaN();
+    const float sWNS = is_timing_driven ? placer_.timing_info()->setup_worst_negative_slack() : std::numeric_limits<float>::quiet_NaN();
 
     VTR_LOG(
         "%4zu %6.1f %7.1e "
@@ -78,7 +80,7 @@ void PlacementLogPrinter::print_place_status(float elapsed_sec) const {
 void PlacementLogPrinter::print_resources_utilization() const {
     const auto& cluster_ctx = g_vpr_ctx.clustering();
     const auto& device_ctx = g_vpr_ctx.device();
-    const auto& block_locs = placer_.placer_state_.block_locs();
+    const auto& block_locs = placer_.placer_state().block_locs();
 
     size_t max_block_name = 0;
     size_t max_tile_name = 0;
@@ -113,8 +115,9 @@ void PlacementLogPrinter::print_resources_utilization() const {
 }
 
 void PlacementLogPrinter::print_placement_swaps_stats() const {
-    const auto& [swap_stats, move_type_stats, placer_stats] = placer_.annealer_->get_stats();
-    const t_annealing_state& annealing_state = placer_.annealer_->get_annealing_state();
+    const PlacementAnnealer& annealer = placer_.annealer();
+    const auto& [swap_stats, move_type_stats, placer_stats] = annealer.get_stats();
+    const t_annealing_state& annealing_state = annealer.get_annealing_state();
 
     size_t total_swap_attempts = swap_stats.num_swap_rejected + swap_stats.num_swap_accepted + swap_stats.num_swap_aborted;
     VTR_ASSERT(total_swap_attempts > 0);

vpr/src/place/placer.cpp

@@ -512,3 +512,32 @@ void Placer::copy_locs_to_global_state() {
     get_draw_state_vars()->set_graphics_blk_loc_registry_ref(global_blk_loc_registry);
 #endif
 }
+
+const PlacementAnnealer& Placer::annealer() const {
+    return *annealer_;
+}
+
+const t_placer_opts& Placer::placer_opts() const {
+    return placer_opts_;
+}
+
+const t_noc_opts& Placer::noc_opts() const {
+    return noc_opts_;
+}
+
+const t_placer_costs& Placer::costs() const {
+    return costs_;
+}
+
+const tatum::TimingPathInfo& Placer::critical_path() const {
+    return critical_path_;
+}
+std::shared_ptr<const SetupTimingInfo> Placer::timing_info() const {
+    return timing_info_;
+}
+const PlacerState& Placer::placer_state() const {
+    return placer_state_;
+}
+const std::optional<NocCostHandler>& Placer::noc_cost_handler() const {
+    return noc_cost_handler_;
+}

vpr/src/place/placer.h

@@ -36,8 +36,27 @@ class Placer {
      */
     void copy_locs_to_global_state();
 
+    /*
+     * Getters
+     */
+    const PlacementAnnealer& annealer() const;
+
+    const t_placer_opts& placer_opts() const;
+
+    const t_noc_opts& noc_opts() const;
+
+    const t_placer_costs& costs() const;
+
+    const tatum::TimingPathInfo& critical_path() const;
+
+    std::shared_ptr<const SetupTimingInfo> timing_info() const;
+
+    const PlacerState& placer_state() const;
+
+    const std::optional<NocCostHandler>& noc_cost_handler() const;
+
     //TODO: make this private
-  public:
+  private:
     const t_placer_opts& placer_opts_;
     const t_analysis_opts& analysis_opts_;
     const t_noc_opts& noc_opts_;