AP High Fanout Net Thresholding: Clean-up and convert from passing

ap_opts to just threshold (int).

Author: haydar-c

vpr/src/analytical_place/analytical_placement_flow.cpp

@@ -180,7 +180,7 @@ void run_analytical_placement_flow(t_vpr_setup& vpr_setup) {
     APNetlist ap_netlist = gen_ap_netlist_from_atoms(atom_nlist,
                                                      prepacker,
                                                      constraints,
-                                                     ap_opts);
+                                                     ap_opts.ap_high_fanout_threshold);
     print_ap_netlist_stats(ap_netlist);
 
     // Pre-compute the pre-clustering timing delays. This object will be passed

vpr/src/analytical_place/analytical_solver.cpp

@@ -802,7 +802,7 @@ void B2BSolver::init_linear_system(PartialPlacement& p_placement) {
             continue;
         size_t num_pins = netlist_.net_pins(net_id).size();
         VTR_ASSERT_SAFE_MSG(num_pins > 1, "net must have at least 2 pins");
-        
+
         double net_w = net_weights_[net_id];
 
         // Find the bounding blocks

vpr/src/analytical_place/gen_ap_netlist_from_atoms.cpp

@@ -25,7 +25,7 @@
 APNetlist gen_ap_netlist_from_atoms(const AtomNetlist& atom_netlist,
                                     const Prepacker& prepacker,
                                     const UserPlaceConstraints& constraints,
-                                    const t_ap_opts& ap_opts) {
+                                    const int& high_fanout_threshold) {
     // Create a scoped timer for reading the atom netlist.
     vtr::ScopedStartFinishTimer timer("Read Atom Netlist to AP Netlist");
 
@@ -158,7 +158,7 @@ APNetlist gen_ap_netlist_from_atoms(const AtomNetlist& atom_netlist,
         // If fanout number of the net is higher than the threshold, mark as ignored for AP.
         size_t num_pins = ap_netlist.net_pins(ap_net_id).size();
         VTR_ASSERT_DEBUG(num_pins > 1);
-        if (num_pins - 1 > static_cast<size_t>(ap_opts.ap_high_fanout_threshold)) {
+        if (num_pins - 1 > static_cast<size_t>(high_fanout_threshold)) {
             ap_netlist.set_net_is_ignored(ap_net_id, true);
             continue;
         }

vpr/src/analytical_place/gen_ap_netlist_from_atoms.h

@@ -12,19 +12,20 @@ class APNetlist;
 class AtomNetlist;
 class Prepacker;
 class UserPlaceConstraints;
-struct t_ap_opts;
 
 /**
  * @brief Use the results from prepacking the atom netlist to generate an APNetlist.
  *
- *  @param atom_netlist The atom netlist for the input design.
- *  @param prepacker    The prepacker, initialized on the provided atom netlist.
- *  @param constraints  The placement constraints on the Atom blocks, provided
- *                      by the user.
+ *  @param atom_netlist          The atom netlist for the input design.
+ *  @param prepacker             The prepacker, initialized on the provided atom netlist.
+ *  @param constraints           The placement constraints on the Atom blocks, provided
+ *                               by the user.
+ *  @param high_fanout_threshold The threshold that nets with higher fanout will
+ *                               be ignored.
  *
  *  @return             An APNetlist object, generated from the prepacker results.
  */
 APNetlist gen_ap_netlist_from_atoms(const AtomNetlist& atom_netlist,
                                     const Prepacker& prepacker,
                                     const UserPlaceConstraints& constraints,
-                                    const t_ap_opts& ap_opts);
+                                    const int& high_fanout_threshold);

vtr_flow/parse/qor_config/qor_ap_fixed_chan_width.txt

@@ -2,10 +2,6 @@
 # channel width.
 
 vpr_status;output.txt;vpr_status=(.*)
-net_threshold;vpr.out;AnalyticalPlacerOpts.ap_high_fanout_threshold: (.*)
-ignored_high_fanout_net_num;vpr.out;Ignored nets due to high fanout: (.*)
-non_ignored_nets;vpr.out;Non-ignored nets: (.*)
-total_nets;vpr.out;Total nets checked: (.*)
 crit_path_delay;vpr.out;Critical path: (.*) ns
 post_gp_hpwl;vpr.out;\s*Placement HPWL: (.*)
 post_fl_hpwl;vpr.out;Initial placement BB estimate of wirelength: (.*)
@@ -21,13 +17,10 @@ post_fl_avg_disp;vpr.out;\s*Average atom displacement of initial placement from
 post_fl_max_disp;vpr.out;\s*Max atom displacement of initial placement from flat placement: (.*)
 ap_runtime;vpr.out;Analytical Placement took (.*) seconds
 ap_gp_runtime;vpr.out;AP Global Placer took (.*) seconds
-ap_gp_solver_runtime;vpr.out;Time spent in solver: (.*) seconds
-ap_gp_legalizer_runtime;vpr.out;Time spent in legalizer: (.*) seconds
 ap_fl_runtime;vpr.out;AP Full Legalizer took (.*) seconds
 ap_dp_runtime;vpr.out;AP Detailed Placer took (.*) seconds
 route_runtime;vpr.out;Routing took (.*) seconds
 total_runtime;vpr.out;The entire flow of VPR took (.*) seconds
 num_clb;vpr.out;Netlist clb blocks:\s*(\d+)
 num_lab;vpr.out;Netlist LAB blocks:\s*(\d+)
-total_CG_iters;vpr.out;Total number of CG iterations: (.*)
-ap_gp_last_iter;vpr.out;^ {2}(\d+)\s+[\d.]+\s+[\d.]+\s+[\d.]+\s+[\d.]+\s+[\d.]+$
+