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 2023-09-17 23:16:38 -07:00
parent eeb1bd6662
commit e46e58527a
4 changed files with 112 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openfpga/src/fpga_bitstream/build_device_bitstream.cpp
View File

@ -208,14 +208,15 @@ BitstreamManager build_device_bitstream(const VprContext& vpr_ctx,
/* Create bitstream from grids */ /* Create bitstream from grids */
VTR_LOGV(verbose, "Building grid bitstream...\n"); VTR_LOGV(verbose, "Building grid bitstream...\n");
build_grid_bitstream(bitstream_manager, top_block, build_grid_bitstream(
openfpga_ctx.module_graph(), openfpga_ctx.module_name_map(), openfpga_ctx.fabric_tile(), bitstream_manager, top_block, openfpga_ctx.module_graph(),
openfpga_ctx.arch().circuit_lib, openfpga_ctx.mux_lib(), openfpga_ctx.module_name_map(), openfpga_ctx.fabric_tile(),
vpr_ctx.device().grid, 0, vpr_ctx.atom(), openfpga_ctx.arch().circuit_lib, openfpga_ctx.mux_lib(),
openfpga_ctx.vpr_device_annotation(), vpr_ctx.device().grid, 0, vpr_ctx.atom(),
openfpga_ctx.vpr_clustering_annotation(), openfpga_ctx.vpr_device_annotation(),
openfpga_ctx.vpr_placement_annotation(), openfpga_ctx.vpr_clustering_annotation(),
openfpga_ctx.vpr_bitstream_annotation(), verbose); openfpga_ctx.vpr_placement_annotation(),
openfpga_ctx.vpr_bitstream_annotation(), verbose);
VTR_LOGV(verbose, "Done\n"); VTR_LOGV(verbose, "Done\n");
/* Create bitstream from routing architectures */ /* Create bitstream from routing architectures */

128
openfpga/src/fpga_bitstream/build_grid_bitstream.cpp
View File

@ -180,11 +180,9 @@ static void build_physical_block_pin_interc_bitstream(
BitstreamManager& bitstream_manager, BitstreamManager& bitstream_manager,
std::map<std::string, size_t>& grouped_mem_inst_scoreboard, std::map<std::string, size_t>& grouped_mem_inst_scoreboard,
const ConfigBlockId& parent_configurable_block, const ConfigBlockId& parent_configurable_block,
const ModuleManager& module_manager, const ModuleManager& module_manager, const ModuleNameMap& module_name_map,
const ModuleNameMap& module_name_map, const CircuitLibrary& circuit_lib, const MuxLibrary& mux_lib,
const CircuitLibrary& circuit_lib, const AtomContext& atom_ctx, const VprDeviceAnnotation& device_annotation,
const MuxLibrary& mux_lib, const AtomContext& atom_ctx,
const VprDeviceAnnotation& device_annotation,
const VprBitstreamAnnotation& bitstream_annotation, const VprBitstreamAnnotation& bitstream_annotation,
const PhysicalPb& physical_pb, t_pb_graph_pin* des_pb_graph_pin, const PhysicalPb& physical_pb, t_pb_graph_pin* des_pb_graph_pin,
t_mode* physical_mode, const bool& verbose) { t_mode* physical_mode, const bool& verbose) {
@ -381,11 +379,9 @@ static void build_physical_block_interc_port_bitstream(
BitstreamManager& bitstream_manager, BitstreamManager& bitstream_manager,
std::map<std::string, size_t>& grouped_mem_inst_scoreboard, std::map<std::string, size_t>& grouped_mem_inst_scoreboard,
const ConfigBlockId& parent_configurable_block, const ConfigBlockId& parent_configurable_block,
const ModuleManager& module_manager, const ModuleManager& module_manager, const ModuleNameMap& module_name_map,
const ModuleNameMap& module_name_map, const CircuitLibrary& circuit_lib, const MuxLibrary& mux_lib,
const CircuitLibrary& circuit_lib, const AtomContext& atom_ctx, const VprDeviceAnnotation& device_annotation,
const MuxLibrary& mux_lib, const AtomContext& atom_ctx,
const VprDeviceAnnotation& device_annotation,
const VprBitstreamAnnotation& bitstream_annotation, const VprBitstreamAnnotation& bitstream_annotation,
t_pb_graph_node* physical_pb_graph_node, const PhysicalPb& physical_pb, t_pb_graph_node* physical_pb_graph_node, const PhysicalPb& physical_pb,
const e_circuit_pb_port_type& pb_port_type, t_mode* physical_mode, const e_circuit_pb_port_type& pb_port_type, t_mode* physical_mode,
@ -398,8 +394,9 @@ static void build_physical_block_interc_port_bitstream(
++ipin) { ++ipin) {
build_physical_block_pin_interc_bitstream( build_physical_block_pin_interc_bitstream(
bitstream_manager, grouped_mem_inst_scoreboard, bitstream_manager, grouped_mem_inst_scoreboard,
parent_configurable_block, module_manager, module_name_map, circuit_lib, mux_lib, parent_configurable_block, module_manager, module_name_map,
atom_ctx, device_annotation, bitstream_annotation, physical_pb, circuit_lib, mux_lib, atom_ctx, device_annotation,
bitstream_annotation, physical_pb,
&(physical_pb_graph_node->input_pins[iport][ipin]), physical_mode, &(physical_pb_graph_node->input_pins[iport][ipin]), physical_mode,
verbose); verbose);
} }
@ -412,8 +409,9 @@ static void build_physical_block_interc_port_bitstream(
ipin < physical_pb_graph_node->num_output_pins[iport]; ++ipin) { ipin < physical_pb_graph_node->num_output_pins[iport]; ++ipin) {
build_physical_block_pin_interc_bitstream( build_physical_block_pin_interc_bitstream(
bitstream_manager, grouped_mem_inst_scoreboard, bitstream_manager, grouped_mem_inst_scoreboard,
parent_configurable_block, module_manager, module_name_map, circuit_lib, mux_lib, parent_configurable_block, module_manager, module_name_map,
atom_ctx, device_annotation, bitstream_annotation, physical_pb, circuit_lib, mux_lib, atom_ctx, device_annotation,
bitstream_annotation, physical_pb,
&(physical_pb_graph_node->output_pins[iport][ipin]), physical_mode, &(physical_pb_graph_node->output_pins[iport][ipin]), physical_mode,
verbose); verbose);
} }
@ -426,8 +424,9 @@ static void build_physical_block_interc_port_bitstream(
++ipin) { ++ipin) {
build_physical_block_pin_interc_bitstream( build_physical_block_pin_interc_bitstream(
bitstream_manager, grouped_mem_inst_scoreboard, bitstream_manager, grouped_mem_inst_scoreboard,
parent_configurable_block, module_manager, module_name_map, circuit_lib, mux_lib, parent_configurable_block, module_manager, module_name_map,
atom_ctx, device_annotation, bitstream_annotation, physical_pb, circuit_lib, mux_lib, atom_ctx, device_annotation,
bitstream_annotation, physical_pb,
&(physical_pb_graph_node->clock_pins[iport][ipin]), physical_mode, &(physical_pb_graph_node->clock_pins[iport][ipin]), physical_mode,
verbose); verbose);
} }
@ -447,11 +446,9 @@ static void build_physical_block_interc_bitstream(
BitstreamManager& bitstream_manager, BitstreamManager& bitstream_manager,
std::map<std::string, size_t>& grouped_mem_inst_scoreboard, std::map<std::string, size_t>& grouped_mem_inst_scoreboard,
const ConfigBlockId& parent_configurable_block, const ConfigBlockId& parent_configurable_block,
const ModuleManager& module_manager, const ModuleManager& module_manager, const ModuleNameMap& module_name_map,
const ModuleNameMap& module_name_map, const CircuitLibrary& circuit_lib, const MuxLibrary& mux_lib,
const CircuitLibrary& circuit_lib, const AtomContext& atom_ctx, const VprDeviceAnnotation& device_annotation,
const MuxLibrary& mux_lib, const AtomContext& atom_ctx,
const VprDeviceAnnotation& device_annotation,
const VprBitstreamAnnotation& bitstream_annotation, const VprBitstreamAnnotation& bitstream_annotation,
t_pb_graph_node* physical_pb_graph_node, const PhysicalPb& physical_pb, t_pb_graph_node* physical_pb_graph_node, const PhysicalPb& physical_pb,
t_mode* physical_mode, const bool& verbose) { t_mode* physical_mode, const bool& verbose) {
@ -473,9 +470,9 @@ static void build_physical_block_interc_bitstream(
*/ */
build_physical_block_interc_port_bitstream( build_physical_block_interc_port_bitstream(
bitstream_manager, grouped_mem_inst_scoreboard, parent_configurable_block, bitstream_manager, grouped_mem_inst_scoreboard, parent_configurable_block,
module_manager, module_name_map, circuit_lib, mux_lib, atom_ctx, device_annotation, module_manager, module_name_map, circuit_lib, mux_lib, atom_ctx,
bitstream_annotation, physical_pb_graph_node, physical_pb, device_annotation, bitstream_annotation, physical_pb_graph_node,
CIRCUIT_PB_PORT_OUTPUT, physical_mode, verbose); physical_pb, CIRCUIT_PB_PORT_OUTPUT, physical_mode, verbose);
/* We check input_pins of child_pb_graph_node and its the input_edges /* We check input_pins of child_pb_graph_node and its the input_edges
* Iterate over the interconnections between inputs of physical_pb_graph_node * Iterate over the interconnections between inputs of physical_pb_graph_node
@ -496,15 +493,17 @@ static void build_physical_block_interc_bitstream(
/* For each child_pb_graph_node input pins*/ /* For each child_pb_graph_node input pins*/
build_physical_block_interc_port_bitstream( build_physical_block_interc_port_bitstream(
bitstream_manager, grouped_mem_inst_scoreboard, bitstream_manager, grouped_mem_inst_scoreboard,
parent_configurable_block, module_manager, module_name_map, circuit_lib, mux_lib, parent_configurable_block, module_manager, module_name_map, circuit_lib,
atom_ctx, device_annotation, bitstream_annotation, child_pb_graph_node, mux_lib, atom_ctx, device_annotation, bitstream_annotation,
physical_pb, CIRCUIT_PB_PORT_INPUT, physical_mode, verbose); child_pb_graph_node, physical_pb, CIRCUIT_PB_PORT_INPUT, physical_mode,
verbose);
/* For clock pins, we should do the same work */ /* For clock pins, we should do the same work */
build_physical_block_interc_port_bitstream( build_physical_block_interc_port_bitstream(
bitstream_manager, grouped_mem_inst_scoreboard, bitstream_manager, grouped_mem_inst_scoreboard,
parent_configurable_block, module_manager, module_name_map, circuit_lib, mux_lib, parent_configurable_block, module_manager, module_name_map, circuit_lib,
atom_ctx, device_annotation, bitstream_annotation, child_pb_graph_node, mux_lib, atom_ctx, device_annotation, bitstream_annotation,
physical_pb, CIRCUIT_PB_PORT_CLOCK, physical_mode, verbose); child_pb_graph_node, physical_pb, CIRCUIT_PB_PORT_CLOCK, physical_mode,
verbose);
} }
} }
} }
@ -707,11 +706,9 @@ static void rec_build_physical_block_bitstream(
BitstreamManager& bitstream_manager, BitstreamManager& bitstream_manager,
std::map<std::string, size_t>& grouped_mem_inst_scoreboard, std::map<std::string, size_t>& grouped_mem_inst_scoreboard,
const ConfigBlockId& parent_configurable_block, const ConfigBlockId& parent_configurable_block,
const ModuleManager& module_manager, const ModuleManager& module_manager, const ModuleNameMap& module_name_map,
const ModuleNameMap& module_name_map, const CircuitLibrary& circuit_lib, const MuxLibrary& mux_lib,
const CircuitLibrary& circuit_lib, const AtomContext& atom_ctx, const VprDeviceAnnotation& device_annotation,
const MuxLibrary& mux_lib, const AtomContext& atom_ctx,
const VprDeviceAnnotation& device_annotation,
const VprBitstreamAnnotation& bitstream_annotation, const e_side& border_side, const VprBitstreamAnnotation& bitstream_annotation, const e_side& border_side,
const PhysicalPb& physical_pb, const PhysicalPbId& pb_id, const PhysicalPb& physical_pb, const PhysicalPbId& pb_id,
t_pb_graph_node* physical_pb_graph_node, const size_t& pb_graph_node_index, t_pb_graph_node* physical_pb_graph_node, const size_t& pb_graph_node_index,
@ -771,8 +768,9 @@ static void rec_build_physical_block_bitstream(
/* Go recursively */ /* Go recursively */
rec_build_physical_block_bitstream( rec_build_physical_block_bitstream(
bitstream_manager, grouped_mem_inst_scoreboard, pb_configurable_block, bitstream_manager, grouped_mem_inst_scoreboard, pb_configurable_block,
module_manager, module_name_map, circuit_lib, mux_lib, atom_ctx, device_annotation, module_manager, module_name_map, circuit_lib, mux_lib, atom_ctx,
bitstream_annotation, border_side, physical_pb, child_pb, device_annotation, bitstream_annotation, border_side, physical_pb,
child_pb,
&(physical_pb_graph_node &(physical_pb_graph_node
->child_pb_graph_nodes[physical_mode->index][ipb][jpb]), ->child_pb_graph_nodes[physical_mode->index][ipb][jpb]),
jpb, verbose); jpb, verbose);
@ -817,9 +815,9 @@ static void rec_build_physical_block_bitstream(
/* Generate the bitstream for the interconnection in this physical block */ /* Generate the bitstream for the interconnection in this physical block */
build_physical_block_interc_bitstream( build_physical_block_interc_bitstream(
bitstream_manager, grouped_mem_inst_scoreboard, pb_configurable_block, bitstream_manager, grouped_mem_inst_scoreboard, pb_configurable_block,
module_manager, module_name_map, circuit_lib, mux_lib, atom_ctx, device_annotation, module_manager, module_name_map, circuit_lib, mux_lib, atom_ctx,
bitstream_annotation, physical_pb_graph_node, physical_pb, physical_mode, device_annotation, bitstream_annotation, physical_pb_graph_node,
verbose); physical_pb, physical_mode, verbose);
} }
/******************************************************************** /********************************************************************
@ -830,12 +828,10 @@ static void rec_build_physical_block_bitstream(
*******************************************************************/ *******************************************************************/
static void build_physical_block_bitstream( static void build_physical_block_bitstream(
BitstreamManager& bitstream_manager, const ConfigBlockId& top_block, BitstreamManager& bitstream_manager, const ConfigBlockId& top_block,
const ModuleManager& module_manager, const ModuleManager& module_manager, const ModuleNameMap& module_name_map,
const ModuleNameMap& module_name_map, const FabricTile& fabric_tile, const FabricTileId& curr_tile,
const FabricTile& fabric_tile, const CircuitLibrary& circuit_lib, const MuxLibrary& mux_lib,
const FabricTileId& curr_tile, const CircuitLibrary& circuit_lib, const AtomContext& atom_ctx, const VprDeviceAnnotation& device_annotation,
const MuxLibrary& mux_lib, const AtomContext& atom_ctx,
const VprDeviceAnnotation& device_annotation,
const VprClusteringAnnotation& cluster_annotation, const VprClusteringAnnotation& cluster_annotation,
const VprPlacementAnnotation& place_annotation, const VprPlacementAnnotation& place_annotation,
const VprBitstreamAnnotation& bitstream_annotation, const DeviceGrid& grids, const VprBitstreamAnnotation& bitstream_annotation, const DeviceGrid& grids,
@ -932,10 +928,10 @@ static void build_physical_block_bitstream(
/* Recursively traverse the pb_graph and generate bitstream */ /* Recursively traverse the pb_graph and generate bitstream */
rec_build_physical_block_bitstream( rec_build_physical_block_bitstream(
bitstream_manager, grouped_mem_inst_scoreboard, bitstream_manager, grouped_mem_inst_scoreboard,
grid_configurable_block, module_manager, module_name_map, circuit_lib, mux_lib, grid_configurable_block, module_manager, module_name_map, circuit_lib,
atom_ctx, device_annotation, bitstream_annotation, border_side, mux_lib, atom_ctx, device_annotation, bitstream_annotation,
PhysicalPb(), PhysicalPbId::INVALID(), lb_type->pb_graph_head, z, border_side, PhysicalPb(), PhysicalPbId::INVALID(),
verbose); lb_type->pb_graph_head, z, verbose);
} else { } else {
const PhysicalPb& phy_pb = cluster_annotation.physical_pb( const PhysicalPb& phy_pb = cluster_annotation.physical_pb(
place_annotation.grid_blocks(grid_coord)[z]); place_annotation.grid_blocks(grid_coord)[z]);
@ -948,9 +944,9 @@ static void build_physical_block_bitstream(
/* Recursively traverse the pb_graph and generate bitstream */ /* Recursively traverse the pb_graph and generate bitstream */
rec_build_physical_block_bitstream( rec_build_physical_block_bitstream(
bitstream_manager, grouped_mem_inst_scoreboard, bitstream_manager, grouped_mem_inst_scoreboard,
grid_configurable_block, module_manager, module_name_map, circuit_lib, mux_lib, grid_configurable_block, module_manager, module_name_map, circuit_lib,
atom_ctx, device_annotation, bitstream_annotation, border_side, mux_lib, atom_ctx, device_annotation, bitstream_annotation,
phy_pb, top_pb_id, pb_graph_head, z, verbose); border_side, phy_pb, top_pb_id, pb_graph_head, z, verbose);
} }
} }
} }
@ -964,12 +960,10 @@ static void build_physical_block_bitstream(
*******************************************************************/ *******************************************************************/
void build_grid_bitstream( void build_grid_bitstream(
BitstreamManager& bitstream_manager, const ConfigBlockId& top_block, BitstreamManager& bitstream_manager, const ConfigBlockId& top_block,
const ModuleManager& module_manager, const ModuleManager& module_manager, const ModuleNameMap& module_name_map,
const ModuleNameMap& module_name_map, const FabricTile& fabric_tile, const CircuitLibrary& circuit_lib,
const FabricTile& fabric_tile, const MuxLibrary& mux_lib, const DeviceGrid& grids, const size_t& layer,
const CircuitLibrary& circuit_lib, const MuxLibrary& mux_lib, const AtomContext& atom_ctx, const VprDeviceAnnotation& device_annotation,
const DeviceGrid& grids, const size_t& layer, const AtomContext& atom_ctx,
const VprDeviceAnnotation& device_annotation,
const VprClusteringAnnotation& cluster_annotation, const VprClusteringAnnotation& cluster_annotation,
const VprPlacementAnnotation& place_annotation, const VprPlacementAnnotation& place_annotation,
const VprBitstreamAnnotation& bitstream_annotation, const bool& verbose) { const VprBitstreamAnnotation& bitstream_annotation, const bool& verbose) {
@ -1010,10 +1004,10 @@ void build_grid_bitstream(
} }
build_physical_block_bitstream( build_physical_block_bitstream(
bitstream_manager, parent_block, module_manager, module_name_map, fabric_tile, curr_tile, bitstream_manager, parent_block, module_manager, module_name_map,
circuit_lib, mux_lib, atom_ctx, device_annotation, cluster_annotation, fabric_tile, curr_tile, circuit_lib, mux_lib, atom_ctx,
place_annotation, bitstream_annotation, grids, layer, grid_coord, device_annotation, cluster_annotation, place_annotation,
NUM_SIDES, verbose); bitstream_annotation, grids, layer, grid_coord, NUM_SIDES, verbose);
} }
} }
VTR_LOGV(verbose, "Done\n"); VTR_LOGV(verbose, "Done\n");
@ -1058,10 +1052,10 @@ void build_grid_bitstream(
} }
build_physical_block_bitstream( build_physical_block_bitstream(
bitstream_manager, parent_block, module_manager, module_name_map, fabric_tile, curr_tile, bitstream_manager, parent_block, module_manager, module_name_map,
circuit_lib, mux_lib, atom_ctx, device_annotation, cluster_annotation, fabric_tile, curr_tile, circuit_lib, mux_lib, atom_ctx,
place_annotation, bitstream_annotation, grids, layer, io_coordinate, device_annotation, cluster_annotation, place_annotation,
io_side, verbose); bitstream_annotation, grids, layer, io_coordinate, io_side, verbose);
} }
} }
VTR_LOGV(verbose, "Done\n"); VTR_LOGV(verbose, "Done\n");

