[vpr][route] set pres fac before calling update_draw_pres_fac

Author: amin1377

vpr/src/route/route.cpp

@@ -357,7 +357,8 @@ bool route(const Netlist<>& net_list,
             //Decrease pres_fac so that critical connections will take more direct routes
             //Note that we use first_iter_pres_fac here (typically zero), and switch to
             //use initial_pres_fac on the next iteration.
-            pres_fac = update_draw_pres_fac(router_opts.first_iter_pres_fac);
+            pres_fac = router_opts.first_iter_pres_fac;
+            update_draw_pres_fac(pres_fac);
 
             //Reduce timing tolerances to re-route more delay-suboptimal signals
             connections_inf.set_connection_criticality_tolerance(0.7);
@@ -374,7 +375,8 @@ bool route(const Netlist<>& net_list,
             //after the first routing convergence. Since that is often zero,
             //we want to set pres_fac to a reasonable (i.e. typically non-zero)
             //value afterwards -- so it grows when multiplied by pres_fac_mult
-            pres_fac = update_draw_pres_fac(router_opts.initial_pres_fac);
+            pres_fac = router_opts.initial_pres_fac
+            update_draw_pres_fac(pres_fac);
         }
 
         //Have we converged the maximum number of times, did not make any changes, or does it seem
@@ -437,12 +439,13 @@ bool route(const Netlist<>& net_list,
 
         //Update pres_fac
         if (itry == 1) {
-            pres_fac = update_draw_pres_fac(router_opts.initial_pres_fac);
+            pres_fac = router_opts.initial_pres_fac;
+            update_draw_pres_fac(pres_fac);
         } else {
             pres_fac *= router_opts.pres_fac_mult;
-
+            pres_fac = std::min(pres_fac, router_opts.max_pres_fac);
             /* Set the maximum pres_fac to the value passed by the command line argument */
-            pres_fac = update_draw_pres_fac(std::min(pres_fac, router_opts.max_pres_fac));
+            update_draw_pres_fac(pres_fac));
 
             // Increase short path criticality if it's having a hard time resolving hold violations due to congestion
             if (budgeting_inf.if_set()) {

vpr/src/route/route_utils.cpp

@@ -507,15 +507,13 @@ void try_graph(int width_fac,
                     is_flat);
 }
 
-float update_draw_pres_fac(float new_pres_fac) {
+void update_draw_pres_fac(const float new_pres_fac) {
 #ifndef NO_GRAPHICS
 
     // Only updates the drawing pres_fac if graphics is enabled
     get_draw_state_vars()->pres_fac = new_pres_fac;
 
 #endif // NO_GRAPHICS
-
-    return new_pres_fac;
 }
 
 #ifndef NO_GRAPHICS

vpr/src/route/route_utils.h

@@ -136,10 +136,8 @@ void try_graph(int width_fac,
                int num_directs,
                bool is_flat);
 
-/* This routine should take the new value of the present congestion factor
- * and propagate it to all the relevant data fields in the vpr flow.
- * Currently, it only updates the pres_fac used by the drawing functions */
-float update_draw_pres_fac(float new_pres_fac);
+/* This routine updates the pres_fac used by the drawing functions */
+void update_draw_pres_fac(const float new_pres_fac);
 
 #ifndef NO_GRAPHICS
 /** Updates router iteration information and checks for router iteration and net id breakpoints