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

[core] code format

This commit is contained in:
tangxifan 2024-05-19 17:24:38 -07:00
parent 1a05c30b72
commit b554a3d855
3 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openfpga/src/fabric/build_routing_modules.cpp
View File

@ -998,9 +998,10 @@ static void build_connection_block_module(
std::vector<enum e_side> cb_opin_sides = rr_gsb.get_cb_opin_sides(cb_type); std::vector<enum e_side> cb_opin_sides = rr_gsb.get_cb_opin_sides(cb_type);
for (size_t iside = 0; iside < cb_opin_sides.size(); ++iside) { for (size_t iside = 0; iside < cb_opin_sides.size(); ++iside) {
enum e_side cb_opin_side = cb_opin_sides[iside]; enum e_side cb_opin_side = cb_opin_sides[iside];
for (size_t inode = 0; inode < rr_gsb.get_num_cb_opin_nodes(cb_type, cb_opin_side); for (size_t inode = 0;
++inode) { inode < rr_gsb.get_num_cb_opin_nodes(cb_type, cb_opin_side); ++inode) {
RRNodeId opin_node = rr_gsb.get_cb_opin_node(cb_type, cb_opin_side, inode); RRNodeId opin_node =
rr_gsb.get_cb_opin_node(cb_type, cb_opin_side, inode);
std::string port_name = generate_cb_module_grid_port_name( std::string port_name = generate_cb_module_grid_port_name(
cb_opin_side, grids, device_annotation, rr_graph, opin_node); cb_opin_side, grids, device_annotation, rr_graph, opin_node);
BasicPort module_port(port_name, BasicPort module_port(port_name,

49
openfpga/src/fabric/build_tile_modules.cpp
View File

@ -475,10 +475,12 @@ static int build_tile_module_port_and_nets_between_cb_and_pb(
std::vector<enum e_side> cb_opin_sides = module_cb.get_cb_opin_sides(cb_type); std::vector<enum e_side> cb_opin_sides = module_cb.get_cb_opin_sides(cb_type);
for (size_t iside = 0; iside < cb_opin_sides.size(); ++iside) { for (size_t iside = 0; iside < cb_opin_sides.size(); ++iside) {
enum e_side cb_opin_side = cb_opin_sides[iside]; enum e_side cb_opin_side = cb_opin_sides[iside];
for (size_t inode = 0; inode < module_cb.get_num_cb_opin_nodes(cb_type, cb_opin_side); for (size_t inode = 0;
inode < module_cb.get_num_cb_opin_nodes(cb_type, cb_opin_side);
++inode) { ++inode) {
/* Collect source-related information */ /* Collect source-related information */
RRNodeId module_opin_node = module_cb.get_cb_opin_node(cb_type, cb_opin_side, inode); RRNodeId module_opin_node =
module_cb.get_cb_opin_node(cb_type, cb_opin_side, inode);
vtr::Point<size_t> cb_src_port_coord( vtr::Point<size_t> cb_src_port_coord(
rr_graph.node_xlow(module_opin_node), rr_graph.node_xlow(module_opin_node),
rr_graph.node_ylow(module_opin_node)); rr_graph.node_ylow(module_opin_node));
@ -495,7 +497,8 @@ static int build_tile_module_port_and_nets_between_cb_and_pb(
/* Note that we use the instance cb pin here!!! /* Note that we use the instance cb pin here!!!
* because it has the correct coordinator for the grid!!! * because it has the correct coordinator for the grid!!!
*/ */
RRNodeId instance_opin_node = rr_gsb.get_cb_opin_node(cb_type, cb_opin_side, inode); RRNodeId instance_opin_node =
rr_gsb.get_cb_opin_node(cb_type, cb_opin_side, inode);
vtr::Point<size_t> grid_coordinate( vtr::Point<size_t> grid_coordinate(
rr_graph.node_xlow(instance_opin_node), rr_graph.node_xlow(instance_opin_node),
rr_graph.node_ylow(instance_opin_node)); rr_graph.node_ylow(instance_opin_node));
@ -543,44 +546,48 @@ static int build_tile_module_port_and_nets_between_cb_and_pb(
/* Source and sink port should match in size */ /* Source and sink port should match in size */
VTR_ASSERT(src_cb_port.get_width() == sink_grid_port.get_width()); VTR_ASSERT(src_cb_port.get_width() == sink_grid_port.get_width());
/* Create a net for each pin. Note that the sink and source tags are reverted in the following code!!! */ /* Create a net for each pin. Note that the sink and source tags are
* reverted in the following code!!! */
for (size_t pin_id = 0; pin_id < src_cb_port.pins().size(); for (size_t pin_id = 0; pin_id < src_cb_port.pins().size();
++pin_id) { ++pin_id) {
ModuleNetId net = create_module_source_pin_net( ModuleNetId net = create_module_source_pin_net(
module_manager, tile_module, sink_grid_module, sink_grid_instance, module_manager, tile_module, sink_grid_module, sink_grid_instance,
sink_grid_port_id, sink_grid_port.pins()[pin_id]); sink_grid_port_id, sink_grid_port.pins()[pin_id]);
/* Configure the net sink */ /* Configure the net sink */
module_manager.add_module_net_sink( module_manager.add_module_net_sink(tile_module, net, src_cb_module,
tile_module, net, src_cb_module, src_cb_instance, src_cb_instance, src_cb_port_id,
src_cb_port_id, src_cb_port.pins()[pin_id]); src_cb_port.pins()[pin_id]);
} }
} }
} else { } else {
/* Special: No need to create a new port! Since we only support OPINs from Switch blocks. Walk through all the switch blocks and find the new port that it is created when connecting pb and sb */ /* Special: No need to create a new port! Since we only support OPINs
* from Switch blocks. Walk through all the switch blocks and find the
* new port that it is created when connecting pb and sb */
if (!frame_view) { if (!frame_view) {
/* This is the source sb that is added to the top module */ /* This is the source sb that is added to the top module */
const RRGSB& module_sb = device_rr_gsb.get_gsb(module_gsb_coordinate); const RRGSB& module_sb = device_rr_gsb.get_gsb(module_gsb_coordinate);
vtr::Point<size_t> module_sb_coordinate(module_sb.get_sb_x(), vtr::Point<size_t> module_sb_coordinate(module_sb.get_sb_x(),
module_sb.get_sb_y()); module_sb.get_sb_y());
/* Collect sink-related information */ /* Collect sink-related information */
std::string sink_sb_module_name = std::string sink_sb_module_name =
generate_switch_block_module_name(module_sb_coordinate); generate_switch_block_module_name(module_sb_coordinate);
ModuleId sink_sb_module = module_manager.find_module(sink_sb_module_name); ModuleId sink_sb_module =
module_manager.find_module(sink_sb_module_name);
VTR_ASSERT(true == module_manager.valid_module_id(sink_sb_module)); VTR_ASSERT(true == module_manager.valid_module_id(sink_sb_module));
size_t isb = fabric_tile.find_sb_index_in_tile(fabric_tile_id, module_sb_coordinate); size_t isb = fabric_tile.find_sb_index_in_tile(fabric_tile_id,
module_sb_coordinate);
std::string temp_sb_module_name = generate_switch_block_module_name( std::string temp_sb_module_name = generate_switch_block_module_name(
fabric_tile.sb_coordinates(fabric_tile_id)[isb]); fabric_tile.sb_coordinates(fabric_tile_id)[isb]);
if (name_module_using_index) { if (name_module_using_index) {
temp_sb_module_name = temp_sb_module_name =
generate_switch_block_module_name_using_index(isb); generate_switch_block_module_name_using_index(isb);
} }
/* FIXME: may find a way to determine the side. Currently using cb_opin_side is fine */ /* FIXME: may find a way to determine the side. Currently using
* cb_opin_side is fine */
vtr::Point<size_t> sink_sb_port_coord( vtr::Point<size_t> sink_sb_port_coord(
rr_graph.node_xlow( rr_graph.node_xlow(module_sb.get_opin_node(cb_opin_side, inode)),
module_sb.get_opin_node(cb_opin_side, inode)), rr_graph.node_ylow(module_sb.get_opin_node(cb_opin_side, inode)));
rr_graph.node_ylow(
module_sb.get_opin_node(cb_opin_side, inode)));
std::string sink_sb_port_name = generate_sb_module_grid_port_name( std::string sink_sb_port_name = generate_sb_module_grid_port_name(
cb_opin_side, cb_opin_side,
get_rr_graph_single_node_side( get_rr_graph_single_node_side(
@ -589,8 +596,8 @@ static int build_tile_module_port_and_nets_between_cb_and_pb(
module_sb.get_opin_node(cb_opin_side, inode)); module_sb.get_opin_node(cb_opin_side, inode));
ModulePortId sink_sb_port_id = ModulePortId sink_sb_port_id =
module_manager.find_module_port(sink_sb_module, sink_sb_port_name); module_manager.find_module_port(sink_sb_module, sink_sb_port_name);
VTR_ASSERT(true == module_manager.valid_module_port_id(sink_sb_module, VTR_ASSERT(true == module_manager.valid_module_port_id(
sink_sb_port_id)); sink_sb_module, sink_sb_port_id));
BasicPort sink_sb_port = BasicPort sink_sb_port =
module_manager.module_port(sink_sb_module, sink_sb_port_id); module_manager.module_port(sink_sb_module, sink_sb_port_id);
@ -607,9 +614,9 @@ static int build_tile_module_port_and_nets_between_cb_and_pb(
module_manager, tile_module, tile_module, 0, src_tile_port_id, module_manager, tile_module, tile_module, 0, src_tile_port_id,
sink_sb_port.pins()[pin_id]); sink_sb_port.pins()[pin_id]);
/* Configure the net sink */ /* Configure the net sink */
module_manager.add_module_net_sink( module_manager.add_module_net_sink(tile_module, net, src_cb_module,
tile_module, net, src_cb_module, src_cb_instance, src_cb_instance, src_cb_port_id,
src_cb_port_id, src_cb_port.pins()[pin_id]); src_cb_port.pins()[pin_id]);
} }
} }
} }

19
openfpga/src/fabric/build_top_module_connection.cpp
View File

@ -568,10 +568,12 @@ static void add_top_module_nets_connect_grids_and_cb(
std::vector<enum e_side> cb_opin_sides = module_cb.get_cb_opin_sides(cb_type); std::vector<enum e_side> cb_opin_sides = module_cb.get_cb_opin_sides(cb_type);
for (size_t iside = 0; iside < cb_opin_sides.size(); ++iside) { for (size_t iside = 0; iside < cb_opin_sides.size(); ++iside) {
enum e_side cb_opin_side = cb_opin_sides[iside]; enum e_side cb_opin_side = cb_opin_sides[iside];
for (size_t inode = 0; inode < module_cb.get_num_cb_opin_nodes(cb_type, cb_opin_side); for (size_t inode = 0;
inode < module_cb.get_num_cb_opin_nodes(cb_type, cb_opin_side);
++inode) { ++inode) {
/* Collect source-related information */ /* Collect source-related information */
RRNodeId module_opin_node = module_cb.get_cb_opin_node(cb_type, cb_opin_side, inode); RRNodeId module_opin_node =
module_cb.get_cb_opin_node(cb_type, cb_opin_side, inode);
vtr::Point<size_t> cb_src_port_coord( vtr::Point<size_t> cb_src_port_coord(
rr_graph.node_xlow(module_opin_node), rr_graph.node_xlow(module_opin_node),
rr_graph.node_ylow(module_opin_node)); rr_graph.node_ylow(module_opin_node));
@ -588,7 +590,8 @@ static void add_top_module_nets_connect_grids_and_cb(
/* Note that we use the instance cb pin here!!! /* Note that we use the instance cb pin here!!!
* because it has the correct coordinator for the grid!!! * because it has the correct coordinator for the grid!!!
*/ */
RRNodeId instance_opin_node = rr_gsb.get_cb_opin_node(cb_type, cb_opin_side, inode); RRNodeId instance_opin_node =
rr_gsb.get_cb_opin_node(cb_type, cb_opin_side, inode);
vtr::Point<size_t> grid_coordinate( vtr::Point<size_t> grid_coordinate(
rr_graph.node_xlow(instance_opin_node), rr_graph.node_xlow(instance_opin_node),
rr_graph.node_ylow(instance_opin_node)); rr_graph.node_ylow(instance_opin_node));
@ -631,19 +634,19 @@ static void add_top_module_nets_connect_grids_and_cb(
/* Source and sink port should match in size */ /* Source and sink port should match in size */
VTR_ASSERT(src_cb_port.get_width() == sink_grid_port.get_width()); VTR_ASSERT(src_cb_port.get_width() == sink_grid_port.get_width());
/* Create a net for each pin. Note that the src/sink tag is reverted in the following code. */ /* Create a net for each pin. Note that the src/sink tag is reverted in
* the following code. */
for (size_t pin_id = 0; pin_id < src_cb_port.pins().size(); ++pin_id) { for (size_t pin_id = 0; pin_id < src_cb_port.pins().size(); ++pin_id) {
ModuleNetId net = create_module_source_pin_net( ModuleNetId net = create_module_source_pin_net(
module_manager, top_module, sink_grid_module, sink_grid_instance, module_manager, top_module, sink_grid_module, sink_grid_instance,
sink_grid_port_id, sink_grid_port.pins()[pin_id]); sink_grid_port_id, sink_grid_port.pins()[pin_id]);
/* Configure the net sink */ /* Configure the net sink */
module_manager.add_module_net_sink( module_manager.add_module_net_sink(top_module, net, src_cb_module,
top_module, net, src_cb_module, src_cb_instance, src_cb_instance, src_cb_port_id,
src_cb_port_id, src_cb_port.pins()[pin_id]); src_cb_port.pins()[pin_id]);
} }
} }
} }
} }
/******************************************************************** /********************************************************************