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

use chan_node_in_edges from rr_gsb in XML writer

This commit is contained in:
tangxifan 2020-03-22 15:48:11 -06:00
parent 3958ac2494
commit fdf6a6bd3e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openfpga/src/annotation/write_xml_device_rr_gsb.cpp
View File

@ -103,26 +103,26 @@ void write_rr_switch_block_to_xml(const std::string fname_prefix,
} }
/* Output drivers */ /* Output drivers */
const RRNodeId& cur_rr_node = rr_gsb.get_chan_node(gsb_side, inode); const RRNodeId& cur_rr_node = rr_gsb.get_chan_node(gsb_side, inode);
std::vector<RRNodeId> driver_rr_nodes = get_rr_graph_configurable_driver_nodes(rr_graph, cur_rr_node); std::vector<RREdgeId> driver_rr_edges = rr_gsb.get_chan_node_in_edges(rr_graph, gsb_side, inode);
/* Output node information: location, index, side */ /* Output node information: location, index, side */
const RRSegmentId& src_segment_id = rr_gsb.get_chan_node_segment(gsb_side, inode); const RRSegmentId& src_segment_id = rr_gsb.get_chan_node_segment(gsb_side, inode);
/* Check if this node is directly connected to the node on the opposite side */ /* Check if this node is directly connected to the node on the opposite side */
if (true == rr_gsb.is_sb_node_passing_wire(rr_graph, gsb_side, inode)) { if (true == rr_gsb.is_sb_node_passing_wire(rr_graph, gsb_side, inode)) {
driver_rr_nodes.clear(); driver_rr_edges.clear();
} }
fp << "\t<" << rr_node_typename[rr_graph.node_type(cur_rr_node)] fp << "\t<" << rr_node_typename[rr_graph.node_type(cur_rr_node)]
<< " side=\"" << gsb_side_manager.to_string() << " side=\"" << gsb_side_manager.to_string()
<< "\" index=\"" << inode << "\" index=\"" << inode
<< "\" segment_id=\"" << size_t(src_segment_id) << "\" segment_id=\"" << size_t(src_segment_id)
<< "\" mux_size=\"" << driver_rr_nodes.size() << "\" mux_size=\"" << driver_rr_edges.size()
<< "\">" << "\">"
<< std::endl; << std::endl;
/* Direct connection: output the node on the opposite side */ /* Direct connection: output the node on the opposite side */
if (0 == driver_rr_nodes.size()) { if (0 == driver_rr_edges.size()) {
SideManager oppo_side = gsb_side_manager.get_opposite(); SideManager oppo_side = gsb_side_manager.get_opposite();
fp << "\t\t<driver_node type=\"" << rr_node_typename[rr_graph.node_type(cur_rr_node)] fp << "\t\t<driver_node type=\"" << rr_node_typename[rr_graph.node_type(cur_rr_node)]
<< "\" side=\"" << oppo_side.to_string() << "\" side=\"" << oppo_side.to_string()
@ -131,7 +131,8 @@ void write_rr_switch_block_to_xml(const std::string fname_prefix,
<< "\"/>" << "\"/>"
<< std::endl; << std::endl;
} else { } else {
for (const RRNodeId& driver_rr_node : driver_rr_nodes) { for (const RREdgeId& driver_rr_edge : driver_rr_edges) {
const RRNodeId& driver_rr_node = rr_graph.edge_src_node(driver_rr_edge);
e_side driver_node_side = NUM_SIDES; e_side driver_node_side = NUM_SIDES;
int driver_node_index = -1; int driver_node_index = -1;
rr_gsb.get_node_side_and_index(rr_graph, driver_rr_node, IN_PORT, driver_node_side, driver_node_index); rr_gsb.get_node_side_and_index(rr_graph, driver_rr_node, IN_PORT, driver_node_side, driver_node_index);