Added --place_quench_algorithm option to VPR options. Specifies the placement algorithm to be used during quench.

Author: Bill-hbrhbr

vpr/src/base/SetupVPR.cpp

@@ -530,6 +530,7 @@ static void SetupPlacerOpts(const t_options& Options, t_placer_opts* PlacerOpts)
     PlacerOpts->td_place_exp_last = Options.place_exp_last;
 
     PlacerOpts->place_algorithm = Options.PlaceAlgorithm;
+    PlacerOpts->place_quench_algorithm = Options.PlaceQuenchAlgorithm;
 
     PlacerOpts->constraints_file = Options.constraints_file;
     PlacerOpts->pad_loc_file = Options.pad_loc_file;

vpr/src/base/read_options.cpp

@@ -1621,6 +1621,12 @@ argparse::ArgumentParser create_arg_parser(std::string prog_name, t_options& arg
         .choices({"bounding_box", "criticality_timing", "slack_timing"})
         .show_in(argparse::ShowIn::HELP_ONLY);
 
+    place_grp.add_argument<e_place_algorithm, ParsePlaceAlgorithm>(args.PlaceQuenchAlgorithm, "--place_quench_algorithm")
+        .help("Controls which placement algorithm is used during placement quench")
+        .default_value("criticality_timing")
+        .choices({"bounding_box", "criticality_timing", "slack_timing"})
+        .show_in(argparse::ShowIn::HELP_ONLY);
+
     place_grp.add_argument(args.PlaceChanWidth, "--place_chan_width")
         .help(
             "Sets the assumed channel width during placement. "
@@ -2227,6 +2233,11 @@ void set_conditional_defaults(t_options& args) {
         }
     }
 
+    //Which placement algorithm to use during placement quench?
+    if (args.PlaceQuenchAlgorithm.provenance() != Provenance::SPECIFIED) {
+        args.PlaceQuenchAlgorithm.set(args.PlaceAlgorithm, Provenance::INFERRED);
+    }
+
     //Place chan width follows Route chan width if unspecified
     if (args.PlaceChanWidth.provenance() != Provenance::SPECIFIED && args.RouteChanWidth.provenance() == Provenance::SPECIFIED) {
         args.PlaceChanWidth.set(args.RouteChanWidth.value(), Provenance::INFERRED);

vpr/src/base/read_options.h

@@ -105,6 +105,7 @@ struct t_options {
     argparse::ArgValue<float> PlaceSuccessTarget;
     argparse::ArgValue<sched_type> anneal_sched_type;
     argparse::ArgValue<e_place_algorithm> PlaceAlgorithm;
+    argparse::ArgValue<e_place_algorithm> PlaceQuenchAlgorithm;
     argparse::ArgValue<e_pad_loc_type> pad_loc_type;
     argparse::ArgValue<e_block_loc_type> block_loc_type;
     argparse::ArgValue<int> PlaceChanWidth;

vpr/src/place/place.cpp

@@ -891,14 +891,14 @@ void try_place(const t_placer_opts& placer_opts,
                              *move_generator,
                              blocks_affected,
                              timing_info.get(),
-                             placer_opts.place_algorithm);
+                             placer_opts.place_quench_algorithm);
 
         tot_iter += move_lim;
         ++num_temps;
 
         calc_placer_stats(stats, success_rat, std_dev, costs, move_lim);
 
-        if (placer_opts.place_algorithm == CRITICALITY_TIMING_PLACE) {
+        if (placer_opts.place_quench_algorithm == CRITICALITY_TIMING_PLACE) {
             critical_path = timing_info->least_slack_critical_path();
             sTNS = timing_info->setup_total_negative_slack();
             sWNS = timing_info->setup_worst_negative_slack();