Merge pull request #2938 from verilog-to-routing/init_place_wl

Parsing Initial Placement WL and CPD

Author: amin1377

libs/libvtrutil/src/tl_optional.hpp

@@ -281,7 +281,9 @@ struct is_nothrow_swappable
 
 // std::void_t from C++17
 template<class...>
-struct voider { using type = void; };
+struct voider {
+    using type = void;
+};
 template<class... Ts>
 using void_t = typename voider<Ts...>::type;
 

vpr/src/place/placement_log_printer.cpp

@@ -236,6 +236,10 @@ void PlacementLogPrinter::print_post_placement_stats() const {
     VTR_LOG("Swaps called: %d\n", swap_stats.num_ts_called);
     placer_.annealer_->get_move_abortion_logger().report_aborted_moves();
 
+    VTR_LOG("\n");
+    double estimated_wirelength = placer_.net_cost_handler_.get_total_wirelength_estimate();
+    VTR_LOG("BB estimate of min-dist (placement) wire length: %.0f\n", estimated_wirelength);
+
     if (placer_.placer_opts_.place_algorithm.is_timing_driven()) {
         //Final timing estimate
         VTR_ASSERT(placer_.timing_info_);

vpr/src/place/placer.cpp

@@ -261,8 +261,6 @@ int Placer::check_placement_costs_() {
     double timing_cost_check;
 
     const auto [bb_cost_check, expected_wirelength] = net_cost_handler_.comp_bb_cost(e_cost_methods::CHECK);
-    VTR_LOGV(!log_printer_.quiet(),
-             "\nBB estimate of min-dist (placement) wire length: %.0f\n", expected_wirelength);
 
     if (fabs(bb_cost_check - costs_.bb_cost) > costs_.bb_cost * PL_INCREMENTAL_COST_TOLERANCE) {
         VTR_LOG_ERROR(

vtr_flow/parse/parse_config/common/vpr.place.txt

@@ -1,4 +1,5 @@
 #VPR Place Metrics
+initial_placed_wirelength_est;vpr.out;Initial placement BB estimate of wirelength:\s*(\d+)
 placed_wirelength_est;vpr.out;BB estimate of min-dist \(placement\) wire length: (\d+)
 
 #VPR Number of heap operations

vtr_flow/parse/parse_config/timing/vpr.place.txt

@@ -1,6 +1,7 @@
 %include "../common/vpr.place.txt"
 
 #VPR Place Timing Metrics
+initial_placed_CPD_est;vpr.out;Initial placement estimated Critical Path Delay \(CPD\): (.*) ns
 placed_CPD_est;vpr.out;Placement estimated critical path delay \(least slack\): (.*) ns
 placed_setup_TNS_est;vpr.out;Placement estimated setup Total Negative Slack \(sTNS\): (.*) ns
 placed_setup_WNS_est;vpr.out;Placement estimated setup Worst Negative Slack \(sWNS\): (.*) ns