@@ -677,8 +677,8 @@ static void build_intra_cluster_rr_graph(const t_graph_type graph_type,
677
677
* @param det_routing_arch Contain the information from architecture file
678
678
* @param load_rr_graph Indicate whether the RR graph is loaded from a file
679
679
*/
680
- static short get_delayless_switch_id (t_det_routing_arch* det_routing_arch,
681
- bool load_rr_graph);
680
+ static int get_delayless_switch_id (t_det_routing_arch* det_routing_arch,
681
+ bool load_rr_graph);
682
682
683
683
/* ****************** Subroutine definitions *******************************/
684
684
@@ -765,7 +765,7 @@ void create_rr_graph(const t_graph_type graph_type,
765
765
}
766
766
767
767
if (is_flat) {
768
- short delayless_switch = get_delayless_switch_id (det_routing_arch, load_rr_graph);
768
+ int delayless_switch = get_delayless_switch_id (det_routing_arch, load_rr_graph);
769
769
VTR_ASSERT (delayless_switch != OPEN);
770
770
build_intra_cluster_rr_graph (graph_type,
771
771
grid,
@@ -1538,21 +1538,21 @@ static void build_intra_cluster_rr_graph(const t_graph_type graph_type,
1538
1538
is_flat);
1539
1539
}
1540
1540
1541
- static short get_delayless_switch_id (t_det_routing_arch* det_routing_arch,
1542
- bool load_rr_graph) {
1541
+ static int get_delayless_switch_id (t_det_routing_arch* det_routing_arch,
1542
+ bool load_rr_graph) {
1543
1543
const auto & device_ctx = g_vpr_ctx.device ();
1544
- short delayless_switch;
1544
+ int delayless_switch = OPEN ;
1545
1545
if (load_rr_graph) {
1546
1546
const auto & rr_switches = device_ctx.rr_graph .rr_switch ();
1547
1547
for (size_t switch_id = 0 ; switch_id < rr_switches.size (); switch_id++){
1548
1548
const auto & rr_switch = rr_switches[RRSwitchId (switch_id)];
1549
1549
if (rr_switch.name .find (" delayless" ) != std::string::npos) {
1550
- delayless_switch = static_cast <short >(switch_id);
1550
+ delayless_switch = static_cast <int >(switch_id);
1551
1551
break ;
1552
1552
}
1553
1553
}
1554
1554
} else {
1555
- delayless_switch = det_routing_arch->delayless_switch ;
1555
+ delayless_switch = static_cast < int >( det_routing_arch->delayless_switch ) ;
1556
1556
}
1557
1557
1558
1558
return delayless_switch;
0 commit comments