@@ -147,15 +147,15 @@ static bool timing_driven_route_sink(ClusterNetId net_id,
147
147
RouterStats& router_stats);
148
148
149
149
static bool timing_driven_pre_route_to_clock_root (
150
- ClusterNetId net_id,
151
- int sink_node,
152
- const t_conn_cost_params cost_params,
153
- float pres_fac,
154
- int high_fanout_threshold,
155
- t_rt_node* rt_root,
156
- const RouterLookahead& router_lookahead,
157
- SpatialRouteTreeLookup& spatial_rt_lookup,
158
- RouterStats& router_stats);
150
+ ClusterNetId net_id,
151
+ int sink_node,
152
+ const t_conn_cost_params cost_params,
153
+ float pres_fac,
154
+ int high_fanout_threshold,
155
+ t_rt_node* rt_root,
156
+ const RouterLookahead& router_lookahead,
157
+ SpatialRouteTreeLookup& spatial_rt_lookup,
158
+ RouterStats& router_stats);
159
159
160
160
static t_heap* timing_driven_route_connection_from_route_tree_high_fanout (t_rt_node* rt_root,
161
161
int sink_node,
@@ -1006,14 +1006,14 @@ bool timing_driven_route_net(ClusterNetId net_id,
1006
1006
cost_params.delay_budget = ((budgeting_inf.if_set ()) ? &conn_delay_budget : nullptr );
1007
1007
1008
1008
// Pre-route to clock source for clock nets (marked as global nets)
1009
- if (cluster_ctx.clb_nlist .net_is_global (net_id) && router_opts.two_stage_clock_routing ){
1009
+ if (cluster_ctx.clb_nlist .net_is_global (net_id) && router_opts.two_stage_clock_routing ) {
1010
1010
VTR_ASSERT (router_opts.clock_modeling == DEDICATED_NETWORK);
1011
1011
int sink_node = device_ctx.virtual_clock_network_root_idx ;
1012
1012
enable_router_debug (router_opts, net_id, sink_node);
1013
1013
// Set to the max timing criticality which should intern minimize clock insertion
1014
1014
// delay by selecting a direct route from the clock source to the virtual sink
1015
1015
cost_params.criticality = router_opts.max_criticality ;
1016
- if (!timing_driven_pre_route_to_clock_root (
1016
+ if (!timing_driven_pre_route_to_clock_root (
1017
1017
net_id,
1018
1018
sink_node,
1019
1019
cost_params,
@@ -1083,16 +1083,15 @@ bool timing_driven_route_net(ClusterNetId net_id,
1083
1083
}
1084
1084
1085
1085
static bool timing_driven_pre_route_to_clock_root (
1086
- ClusterNetId net_id,
1087
- int sink_node,
1088
- const t_conn_cost_params cost_params,
1089
- float pres_fac,
1090
- int high_fanout_threshold,
1091
- t_rt_node* rt_root,
1092
- const RouterLookahead& router_lookahead,
1093
- SpatialRouteTreeLookup& spatial_rt_lookup,
1094
- RouterStats& router_stats) {
1095
-
1086
+ ClusterNetId net_id,
1087
+ int sink_node,
1088
+ const t_conn_cost_params cost_params,
1089
+ float pres_fac,
1090
+ int high_fanout_threshold,
1091
+ t_rt_node* rt_root,
1092
+ const RouterLookahead& router_lookahead,
1093
+ SpatialRouteTreeLookup& spatial_rt_lookup,
1094
+ RouterStats& router_stats) {
1096
1095
auto & route_ctx = g_vpr_ctx.mutable_routing ();
1097
1096
auto & cluster_ctx = g_vpr_ctx.clustering ();
1098
1097
auto & m_route_ctx = g_vpr_ctx.mutable_routing ();
@@ -1171,10 +1170,10 @@ static bool timing_driven_pre_route_to_clock_root(
1171
1170
// - free up vitual sink occupancy
1172
1171
disable_expansion_and_remove_sink_from_route_tree_nodes (rt_root);
1173
1172
VTR_LOGV_DEBUG (f_router_debug, " Traceback tail before update %d \n " ,
1174
- route_ctx.trace [net_id].tail ->index );
1173
+ route_ctx.trace [net_id].tail ->index );
1175
1174
drop_traceback_tail (net_id);
1176
1175
VTR_LOGV_DEBUG (f_router_debug, " Updated traceback ptrs: %d %d \n " ,
1177
- route_ctx.trace [net_id].head ->index , route_ctx.trace [net_id].tail ->index );
1176
+ route_ctx.trace [net_id].head ->index , route_ctx.trace [net_id].tail ->index );
1178
1177
m_route_ctx.rr_node_route_inf [sink_node].set_occ (0 );
1179
1178
1180
1179
// routed to a sink successfully
@@ -1765,7 +1764,7 @@ static t_rt_node* setup_routing_resources(int itry,
1765
1764
return rt_root;
1766
1765
}
1767
1766
1768
- void disable_expansion_and_remove_sink_from_route_tree_nodes (t_rt_node* rt_node){
1767
+ void disable_expansion_and_remove_sink_from_route_tree_nodes (t_rt_node* rt_node) {
1769
1768
/* Remove sink in route tree and mark all nodes
1770
1769
* leading to the sink as unexpandable.
1771
1770
*/
@@ -1776,17 +1775,17 @@ void disable_expansion_and_remove_sink_from_route_tree_nodes(t_rt_node* rt_node)
1776
1775
1777
1776
while (linked_rt_edge != nullptr ) {
1778
1777
child_node = linked_rt_edge->child ;
1779
- if (device_ctx.rr_nodes [child_node->inode ].type () == SINK){
1778
+ if (device_ctx.rr_nodes [child_node->inode ].type () == SINK) {
1780
1779
VTR_LOGV_DEBUG (f_router_debug,
1781
- " Removing sink %d from route tree\n " , child_node->inode );
1780
+ " Removing sink %d from route tree\n " , child_node->inode );
1782
1781
rt_node->u .child_list = nullptr ;
1783
1782
rt_node->u .next = nullptr ;
1784
1783
free (child_node);
1785
1784
break ;
1786
1785
} else {
1787
1786
rt_node->re_expand = false ;
1788
1787
VTR_LOGV_DEBUG (f_router_debug,
1789
- " unexpanding: %d in route tree\n " , rt_node->inode );
1788
+ " unexpanding: %d in route tree\n " , rt_node->inode );
1790
1789
}
1791
1790
disable_expansion_and_remove_sink_from_route_tree_nodes (child_node);
1792
1791
linked_rt_edge = linked_rt_edge->next ;
0 commit comments