10
openfpga/src/fpga_bitstream/build_grid_bitstream.h
View File

@ -28,12 +28,10 @@ namespace openfpga {
void build_grid_bitstream( void build_grid_bitstream(
BitstreamManager& bitstream_manager, const ConfigBlockId& top_block, BitstreamManager& bitstream_manager, const ConfigBlockId& top_block,
const ModuleManager& module_manager, const ModuleManager& module_manager, const ModuleNameMap& module_name_map,
const ModuleNameMap& module_name_map, const FabricTile& fabric_tile, const CircuitLibrary& circuit_lib,
const FabricTile& fabric_tile, const MuxLibrary& mux_lib, const DeviceGrid& grids, const size_t& layer,
const CircuitLibrary& circuit_lib, const MuxLibrary& mux_lib, const AtomContext& atom_ctx, const VprDeviceAnnotation& device_annotation,
const DeviceGrid& grids, const size_t& layer, const AtomContext& atom_ctx,
const VprDeviceAnnotation& device_annotation,
const VprClusteringAnnotation& cluster_annotation, const VprClusteringAnnotation& cluster_annotation,
const VprPlacementAnnotation& place_annotation, const VprPlacementAnnotation& place_annotation,
const VprBitstreamAnnotation& bitstream_annotation, const bool& verbose); const VprBitstreamAnnotation& bitstream_annotation, const bool& verbose);

85
openfpga/src/fpga_bitstream/build_routing_bitstream.cpp
View File

@ -33,12 +33,11 @@ namespace openfpga {
*******************************************************************/ *******************************************************************/
static void build_switch_block_mux_bitstream( static void build_switch_block_mux_bitstream(
BitstreamManager& bitstream_manager, const ConfigBlockId& mux_mem_block, BitstreamManager& bitstream_manager, const ConfigBlockId& mux_mem_block,
const ModuleManager& module_manager, const ModuleManager& module_manager, const ModuleNameMap& module_name_map,
const ModuleNameMap& module_name_map, const CircuitLibrary& circuit_lib, const MuxLibrary& mux_lib,
const CircuitLibrary& circuit_lib, const RRGraphView& rr_graph, const RRNodeId& cur_rr_node,
const MuxLibrary& mux_lib, const RRGraphView& rr_graph, const std::vector<RRNodeId>& drive_rr_nodes, const AtomContext& atom_ctx,
const RRNodeId& cur_rr_node, const std::vector<RRNodeId>& drive_rr_nodes, const VprDeviceAnnotation& device_annotation,
const AtomContext& atom_ctx, const VprDeviceAnnotation& device_annotation,
const VprRoutingAnnotation& routing_annotation, const bool& verbose) { const VprRoutingAnnotation& routing_annotation, const bool& verbose) {
/* Check current rr_node is CHANX or CHANY*/ /* Check current rr_node is CHANX or CHANY*/
VTR_ASSERT((CHANX == rr_graph.node_type(cur_rr_node)) || VTR_ASSERT((CHANX == rr_graph.node_type(cur_rr_node)) ||
@ -155,11 +154,10 @@ static void build_switch_block_mux_bitstream(
static void build_switch_block_interc_bitstream( static void build_switch_block_interc_bitstream(
BitstreamManager& bitstream_manager, BitstreamManager& bitstream_manager,
const ConfigBlockId& sb_configurable_block, const ConfigBlockId& sb_configurable_block,
const ModuleManager& module_manager, const ModuleManager& module_manager, const ModuleNameMap& module_name_map,
const ModuleNameMap& module_name_map, const CircuitLibrary& circuit_lib, const MuxLibrary& mux_lib,
const CircuitLibrary& circuit_lib, const RRGraphView& rr_graph, const AtomContext& atom_ctx,
const MuxLibrary& mux_lib, const RRGraphView& rr_graph, const VprDeviceAnnotation& device_annotation,
const AtomContext& atom_ctx, const VprDeviceAnnotation& device_annotation,
const VprRoutingAnnotation& routing_annotation, const RRGSB& rr_gsb, const VprRoutingAnnotation& routing_annotation, const RRGSB& rr_gsb,
const e_side& chan_side, const size_t& chan_node_id, const bool& verbose) { const e_side& chan_side, const size_t& chan_node_id, const bool& verbose) {
std::vector<RRNodeId> driver_rr_nodes; std::vector<RRNodeId> driver_rr_nodes;
@ -195,9 +193,9 @@ static void build_switch_block_interc_bitstream(
bitstream_manager.block_name(sb_configurable_block).c_str()); bitstream_manager.block_name(sb_configurable_block).c_str());
/* This is a routing multiplexer! Generate bitstream */ /* This is a routing multiplexer! Generate bitstream */
build_switch_block_mux_bitstream( build_switch_block_mux_bitstream(
bitstream_manager, mux_mem_block, module_manager, module_name_map, circuit_lib, mux_lib, bitstream_manager, mux_mem_block, module_manager, module_name_map,
rr_graph, cur_rr_node, driver_rr_nodes, atom_ctx, device_annotation, circuit_lib, mux_lib, rr_graph, cur_rr_node, driver_rr_nodes, atom_ctx,
routing_annotation, verbose); device_annotation, routing_annotation, verbose);
} /*Nothing should be done else*/ } /*Nothing should be done else*/
} }
@ -215,9 +213,8 @@ static void build_switch_block_interc_bitstream(
static void build_switch_block_bitstream( static void build_switch_block_bitstream(
BitstreamManager& bitstream_manager, const ConfigBlockId& sb_config_block, BitstreamManager& bitstream_manager, const ConfigBlockId& sb_config_block,
const ModuleManager& module_manager, const ModuleNameMap& module_name_map, const ModuleManager& module_manager, const ModuleNameMap& module_name_map,
const CircuitLibrary& circuit_lib, const CircuitLibrary& circuit_lib, const MuxLibrary& mux_lib,
const MuxLibrary& mux_lib, const AtomContext& atom_ctx, const AtomContext& atom_ctx, const VprDeviceAnnotation& device_annotation,
const VprDeviceAnnotation& device_annotation,
const VprRoutingAnnotation& routing_annotation, const RRGraphView& rr_graph, const VprRoutingAnnotation& routing_annotation, const RRGraphView& rr_graph,
const RRGSB& rr_gsb, const bool& verbose) { const RRGSB& rr_gsb, const bool& verbose) {
/* Iterate over all the multiplexers */ /* Iterate over all the multiplexers */
@ -235,9 +232,9 @@ static void build_switch_block_bitstream(
continue; continue;
} }
build_switch_block_interc_bitstream( build_switch_block_interc_bitstream(
bitstream_manager, sb_config_block, module_manager, module_name_map, circuit_lib, bitstream_manager, sb_config_block, module_manager, module_name_map,
mux_lib, rr_graph, atom_ctx, device_annotation, routing_annotation, circuit_lib, mux_lib, rr_graph, atom_ctx, device_annotation,
rr_gsb, side_manager.get_side(), itrack, verbose); routing_annotation, rr_gsb, side_manager.get_side(), itrack, verbose);
} }
} }
} }
@ -251,11 +248,9 @@ static void build_switch_block_bitstream(
*******************************************************************/ *******************************************************************/
static void build_connection_block_mux_bitstream( static void build_connection_block_mux_bitstream(
BitstreamManager& bitstream_manager, const ConfigBlockId& mux_mem_block, BitstreamManager& bitstream_manager, const ConfigBlockId& mux_mem_block,
const ModuleManager& module_manager, const ModuleManager& module_manager, const ModuleNameMap& module_name_map,
const ModuleNameMap& module_name_map, const CircuitLibrary& circuit_lib, const MuxLibrary& mux_lib,
const CircuitLibrary& circuit_lib, const AtomContext& atom_ctx, const VprDeviceAnnotation& device_annotation,
const MuxLibrary& mux_lib, const AtomContext& atom_ctx,
const VprDeviceAnnotation& device_annotation,
const VprRoutingAnnotation& routing_annotation, const RRGraphView& rr_graph, const VprRoutingAnnotation& routing_annotation, const RRGraphView& rr_graph,
const RRGSB& rr_gsb, const e_side& cb_ipin_side, const size_t& ipin_index, const RRGSB& rr_gsb, const e_side& cb_ipin_side, const size_t& ipin_index,
const bool& verbose) { const bool& verbose) {
@ -377,11 +372,9 @@ static void build_connection_block_mux_bitstream(
static void build_connection_block_interc_bitstream( static void build_connection_block_interc_bitstream(
BitstreamManager& bitstream_manager, BitstreamManager& bitstream_manager,
const ConfigBlockId& cb_configurable_block, const ConfigBlockId& cb_configurable_block,
const ModuleManager& module_manager, const ModuleManager& module_manager, const ModuleNameMap& module_name_map,
const ModuleNameMap& module_name_map, const CircuitLibrary& circuit_lib, const MuxLibrary& mux_lib,
const CircuitLibrary& circuit_lib, const AtomContext& atom_ctx, const VprDeviceAnnotation& device_annotation,
const MuxLibrary& mux_lib, const AtomContext& atom_ctx,
const VprDeviceAnnotation& device_annotation,
const VprRoutingAnnotation& routing_annotation, const RRGraphView& rr_graph, const VprRoutingAnnotation& routing_annotation, const RRGraphView& rr_graph,
const RRGSB& rr_gsb, const e_side& cb_ipin_side, const size_t& ipin_index, const RRGSB& rr_gsb, const e_side& cb_ipin_side, const size_t& ipin_index,
const bool& verbose) { const bool& verbose) {
@ -413,9 +406,9 @@ static void build_connection_block_interc_bitstream(
bitstream_manager.block_name(cb_configurable_block).c_str()); bitstream_manager.block_name(cb_configurable_block).c_str());
/* This is a routing multiplexer! Generate bitstream */ /* This is a routing multiplexer! Generate bitstream */
build_connection_block_mux_bitstream( build_connection_block_mux_bitstream(
bitstream_manager, mux_mem_block, module_manager, module_name_map, circuit_lib, mux_lib, bitstream_manager, mux_mem_block, module_manager, module_name_map,
atom_ctx, device_annotation, routing_annotation, rr_graph, rr_gsb, circuit_lib, mux_lib, atom_ctx, device_annotation, routing_annotation,
cb_ipin_side, ipin_index, verbose); rr_graph, rr_gsb, cb_ipin_side, ipin_index, verbose);
} /*Nothing should be done else*/ } /*Nothing should be done else*/
} }
@ -433,11 +426,9 @@ static void build_connection_block_interc_bitstream(
static void build_connection_block_bitstream( static void build_connection_block_bitstream(
BitstreamManager& bitstream_manager, BitstreamManager& bitstream_manager,
const ConfigBlockId& cb_configurable_block, const ConfigBlockId& cb_configurable_block,
const ModuleManager& module_manager, const ModuleManager& module_manager, const ModuleNameMap& module_name_map,
const ModuleNameMap& module_name_map, const CircuitLibrary& circuit_lib, const MuxLibrary& mux_lib,
const CircuitLibrary& circuit_lib, const AtomContext& atom_ctx, const VprDeviceAnnotation& device_annotation,
const MuxLibrary& mux_lib, const AtomContext& atom_ctx,
const VprDeviceAnnotation& device_annotation,
const VprRoutingAnnotation& routing_annotation, const RRGraphView& rr_graph, const VprRoutingAnnotation& routing_annotation, const RRGraphView& rr_graph,
const RRGSB& rr_gsb, const t_rr_type& cb_type, const bool& verbose) { const RRGSB& rr_gsb, const t_rr_type& cb_type, const bool& verbose) {
/* Find routing multiplexers on the sides of a Connection block where IPIN /* Find routing multiplexers on the sides of a Connection block where IPIN
@ -452,9 +443,9 @@ static void build_connection_block_bitstream(
VTR_LOGV(verbose, "\tGenerating bitstream for IPIN at '%s' side\n", VTR_LOGV(verbose, "\tGenerating bitstream for IPIN at '%s' side\n",
side_manager.to_string().c_str()); side_manager.to_string().c_str());
build_connection_block_interc_bitstream( build_connection_block_interc_bitstream(
bitstream_manager, cb_configurable_block, module_manager, module_name_map, circuit_lib, bitstream_manager, cb_configurable_block, module_manager,
mux_lib, atom_ctx, device_annotation, routing_annotation, rr_graph, module_name_map, circuit_lib, mux_lib, atom_ctx, device_annotation,
rr_gsb, cb_ipin_side, inode, verbose); routing_annotation, rr_graph, rr_gsb, cb_ipin_side, inode, verbose);
} }
} }
} }
@ -593,9 +584,9 @@ static void build_connection_block_bitstreams(
} }
build_connection_block_bitstream( build_connection_block_bitstream(
bitstream_manager, cb_configurable_block, module_manager, module_name_map, circuit_lib, bitstream_manager, cb_configurable_block, module_manager,
mux_lib, atom_ctx, device_annotation, routing_annotation, rr_graph, module_name_map, circuit_lib, mux_lib, atom_ctx, device_annotation,
rr_gsb, cb_type, verbose); routing_annotation, rr_graph, rr_gsb, cb_type, verbose);
VTR_LOGV(verbose, "\tDone\n"); VTR_LOGV(verbose, "\tDone\n");
} }
@ -725,9 +716,9 @@ void build_routing_bitstream(
} }
build_switch_block_bitstream( build_switch_block_bitstream(
bitstream_manager, sb_configurable_block, module_manager, module_name_map, circuit_lib, bitstream_manager, sb_configurable_block, module_manager,
mux_lib, atom_ctx, device_annotation, routing_annotation, rr_graph, module_name_map, circuit_lib, mux_lib, atom_ctx, device_annotation,
rr_gsb, verbose); routing_annotation, rr_graph, rr_gsb, verbose);
VTR_LOGV(verbose, "\tDone\n"); VTR_LOGV(verbose, "\tDone\n");
} }