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

[engine] adapt the use of API in RRGraph for annotation functions

This commit is contained in:
tangxifan 2022-08-17 10:50:16 -07:00
parent 01d53db484
commit 4e871be357
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,7 +116,7 @@ void write_rr_gsb_chan_connection_to_xml(std::fstream& fp,
<< "\" index=\"" << inode << "\" index=\"" << inode
<< "\" node_id=\"" << size_t(cur_rr_node) << "\" node_id=\"" << size_t(cur_rr_node)
<< "\" segment_id=\"" << size_t(src_segment_id) << "\" segment_id=\"" << size_t(src_segment_id)
<< "\" segment_name=\"" << rr_graph.get_segment(src_segment_id).name << "\" segment_name=\"" << rr_graph.rr_segments()[src_segment_id].name
<< "\" mux_size=\"" << driver_rr_edges.size() << "\" mux_size=\"" << driver_rr_edges.size()
<< "\" sb_module_pin_name=\"" << generate_sb_module_track_port_name(cur_node_type, gsb_side, OUT_PORT) << "\" sb_module_pin_name=\"" << generate_sb_module_track_port_name(cur_node_type, gsb_side, OUT_PORT)
<< "\">" << "\">"
@ -130,7 +130,7 @@ void write_rr_gsb_chan_connection_to_xml(std::fstream& fp,
<< "\" index=\"" << rr_gsb.get_node_index(rr_graph, cur_rr_node, oppo_side.get_side(), IN_PORT) << "\" index=\"" << rr_gsb.get_node_index(rr_graph, cur_rr_node, oppo_side.get_side(), IN_PORT)
<< "\" node_id=\"" << size_t(cur_rr_node) << "\" node_id=\"" << size_t(cur_rr_node)
<< "\" segment_id=\"" << size_t(src_segment_id) << "\" segment_id=\"" << size_t(src_segment_id)
<< "\" segment_name=\"" << rr_graph.get_segment(src_segment_id).name << "\" segment_name=\"" << rr_graph.rr_segments()[src_segment_id].name
<< "\" sb_module_pin_name=\"" << generate_sb_module_track_port_name(cur_node_type, oppo_side.get_side(), IN_PORT) << "\" sb_module_pin_name=\"" << generate_sb_module_track_port_name(cur_node_type, oppo_side.get_side(), IN_PORT)
<< "\"/>" << "\"/>"
<< std::endl; << std::endl;
@ -144,12 +144,11 @@ void write_rr_gsb_chan_connection_to_xml(std::fstream& fp,
SideManager driver_side(driver_node_side); SideManager driver_side(driver_node_side);
if (OPIN == rr_graph.node_type(driver_rr_node)) { if (OPIN == rr_graph.node_type(driver_rr_node)) {
SideManager grid_side(rr_graph.node_side(driver_rr_node));
fp << "\t\t<driver_node type=\"" << rr_node_typename[OPIN] fp << "\t\t<driver_node type=\"" << rr_node_typename[OPIN]
<< "\" side=\"" << driver_side.to_string() << "\" side=\"" << driver_side.to_string()
<< "\" index=\"" << driver_node_index << "\" index=\"" << driver_node_index
<< "\" node_id=\"" << size_t(driver_rr_node) << "\" node_id=\"" << size_t(driver_rr_node)
<< "\" grid_side=\"" << grid_side.to_string() << "\" grid_side=\"" << rr_graph.node_side_string(driver_rr_node)
<< "\" sb_module_pin_name=\"" << generate_sb_module_grid_port_name(gsb_side, driver_node_side, vpr_device_grid, vpr_device_annotation, rr_graph, driver_rr_node) << "\" sb_module_pin_name=\"" << generate_sb_module_grid_port_name(gsb_side, driver_node_side, vpr_device_grid, vpr_device_annotation, rr_graph, driver_rr_node)
<<"\"/>" <<"\"/>"
<< std::endl; << std::endl;
@ -160,7 +159,7 @@ void write_rr_gsb_chan_connection_to_xml(std::fstream& fp,
<< "\" index=\"" << driver_node_index << "\" index=\"" << driver_node_index
<< "\" node_id=\"" << size_t(driver_rr_node) << "\" node_id=\"" << size_t(driver_rr_node)
<< "\" segment_id=\"" << size_t(des_segment_id) << "\" segment_id=\"" << size_t(des_segment_id)
<< "\" segment_name=\"" << rr_graph.get_segment(des_segment_id).name << "\" segment_name=\"" << rr_graph.rr_segments()[des_segment_id].name
<< "\" sb_module_pin_name=\"" << generate_sb_module_track_port_name(rr_graph.node_type(driver_rr_node), driver_side.get_side(), IN_PORT) << "\" sb_module_pin_name=\"" << generate_sb_module_track_port_name(rr_graph.node_type(driver_rr_node), driver_side.get_side(), IN_PORT)
<< "\"/>" << "\"/>"
<< std::endl; << std::endl;

7
openfpga/src/base/openfpga_link_arch.cpp
View File

@ -47,10 +47,15 @@ bool is_vpr_rr_graph_supported(const RRGraphView& rr_graph) {
if (CHANX != rr_graph.node_type(node) && CHANY != rr_graph.node_type(node)) { if (CHANX != rr_graph.node_type(node) && CHANY != rr_graph.node_type(node)) {
continue; continue;
} }
if (BI_DIRECTION == rr_graph.node_direction(node)) { if (Direction::BIDIR == rr_graph.node_direction(node)) {
VTR_LOG_ERROR("Routing resource graph is bi-directional. OpenFPGA currently supports uni-directional routing architecture only.\n"); VTR_LOG_ERROR("Routing resource graph is bi-directional. OpenFPGA currently supports uni-directional routing architecture only.\n");
return false; return false;
} }
if (Direction::NONE == rr_graph.node_direction(node)) {
VTR_LOG_ERROR("Routing resource graph contains routing tracks which has not specific direction. OpenFPGA currently supports uni-directional routing architecture only.\n");
return false;
}
} }
return true; return true;

1
openfpga/src/base/openfpga_naming.h
View File

@ -17,6 +17,7 @@
#include "device_grid.h" #include "device_grid.h"
#include "openfpga_port.h" #include "openfpga_port.h"
#include "module_manager_fwd.h" #include "module_manager_fwd.h"
#include "rr_node_types.h"
/******************************************************************** /********************************************************************
* Function declaration * Function declaration