Fix compilation with ENABLE_CLASSIC_VPR_STA defined

Author: kmurray

vpr/SRC/base/place_and_route.cpp

@@ -49,6 +49,7 @@ static int binary_search_place_and_route(t_placer_opts placer_opts,
 		t_router_opts router_opts,
 		t_det_routing_arch *det_routing_arch, t_segment_inf * segment_inf,
         float** net_delay,
+        const t_timing_inf& timing_inf,
         std::shared_ptr<SetupTimingInfo> timing_info);
 
 static float comp_width(t_chan * chan, float x, float separation);
@@ -146,7 +147,11 @@ bool place_and_route(t_placer_opts placer_opts,
 				arch,
                 router_opts.verify_binary_search, router_opts.min_channel_width_hint,
                 annealing_sched, router_opts,
-				det_routing_arch, segment_inf, net_delay, timing_info);
+				det_routing_arch, segment_inf, net_delay, 
+#ifdef ENABLE_CLASSIC_VPR_STA
+                timing_inf,
+#endif
+                timing_info);
 		success = (power_ctx.solution_inf.channel_width > 0 ? true : false);
 	} else {
         //Route at the specified channel width
@@ -171,6 +176,7 @@ bool place_and_route(t_placer_opts placer_opts,
 				segment_inf, net_delay,
 #ifdef ENABLE_CLASSIC_VPR_STA
                 slacks, 
+                timing_inf,
 #endif
                 timing_info,
                 arch->Chans,
@@ -243,6 +249,7 @@ static int binary_search_place_and_route(t_placer_opts placer_opts,
 		t_router_opts router_opts,
 		t_det_routing_arch *det_routing_arch, t_segment_inf * segment_inf,
         float** net_delay,
+        const t_timing_inf& timing_inf,
         std::shared_ptr<SetupTimingInfo> timing_info) {
 
 	/* This routine performs a binary search to find the minimum number of      *
@@ -379,6 +386,7 @@ static int binary_search_place_and_route(t_placer_opts placer_opts,
 				net_delay, 
 #ifdef ENABLE_CLASSIC_VPR_STA
                 slacks, 
+                timing_inf,
 #endif
                 timing_info,
                 arch->Chans,
@@ -496,6 +504,7 @@ static int binary_search_place_and_route(t_placer_opts placer_opts,
 					segment_inf, net_delay, 
 #ifdef ENABLE_CLASSIC_VPR_STA
                     slacks,
+                    timing_inf,
 #endif
                     timing_info,
 					arch->Chans, clb_opins_used_locally, arch->Directs, arch->num_directs,

vpr/SRC/base/vpr_types.h

@@ -295,7 +295,7 @@ struct t_cluster_placement_stats {
 
 //Enable the legacy STA engine to run along side the
 //new STA engine
-//#define ENABLE_CLASSIC_VPR_STA
+#define ENABLE_CLASSIC_VPR_STA
 
 // #define PATH_COUNTING 'P'
 /* Uncomment this to turn on path counting. Its value determines how path criticality

vpr/SRC/route/route_common.cpp

@@ -269,6 +269,7 @@ bool try_route(int width_fac, t_router_opts router_opts,
 		float **net_delay,
 #ifdef ENABLE_CLASSIC_VPR_STA
         t_slack * slacks,
+        const t_timing_inf& timing_inf,
 #endif
         std::shared_ptr<SetupTimingInfo> timing_info,
 		t_chan_width_dist chan_width_dist, t_clb_opins_used& clb_opins_used_locally,
@@ -352,11 +353,9 @@ bool try_route(int width_fac, t_router_opts router_opts,
             timing_info,
 #ifdef ENABLE_CLASSIC_VPR_STA
             slacks,
+            timing_inf,
 #endif
 			clb_opins_used_locally,
-#ifdef ENABLE_CLASSIC_VPR_STA
-            , timing_inf
-#endif
             first_iteration_priority
             );
 

vpr/SRC/route/route_export.h

@@ -15,6 +15,7 @@ bool try_route(int width_fac, t_router_opts router_opts,
 		float **net_delay,
 #ifdef ENABLE_CLASSIC_VPR_STA
         t_slack * slacks,
+        const t_timing_inf& timing_inf,
 #endif
         std::shared_ptr<SetupTimingInfo> timing_info,
 		t_chan_width_dist chan_width_dist, t_clb_opins_used& clb_opins_used_locally,

vpr/SRC/route/route_timing.cpp

@@ -126,11 +126,9 @@ bool try_timing_driven_route(t_router_opts router_opts,
         std::shared_ptr<SetupTimingInfo> timing_info,
 #ifdef ENABLE_CLASSIC_VPR_STA
         t_slack * slacks, 
+        const t_timing_inf &timing_inf,
 #endif
         t_clb_opins_used& clb_opins_used_locally,
-#ifdef ENABLE_CLASSIC_VPR_STA
-        , const t_timing_inf &timing_inf
-#endif
         ScreenUpdatePriority first_iteration_priority) {
 
 	/* Timing-driven routing algorithm.  The timing graph (includes slack)   *

vpr/SRC/route/route_timing.h

@@ -17,11 +17,9 @@ bool try_timing_driven_route(t_router_opts router_opts,
         std::shared_ptr<SetupTimingInfo> timing_info,
 #ifdef ENABLE_CLASSIC_VPR_STA
         t_slack * slacks, 
+        const t_timing_inf &timing_inf,
 #endif
         t_clb_opins_used& clb_opins_used_locally,
-#ifdef ENABLE_CLASSIC_VPR_STA
-        , const t_timing_inf &timing_inf
-#endif
         ScreenUpdatePriority first_iteration_priority
         );
 bool try_timing_driven_route_net(int inet, int itry, float pres_fac,