riscv
/
OpenFPGA
mirror of https://github.com/lnis-uofu/OpenFPGA.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1792 from lnis-uofu/xt_pbfixup 

[core] fixed a bug where unused last-level of clock spines are not disabled
This commit is contained in:
tangxifan 2024-08-13 21:02:17 -07:00 committed by GitHub
parent 25bcdee764 c2d9696489
commit df71e48b15
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openfpga/src/annotation/openfpga_annotate_routing.cpp
View File

@ -90,7 +90,7 @@ vtr::vector<RRNodeId, ClusterNetId> annotate_rr_node_global_net(
rr_graph.node_lookup().find_nodes_at_all_sides( rr_graph.node_lookup().find_nodes_at_all_sides(
layer, blk_loc.loc.x, blk_loc.loc.y, rr_pin_type, node_pin_num); layer, blk_loc.loc.x, blk_loc.loc.y, rr_pin_type, node_pin_num);
for (RRNodeId curr_rr_node : curr_rr_nodes) { for (RRNodeId curr_rr_node : curr_rr_nodes) {
VTR_LOGV(verbose, "on '%s' pin '%d'\n", VTR_LOGV(verbose, "Annotate global net '%s' on '%s' pin '%d'\n",
cluster_nlist.net_name(net_id).c_str(), phy_tile->name, cluster_nlist.net_name(net_id).c_str(), phy_tile->name,
node_pin_num); node_pin_num);
rr_node_nets[curr_rr_node] = net_id; rr_node_nets[curr_rr_node] = net_id;

14
openfpga/src/annotation/route_clock_rr_graph.cpp
View File

@ -317,6 +317,15 @@ static int rec_expand_and_route_clock_spine(
if (curr_tap_usage) { if (curr_tap_usage) {
curr_spine_usage = true; curr_spine_usage = true;
} }
/* If no taps are routed, this spine is not used. Early exit */
if (!curr_tap_usage && clk_ntwk.is_last_level(curr_spine)) {
spine_usage = false;
VTR_LOGV(verbose,
"Disable last-level spine '%s' as "
"none of the taps are not used\n",
clk_ntwk.spine_name(curr_spine).c_str());
return CMD_EXEC_SUCCESS;
}
std::vector<vtr::Point<int>> spine_coords = std::vector<vtr::Point<int>> spine_coords =
clk_ntwk.spine_coordinates(curr_spine); clk_ntwk.spine_coordinates(curr_spine);
@ -324,14 +333,11 @@ static int rec_expand_and_route_clock_spine(
* As such, it is easy to turn off spines by any stop. * As such, it is easy to turn off spines by any stop.
* The spine should go in a straight line, connect all the stops on the line * The spine should go in a straight line, connect all the stops on the line
*/ */
bool prev_stop_usage = false; bool prev_stop_usage = curr_tap_usage;
std::reverse(spine_coords.begin(), spine_coords.end()); std::reverse(spine_coords.begin(), spine_coords.end());
for (size_t icoord = 0; icoord < spine_coords.size(); ++icoord) { for (size_t icoord = 0; icoord < spine_coords.size(); ++icoord) {
vtr::Point<int> switch_point_coord = spine_coords[icoord]; vtr::Point<int> switch_point_coord = spine_coords[icoord];
bool curr_stop_usage = false; bool curr_stop_usage = false;
if (icoord == 0) {
prev_stop_usage = true; /* The first stop is always used */
}
/* Expand on the switching point here */ /* Expand on the switching point here */
for (ClockSwitchPointId switch_point_id : for (ClockSwitchPointId switch_point_id :
clk_ntwk.find_spine_switch_points_with_coord(curr_spine, clk_ntwk.find_spine_switch_points_with_coord(curr_spine,