add PlacementLogPrinter class

Author: soheilshahrouz

vpr/src/place/place.cpp

@@ -39,8 +39,6 @@ static bool is_cube_bb(const e_place_bounding_box_mode place_bb_mode,
 
 static void free_placement_structs();
 
-static int count_connections();
-
 /*****************************************************************************/
 void try_place(const Netlist<>& net_list,
                const t_placer_opts& placer_opts,
@@ -63,8 +61,8 @@ void try_place(const Netlist<>& net_list,
      */
     VTR_ASSERT(!is_flat);
     const auto& device_ctx = g_vpr_ctx.device();
-    const auto& timing_ctx = g_vpr_ctx.timing();
-    auto pre_place_timing_stats = timing_ctx.stats;
+//    const auto& timing_ctx = g_vpr_ctx.timing();
+//    auto pre_place_timing_stats = timing_ctx.stats;
 
     /* Placement delay model is independent of the placement and can be shared across
      * multiple placers. So, it is created and initialized once. */
@@ -114,23 +112,6 @@ void try_place(const Netlist<>& net_list,
     placer.copy_locs_to_global_state();
 }
 
-/*only count non-global connections */
-static int count_connections() {
-    auto& cluster_ctx = g_vpr_ctx.clustering();
-
-    int count = 0;
-
-    for (ClusterNetId net_id : cluster_ctx.clb_nlist.nets()) {
-        if (cluster_ctx.clb_nlist.net_is_ignored(net_id)) {
-            continue;
-        }
-
-        count += cluster_ctx.clb_nlist.net_sinks(net_id).size();
-    }
-
-    return count;
-}
-
 static bool is_cube_bb(const e_place_bounding_box_mode place_bb_mode,
                        const RRGraphView& rr_graph) {
     bool cube_bb;

vpr/src/place/place_log_util.cpp

@@ -7,8 +7,14 @@
 #include "tatum/TimingReporter.hpp"
 #include "VprTimingGraphResolver.h"
 #include "timing_info.h"
+#include "placer.h"
+
+PlacementLogPrinter::PlacementLogPrinter(const Placer& placer)
+    : placer_(placer) {}
+
+void PlacementLogPrinter::print_place_status_header() const {
+    const bool noc_enabled = placer_.noc_opts_.noc;
 
-void print_place_status_header(bool noc_enabled) {
     VTR_LOG("\n");
     if (!noc_enabled) {
         VTR_LOG(
@@ -31,28 +37,31 @@ void print_place_status_header(bool noc_enabled) {
     }
 }
 
-void print_place_status(const t_annealing_state& state,
-                        const t_placer_statistics& stats,
-                        float elapsed_sec,
-                        float cpd,
-                        float sTNS,
-                        float sWNS,
-                        size_t tot_moves,
-                        bool noc_enabled,
-                        const NocCostTerms& noc_cost_terms) {
+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 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 "
         "%7.3f %10.2f %-10.5g "
         "%7.3f % 10.3g % 8.3f "
         "%7.3f %7.4f %6.1f %8.2f",
-        state.num_temps, elapsed_sec, state.t,
-        stats.av_cost, stats.av_bb_cost, stats.av_timing_cost,
+        annealing_state.num_temps, elapsed_sec, annealing_state.t,
+        placer_stats.av_cost, placer_stats.av_bb_cost, placer_stats.av_timing_cost,
         1e9 * cpd, 1e9 * sTNS, 1e9 * sWNS,
-        stats.success_rate, stats.std_dev, state.rlim, state.crit_exponent);
+        placer_stats.success_rate, placer_stats.std_dev, annealing_state.rlim, annealing_state.crit_exponent);
 
     pretty_print_uint(" ", tot_moves, 9, 3);
 
-    VTR_LOG(" %6.3f", state.alpha);
+    VTR_LOG(" %6.3f", annealing_state.alpha);
 
     if (noc_enabled) {
         VTR_LOG(
@@ -66,10 +75,10 @@ void print_place_status(const t_annealing_state& state,
     fflush(stdout);
 }
 
-void print_resources_utilization(const BlkLocRegistry& blk_loc_registry) {
+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 = blk_loc_registry.block_locs();
+    const auto& block_locs = placer_.placer_state_.block_locs();
 
     size_t max_block_name = 0;
     size_t max_tile_name = 0;
@@ -103,15 +112,18 @@ void print_resources_utilization(const BlkLocRegistry& blk_loc_registry) {
     VTR_LOG("\n");
 }
 
-void print_placement_swaps_stats(const t_annealing_state& state, const t_swap_stats& swap_stats) {
+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();
+
     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);
 
     size_t num_swap_print_digits = ceil(log10(total_swap_attempts));
     float reject_rate = (float)swap_stats.num_swap_rejected / total_swap_attempts;
     float accept_rate = (float)swap_stats.num_swap_accepted / total_swap_attempts;
     float abort_rate = (float)swap_stats.num_swap_aborted / total_swap_attempts;
-    VTR_LOG("Placement number of temperatures: %d\n", state.num_temps);
+    VTR_LOG("Placement number of temperatures: %d\n", annealing_state.num_temps);
     VTR_LOG("Placement total # of swap attempts: %*d\n", num_swap_print_digits,
             total_swap_attempts);
     VTR_LOG("\tSwaps accepted: %*d (%4.1f %%)\n", num_swap_print_digits,
@@ -141,4 +153,5 @@ void generate_post_place_timing_reports(const t_placer_opts& placer_opts,
     timing_reporter.report_timing_setup(
         placer_opts.post_place_timing_report_file,
         *timing_info.setup_analyzer(), analysis_opts.timing_report_npaths);
-}
+}
+

vpr/src/place/place_log_util.h

@@ -14,22 +14,20 @@ struct t_analysis_opts;
 struct NocCostTerms;
 struct t_swap_stats;
 class BlkLocRegistry;
+class Placer;
 
-void print_place_status_header(bool noc_enabled);
+class PlacementLogPrinter {
+  public:
+    explicit PlacementLogPrinter(const Placer& placer);
 
-void print_place_status(const t_annealing_state& state,
-                        const t_placer_statistics& stats,
-                        float elapsed_sec,
-                        float cpd,
-                        float sTNS,
-                        float sWNS,
-                        size_t tot_moves,
-                        bool noc_enabled,
-                        const NocCostTerms& noc_cost_terms);
+    void print_place_status_header() const;
+    void print_resources_utilization() const;
+    void print_placement_swaps_stats() const;
+    void print_place_status(float elapsed_sec) const;
 
-void print_resources_utilization(const BlkLocRegistry& blk_loc_registry);
-
-void print_placement_swaps_stats(const t_annealing_state& state, const t_swap_stats& swap_stats);
+  private:
+    const Placer& placer_;
+};
 
 void generate_post_place_timing_reports(const t_placer_opts& placer_opts,
                                         const t_analysis_opts& analysis_opts,

vpr/src/place/placer.cpp

@@ -14,7 +14,6 @@
 #include "place_timing_update.h"
 #include "annealer.h"
 #include "RL_agent_util.h"
-#include "place_log_util.h"
 #include "place_checkpoint.h"
 
 Placer::Placer(const Netlist<>& net_list,
@@ -31,7 +30,8 @@ Placer::Placer(const Netlist<>& net_list,
     , placer_state_(placer_opts.place_algorithm.is_timing_driven(), cube_bb)
     , rng_(placer_opts.seed)
     , net_cost_handler_(placer_opts, placer_state_, cube_bb)
-    , place_delay_model_(std::move(place_delay_model)){
+    , place_delay_model_(std::move(place_delay_model))
+    , log_printer_(*this) {
     const auto& cluster_ctx = g_vpr_ctx.clustering();
     const auto& device_ctx = g_vpr_ctx.device();
     const auto& atom_ctx = g_vpr_ctx.atom();
@@ -322,7 +322,7 @@ void Placer::place() {
 
    if (!skip_anneal) {
        //Table header
-       print_place_status_header(noc_opts_.noc);
+       log_printer_.print_place_status_header();
 
        // Outer loop of the simulated annealing begins
        do {
@@ -346,9 +346,7 @@ void Placer::place() {
            // do a complete inner loop iteration
            annealer_->placement_inner_loop();
 
-           print_place_status(annealing_state, placer_stats, temperature_timer.elapsed_sec(),
-                              critical_path_.delay(), sTNS, sWNS, annealer_->get_total_iteration(),
-                              noc_opts_.noc, costs_.noc_cost_terms);
+           log_printer_.print_place_status(temperature_timer.elapsed_sec());
 
 //           sprintf(msg, "Cost: %g  BB Cost %g  TD Cost %g  Temperature: %g",
 //                   costs_.cost, costs_.bb_cost, costs_.timing_cost, annealing_state.t);
@@ -384,9 +382,7 @@ void Placer::place() {
            sWNS = timing_info_->setup_worst_negative_slack();
        }
 
-       print_place_status(annealing_state, placer_stats, temperature_timer.elapsed_sec(),
-                          critical_path_.delay(), sTNS, sWNS, annealer_->get_total_iteration(),
-                          noc_opts_.noc, costs_.noc_cost_terms);
+       log_printer_.print_place_status(temperature_timer.elapsed_sec());
     }
     auto post_quench_timing_stats = timing_ctx.stats;
 
@@ -431,11 +427,11 @@ void Placer::place() {
 
     check_place_();
 
+    print_post_placement_stats_();
 
-    // Print out swap statistics
-    print_resources_utilization(placer_state_.blk_loc_registry());
-
-    print_placement_swaps_stats(annealing_state, swap_stats);
+    // Print out swap statistics and resource utilization
+    log_printer_.print_resources_utilization();
+    log_printer_.print_placement_swaps_stats();
 
     move_type_stats.print_placement_move_types_stats();
 

vpr/src/place/placer.h

@@ -12,6 +12,7 @@
 #include "placer_state.h"
 #include "noc_place_utils.h"
 #include "net_cost_handler.h"
+#include "place_log_util.h"
 
 class PlacementAnnealer;
 namespace vtr{
@@ -64,6 +65,8 @@ class Placer {
 
     std::unique_ptr<PlacementAnnealer> annealer_;
 
+    PlacementLogPrinter log_printer_;
+
   private:
     void alloc_and_init_timing_objects_(const Netlist<>& net_list,
                                         const t_analysis_opts& analysis_opts);