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

[core] adapt to side var changes

This commit is contained in:
tangxifan 2024-10-07 14:20:48 -07:00
parent 9423f6ba3d
commit 4f96680e1f
32 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/libopenfpgautil/src/openfpga_side_manager.cpp
View File

@ -9,7 +9,7 @@ namespace openfpga {
/* Constructors */ /* Constructors */
SideManager::SideManager(enum e_side side) { side_ = side; } SideManager::SideManager(enum e_side side) { side_ = side; }
SideManager::SideManager() { side_ = NUM_SIDES; } SideManager::SideManager() { side_ = NUM_2D_SIDES; }
SideManager::SideManager(size_t side) { set_side(side); } SideManager::SideManager(size_t side) { set_side(side); }
@ -27,7 +27,7 @@ enum e_side SideManager::get_opposite() const {
case LEFT: case LEFT:
return RIGHT; return RIGHT;
default: default:
return NUM_SIDES; return NUM_2D_SIDES;
} }
} }
@ -42,7 +42,7 @@ enum e_side SideManager::get_rotate_clockwise() const {
case LEFT: case LEFT:
return TOP; return TOP;
default: default:
return NUM_SIDES; return NUM_2D_SIDES;
} }
} }
@ -57,12 +57,12 @@ enum e_side SideManager::get_rotate_counterclockwise() const {
case LEFT: case LEFT:
return BOTTOM; return BOTTOM;
default: default:
return NUM_SIDES; return NUM_2D_SIDES;
} }
} }
bool SideManager::validate() const { bool SideManager::validate() const {
if (NUM_SIDES == side_) { if (NUM_2D_SIDES == side_) {
return false; return false;
} }
return true; return true;
@ -139,7 +139,7 @@ void SideManager::set_side(size_t side) {
side_ = LEFT; side_ = LEFT;
return; return;
default: default:
side_ = NUM_SIDES; side_ = NUM_2D_SIDES;
return; return;
} }
} }

2
libs/libpcf/src/base/io_pin_table.cpp
View File

@ -84,7 +84,7 @@ IoPinTableId IoPinTable::create_pin() {
pin_ids_.push_back(pin_id); pin_ids_.push_back(pin_id);
internal_pins_.emplace_back(); internal_pins_.emplace_back();
external_pins_.emplace_back(); external_pins_.emplace_back();
pin_sides_.emplace_back(NUM_SIDES); pin_sides_.emplace_back(NUM_2D_SIDES);
pin_directions_.emplace_back(NUM_IO_DIRECTIONS); pin_directions_.emplace_back(NUM_IO_DIRECTIONS);
return pin_id; return pin_id;

2
libs/libpcf/src/io/write_csv_io_pin_table.cpp
View File

@ -52,7 +52,7 @@ int write_csv_io_pin_table(const char* fname, const IoPinTable& io_pin_table) {
/* Print data */ /* Print data */
for (const IoPinTableId& pin_id : io_pin_table.pins()) { for (const IoPinTableId& pin_id : io_pin_table.pins()) {
std::vector<std::string> data_row_str; std::vector<std::string> data_row_str;
data_row_str.push_back(SIDE_STRING[io_pin_table.pin_side(pin_id)]); data_row_str.push_back(TOTAL_2D_SIDE_STRINGS[io_pin_table.pin_side(pin_id)]);
data_row_str.push_back( data_row_str.push_back(
generate_xml_port_name(io_pin_table.internal_pin(pin_id))); generate_xml_port_name(io_pin_table.internal_pin(pin_id)));
data_row_str.push_back( data_row_str.push_back(

6
openfpga/src/annotation/annotate_placement.cpp
View File

@ -25,10 +25,10 @@ void annotate_mapped_blocks(const DeviceContext& device_ctx,
place_annotation.init_mapped_blocks(device_ctx.grid); place_annotation.init_mapped_blocks(device_ctx.grid);
for (const ClusterBlockId& blk_id : cluster_ctx.clb_nlist.blocks()) { for (const ClusterBlockId& blk_id : cluster_ctx.clb_nlist.blocks()) {
vtr::Point<size_t> grid_coord(place_ctx.block_locs[blk_id].loc.x, vtr::Point<size_t> grid_coord(place_ctx.block_locs()[blk_id].loc.x,
place_ctx.block_locs[blk_id].loc.y); place_ctx.block_locs()[blk_id].loc.y);
place_annotation.add_mapped_block( place_annotation.add_mapped_block(
grid_coord, place_ctx.block_locs[blk_id].loc.sub_tile, blk_id); grid_coord, place_ctx.block_locs()[blk_id].loc.sub_tile, blk_id);
} }
VTR_LOG("Done\n"); VTR_LOG("Done\n");
} }

6
openfpga/src/annotation/annotate_rr_graph.cpp
View File

@ -120,7 +120,7 @@ static RRGSB build_rr_gsb(const DeviceContext& vpr_device_ctx,
rr_gsb.get_side_block_coordinate(side_manager.get_side()); rr_gsb.get_side_block_coordinate(side_manager.get_side());
RRChan rr_chan; RRChan rr_chan;
std::vector<std::vector<RRNodeId>> temp_opin_rr_nodes(2); std::vector<std::vector<RRNodeId>> temp_opin_rr_nodes(2);
enum e_side opin_grid_side[2] = {NUM_SIDES, NUM_SIDES}; enum e_side opin_grid_side[2] = {NUM_2D_SIDES, NUM_2D_SIDES};
enum PORTS chan_dir_to_port_dir_mapping[2] = { enum PORTS chan_dir_to_port_dir_mapping[2] = {
OUT_PORT, IN_PORT}; /* 0: INC_DIRECTION => ?; 1: DEC_DIRECTION => ? */ OUT_PORT, IN_PORT}; /* 0: INC_DIRECTION => ?; 1: DEC_DIRECTION => ? */
@ -301,8 +301,8 @@ static RRGSB build_rr_gsb(const DeviceContext& vpr_device_ctx,
/* Clear the temp data */ /* Clear the temp data */
temp_opin_rr_nodes[0].clear(); temp_opin_rr_nodes[0].clear();
temp_opin_rr_nodes[1].clear(); temp_opin_rr_nodes[1].clear();
opin_grid_side[0] = NUM_SIDES; opin_grid_side[0] = NUM_2D_SIDES;
opin_grid_side[1] = NUM_SIDES; opin_grid_side[1] = NUM_2D_SIDES;
} }
/* Side: TOP => 0, RIGHT => 1, BOTTOM => 2, LEFT => 3 */ /* Side: TOP => 0, RIGHT => 1, BOTTOM => 2, LEFT => 3 */

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

@ -42,7 +42,7 @@ vtr::vector<RRNodeId, ClusterNetId> annotate_rr_node_global_net(
for (ClusterPinId pin_id : cluster_nlist.net_pins(net_id)) { for (ClusterPinId pin_id : cluster_nlist.net_pins(net_id)) {
ClusterBlockId block_id = cluster_nlist.pin_block(pin_id); ClusterBlockId block_id = cluster_nlist.pin_block(pin_id);
t_block_loc blk_loc = get_block_loc(block_id, false); t_block_loc blk_loc = get_block_loc(block_id, false);
int phy_pin = placement_ctx.physical_pins[pin_id]; int phy_pin = placement_ctx.physical_pins()[pin_id];
t_physical_tile_type_ptr phy_tile = device_ctx.grid.get_physical_type( t_physical_tile_type_ptr phy_tile = device_ctx.grid.get_physical_type(
t_physical_tile_loc(blk_loc.loc.x, blk_loc.loc.y, 0)); t_physical_tile_loc(blk_loc.loc.x, blk_loc.loc.y, 0));
int node_pin_num = phy_tile->num_pins; int node_pin_num = phy_tile->num_pins;

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

@ -149,7 +149,7 @@ static void write_rr_gsb_chan_connection_to_xml(
} else { } else {
for (const RREdgeId& driver_rr_edge : driver_rr_edges) { for (const RREdgeId& driver_rr_edge : driver_rr_edges) {
const RRNodeId& driver_rr_node = rr_graph.edge_src_node(driver_rr_edge); 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_2D_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, rr_gsb.get_node_side_and_index(rr_graph, driver_rr_node, IN_PORT,
driver_node_side, driver_node_index); driver_node_side, driver_node_index);

8
openfpga/src/base/openfpga_naming.cpp
View File

@ -1091,7 +1091,7 @@ std::string generate_grid_block_prefix(const std::string& prefix,
const e_side& io_side) { const e_side& io_side) {
std::string block_prefix(prefix); std::string block_prefix(prefix);
if (NUM_SIDES != io_side) { if (NUM_2D_SIDES != io_side) {
SideManager side_manager(io_side); SideManager side_manager(io_side);
block_prefix += std::string(side_manager.to_string()); block_prefix += std::string(side_manager.to_string());
block_prefix += std::string("_"); block_prefix += std::string("_");
@ -1110,7 +1110,7 @@ std::string generate_grid_block_netlist_name(const std::string& block_name,
/* Add the name of physical block */ /* Add the name of physical block */
std::string module_name(block_name); std::string module_name(block_name);
if ((true == is_block_io) && (NUM_SIDES != io_side)) { if ((true == is_block_io) && (NUM_2D_SIDES != io_side)) {
SideManager side_manager(io_side); SideManager side_manager(io_side);
module_name += std::string("_"); module_name += std::string("_");
module_name += std::string(side_manager.to_string()); module_name += std::string(side_manager.to_string());
@ -1385,7 +1385,7 @@ std::string generate_physical_block_instance_name(t_pb_type* pb_type,
* This function try to infer if a grid locates at the border of a * This function try to infer if a grid locates at the border of a
* FPGA fabric, i.e., TOP/RIGHT/BOTTOM/LEFT sides * FPGA fabric, i.e., TOP/RIGHT/BOTTOM/LEFT sides
* 1. if this grid is on the border, it will return the side it locates, * 1. if this grid is on the border, it will return the side it locates,
* 2. if this grid is in the center, it will return an valid value NUM_SIDES * 2. if this grid is in the center, it will return an valid value NUM_2D_SIDES
* *
* In this function, we assume that the corner grids are actually empty! * In this function, we assume that the corner grids are actually empty!
* *
@ -1412,7 +1412,7 @@ std::string generate_physical_block_instance_name(t_pb_type* pb_type,
*******************************************************************/ *******************************************************************/
e_side find_grid_border_side(const vtr::Point<size_t>& device_size, e_side find_grid_border_side(const vtr::Point<size_t>& device_size,
const vtr::Point<size_t>& grid_coordinate) { const vtr::Point<size_t>& grid_coordinate) {
e_side grid_side = NUM_SIDES; e_side grid_side = NUM_2D_SIDES;
if (device_size.y() - 1 == grid_coordinate.y()) { if (device_size.y() - 1 == grid_coordinate.y()) {
return TOP; return TOP;

12
openfpga/src/base/openfpga_pb_pin_fixup.cpp
View File

@ -179,8 +179,8 @@ static int update_cluster_pin_with_post_routing_results(
* but the expected side (only used side) will be opposite side of the * but the expected side (only used side) will be opposite side of the
* border side! * border side!
*/ */
e_side pin_side = NUM_SIDES; e_side pin_side = NUM_2D_SIDES;
if (NUM_SIDES == border_side) { if (NUM_2D_SIDES == border_side) {
if (1 != pin_sides.size()) { if (1 != pin_sides.size()) {
VTR_LOG_ERROR( VTR_LOG_ERROR(
"For tile '%s', found pin '%s' on %lu sides. Expect only 1. " "For tile '%s', found pin '%s' on %lu sides. Expect only 1. "
@ -377,7 +377,7 @@ int update_pb_pin_with_post_routing_results(
/* Get the mapped blocks to this grid */ /* Get the mapped blocks to this grid */
for (int isubtile = 0; isubtile < phy_tile->capacity; ++isubtile) { for (int isubtile = 0; isubtile < phy_tile->capacity; ++isubtile) {
ClusterBlockId cluster_blk_id = ClusterBlockId cluster_blk_id =
placement_ctx.grid_blocks.block_at_location( placement_ctx.grid_blocks().block_at_location(
{(int)x, (int)y, (int)isubtile, (int)layer}); {(int)x, (int)y, (int)isubtile, (int)layer});
/* Skip invalid ids */ /* Skip invalid ids */
if (ClusterBlockId::INVALID() == cluster_blk_id) { if (ClusterBlockId::INVALID() == cluster_blk_id) {
@ -389,7 +389,7 @@ int update_pb_pin_with_post_routing_results(
status = update_cluster_pin_with_post_routing_results( status = update_cluster_pin_with_post_routing_results(
device_ctx, clustering_ctx, vpr_routing_annotation, device_ctx, clustering_ctx, vpr_routing_annotation,
vpr_clustering_annotation, layer, grid_coord, cluster_blk_id, vpr_clustering_annotation, layer, grid_coord, cluster_blk_id,
NUM_SIDES, placement_ctx.block_locs[cluster_blk_id].loc.sub_tile, NUM_2D_SIDES, placement_ctx.block_locs()[cluster_blk_id].loc.sub_tile,
perimeter_cb, map_gnet2msb, num_fixup, verbose); perimeter_cb, map_gnet2msb, num_fixup, verbose);
if (status != CMD_EXEC_SUCCESS) { if (status != CMD_EXEC_SUCCESS) {
return CMD_EXEC_FATAL_ERROR; return CMD_EXEC_FATAL_ERROR;
@ -414,7 +414,7 @@ int update_pb_pin_with_post_routing_results(
/* Get the mapped blocks to this grid */ /* Get the mapped blocks to this grid */
for (int isubtile = 0; isubtile < phy_tile_type->capacity; ++isubtile) { for (int isubtile = 0; isubtile < phy_tile_type->capacity; ++isubtile) {
ClusterBlockId cluster_blk_id = ClusterBlockId cluster_blk_id =
placement_ctx.grid_blocks.block_at_location( placement_ctx.grid_blocks().block_at_location(
{(int)io_coord.x(), (int)io_coord.y(), (int)isubtile, (int)layer}); {(int)io_coord.x(), (int)io_coord.y(), (int)isubtile, (int)layer});
/* Skip invalid ids */ /* Skip invalid ids */
if (ClusterBlockId::INVALID() == cluster_blk_id) { if (ClusterBlockId::INVALID() == cluster_blk_id) {
@ -424,7 +424,7 @@ int update_pb_pin_with_post_routing_results(
status = update_cluster_pin_with_post_routing_results( status = update_cluster_pin_with_post_routing_results(
device_ctx, clustering_ctx, vpr_routing_annotation, device_ctx, clustering_ctx, vpr_routing_annotation,
vpr_clustering_annotation, layer, io_coord, cluster_blk_id, io_side, vpr_clustering_annotation, layer, io_coord, cluster_blk_id, io_side,
placement_ctx.block_locs[cluster_blk_id].loc.sub_tile, perimeter_cb, placement_ctx.block_locs()[cluster_blk_id].loc.sub_tile, perimeter_cb,
map_gnet2msb, num_fixup, verbose); map_gnet2msb, num_fixup, verbose);
if (status != CMD_EXEC_SUCCESS) { if (status != CMD_EXEC_SUCCESS) {
return CMD_EXEC_FATAL_ERROR; return CMD_EXEC_FATAL_ERROR;

2
openfpga/src/fabric/build_grid_module_utils.cpp
View File

@ -30,7 +30,7 @@ std::vector<e_side> find_grid_module_pin_sides(
VTR_ASSERT(true == is_io_type(grid_type_descriptor)); VTR_ASSERT(true == is_io_type(grid_type_descriptor));
SideManager side_manager(border_side); SideManager side_manager(border_side);
if (NUM_SIDES == border_side) { if (NUM_2D_SIDES == border_side) {
return {TOP, RIGHT, BOTTOM, LEFT}; return {TOP, RIGHT, BOTTOM, LEFT};
} }

4
openfpga/src/fabric/build_grid_modules.cpp
View File

@ -1430,7 +1430,7 @@ int build_grid_modules(
* i.e., one or more from {TOP, RIGHT, BOTTOM, LEFT}, * i.e., one or more from {TOP, RIGHT, BOTTOM, LEFT},
* we will generate one module for each border side * we will generate one module for each border side
* - If a I/O block locates in the center of FPGA fabric: * - If a I/O block locates in the center of FPGA fabric:
* we will generate one module with NUM_SIDES (same treatment as regular * we will generate one module with NUM_2D_SIDES (same treatment as regular
* grids) * grids)
*/ */
std::set<e_side> io_type_sides = std::set<e_side> io_type_sides =
@ -1449,7 +1449,7 @@ int build_grid_modules(
/* For CLB and heterogenenous blocks */ /* For CLB and heterogenenous blocks */
status = build_physical_tile_module( status = build_physical_tile_module(
module_manager, decoder_lib, device_annotation, circuit_lib, module_manager, decoder_lib, device_annotation, circuit_lib,
sram_orgz_type, sram_model, &physical_tile, tile_annotation, NUM_SIDES, sram_orgz_type, sram_model, &physical_tile, tile_annotation, NUM_2D_SIDES,
ql_memory_bank_config_setting, duplicate_grid_pin, group_config_block, ql_memory_bank_config_setting, duplicate_grid_pin, group_config_block,
device_ctx.arch->perimeter_cb, verbose); device_ctx.arch->perimeter_cb, verbose);
if (status != CMD_EXEC_SUCCESS) { if (status != CMD_EXEC_SUCCESS) {

16
openfpga/src/fabric/build_routing_module_utils.cpp
View File

@ -143,7 +143,7 @@ ModulePinInfo find_switch_block_module_chan_port(
int index = rr_gsb.get_node_index(rr_graph, cur_rr_node, chan_side, int index = rr_gsb.get_node_index(rr_graph, cur_rr_node, chan_side,
cur_rr_node_direction); cur_rr_node_direction);
/* Make sure this node is included in this sb_info */ /* Make sure this node is included in this sb_info */
VTR_ASSERT((-1 != index) && (NUM_SIDES != chan_side)); VTR_ASSERT((-1 != index) && (NUM_2D_SIDES != chan_side));
std::string chan_port_name = generate_sb_module_track_port_name( std::string chan_port_name = generate_sb_module_track_port_name(
rr_graph.node_type(rr_gsb.get_chan_node(chan_side, index)), chan_side, rr_graph.node_type(rr_gsb.get_chan_node(chan_side, index)), chan_side,
@ -194,7 +194,7 @@ ModulePinInfo find_switch_block_module_input_port(
/* Find the side where the grid pin locates in the grid */ /* Find the side where the grid pin locates in the grid */
enum e_side grid_pin_side = enum e_side grid_pin_side =
get_rr_graph_single_node_side(rr_graph, input_rr_node); get_rr_graph_single_node_side(rr_graph, input_rr_node);
VTR_ASSERT(NUM_SIDES != grid_pin_side); VTR_ASSERT(NUM_2D_SIDES != grid_pin_side);
std::string input_port_name = generate_sb_module_grid_port_name( std::string input_port_name = generate_sb_module_grid_port_name(
input_side, grid_pin_side, grids, vpr_device_annotation, rr_graph, input_side, grid_pin_side, grids, vpr_device_annotation, rr_graph,
@ -235,12 +235,12 @@ std::vector<ModulePinInfo> find_switch_block_module_input_ports(
for (const RRNodeId& input_rr_node : input_rr_nodes) { for (const RRNodeId& input_rr_node : input_rr_nodes) {
/* Find the side where the input locates in the Switch Block */ /* Find the side where the input locates in the Switch Block */
enum e_side input_pin_side = NUM_SIDES; enum e_side input_pin_side = NUM_2D_SIDES;
/* The input could be at any side of the switch block, find it */ /* The input could be at any side of the switch block, find it */
int index = -1; int index = -1;
rr_gsb.get_node_side_and_index(rr_graph, input_rr_node, IN_PORT, rr_gsb.get_node_side_and_index(rr_graph, input_rr_node, IN_PORT,
input_pin_side, index); input_pin_side, index);
VTR_ASSERT(NUM_SIDES != input_pin_side); VTR_ASSERT(NUM_2D_SIDES != input_pin_side);
VTR_ASSERT(-1 != index); VTR_ASSERT(-1 != index);
input_ports.push_back(find_switch_block_module_input_port( input_ports.push_back(find_switch_block_module_input_port(
@ -302,12 +302,12 @@ ModulePortId find_connection_block_module_ipin_port(
rr_graph.node_ylow(src_rr_node)); rr_graph.node_ylow(src_rr_node));
/* Search all the sides of a SB, see this drive_rr_node is an INPUT of this SB /* Search all the sides of a SB, see this drive_rr_node is an INPUT of this SB
*/ */
enum e_side cb_ipin_side = NUM_SIDES; enum e_side cb_ipin_side = NUM_2D_SIDES;
int cb_ipin_index = -1; int cb_ipin_index = -1;
rr_gsb.get_node_side_and_index(rr_graph, src_rr_node, OUT_PORT, cb_ipin_side, rr_gsb.get_node_side_and_index(rr_graph, src_rr_node, OUT_PORT, cb_ipin_side,
cb_ipin_index); cb_ipin_index);
/* We need to be sure that drive_rr_node is part of the CB */ /* We need to be sure that drive_rr_node is part of the CB */
VTR_ASSERT((-1 != cb_ipin_index) && (NUM_SIDES != cb_ipin_side)); VTR_ASSERT((-1 != cb_ipin_index) && (NUM_2D_SIDES != cb_ipin_side));
std::string port_name = generate_cb_module_grid_port_name( std::string port_name = generate_cb_module_grid_port_name(
cb_ipin_side, grids, vpr_device_annotation, rr_graph, cb_ipin_side, grids, vpr_device_annotation, rr_graph,
rr_gsb.get_ipin_node(cb_ipin_side, cb_ipin_index)); rr_gsb.get_ipin_node(cb_ipin_side, cb_ipin_index));
@ -332,12 +332,12 @@ ModulePortId find_connection_block_module_opin_port(
VTR_ASSERT(OPIN == rr_graph.node_type(src_rr_node)); VTR_ASSERT(OPIN == rr_graph.node_type(src_rr_node));
/* Search all the sides of a SB, see this drive_rr_node is an INPUT of this SB /* Search all the sides of a SB, see this drive_rr_node is an INPUT of this SB
*/ */
enum e_side cb_opin_side = NUM_SIDES; enum e_side cb_opin_side = NUM_2D_SIDES;
int cb_opin_index = -1; int cb_opin_index = -1;
rr_gsb.get_node_side_and_index(rr_graph, src_rr_node, IN_PORT, cb_opin_side, rr_gsb.get_node_side_and_index(rr_graph, src_rr_node, IN_PORT, cb_opin_side,
cb_opin_index); cb_opin_index);
/* We need to be sure that drive_rr_node is part of the CB */ /* We need to be sure that drive_rr_node is part of the CB */
VTR_ASSERT((-1 != cb_opin_index) && (NUM_SIDES != cb_opin_side)); VTR_ASSERT((-1 != cb_opin_index) && (NUM_2D_SIDES != cb_opin_side));
std::string port_name = generate_cb_module_grid_port_name( std::string port_name = generate_cb_module_grid_port_name(
cb_opin_side, grids, vpr_device_annotation, rr_graph, cb_opin_side, grids, vpr_device_annotation, rr_graph,
rr_gsb.get_opin_node(cb_opin_side, cb_opin_index)); rr_gsb.get_opin_node(cb_opin_side, cb_opin_index));

4
openfpga/src/fabric/build_top_module_child_fine_grained_instance.cpp
View File

@ -173,7 +173,7 @@ static vtr::Matrix<size_t> add_top_module_grid_instances(
/* Add a grid module to top_module*/ /* Add a grid module to top_module*/
vtr::Point<size_t> grid_coord(ix, iy); vtr::Point<size_t> grid_coord(ix, iy);
grid_instance_ids[ix][iy] = add_top_module_grid_instance( grid_instance_ids[ix][iy] = add_top_module_grid_instance(
module_manager, top_module, phy_tile_type, NUM_SIDES, grid_coord); module_manager, top_module, phy_tile_type, NUM_2D_SIDES, grid_coord);
} }
} }
@ -427,7 +427,7 @@ static void add_top_module_io_children(
std::string grid_module_name_prefix(GRID_MODULE_NAME_PREFIX); std::string grid_module_name_prefix(GRID_MODULE_NAME_PREFIX);
std::string grid_module_name = generate_grid_block_module_name( std::string grid_module_name = generate_grid_block_module_name(
grid_module_name_prefix, std::string(grid_type->name), grid_module_name_prefix, std::string(grid_type->name),
is_io_type(grid_type), NUM_SIDES); is_io_type(grid_type), NUM_2D_SIDES);
ModuleId grid_module = module_manager.find_module(grid_module_name); ModuleId grid_module = module_manager.find_module(grid_module_name);
VTR_ASSERT(true == module_manager.valid_module_id(grid_module)); VTR_ASSERT(true == module_manager.valid_module_id(grid_module));
/* Add a I/O children to top_module*/ /* Add a I/O children to top_module*/

2
openfpga/src/fabric/build_top_module_child_tile_instance.cpp
View File

@ -1539,7 +1539,7 @@ static int build_top_module_global_net_from_tile_modules(
status = build_top_module_global_net_for_given_tile_module( status = build_top_module_global_net_for_given_tile_module(
module_manager, top_module, top_module_port, tile_annotation, module_manager, top_module, top_module_port, tile_annotation,
tile_global_port, tile_port, vpr_device_annotation, grids, layer, tile_global_port, tile_port, vpr_device_annotation, grids, layer,
vtr::Point<size_t>(ix, iy), NUM_SIDES, tile_instance_ids, fabric_tile, vtr::Point<size_t>(ix, iy), NUM_2D_SIDES, tile_instance_ids, fabric_tile,
perimeter_cb); perimeter_cb);
if (CMD_EXEC_FATAL_ERROR == status) { if (CMD_EXEC_FATAL_ERROR == status) {
return status; return status;

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

@ -1174,7 +1174,7 @@ static int build_top_module_global_net_from_grid_modules(
status = build_top_module_global_net_for_given_grid_module( status = build_top_module_global_net_for_given_grid_module(
module_manager, top_module, top_module_port, tile_annotation, module_manager, top_module, top_module_port, tile_annotation,
tile_global_port, tile_port, vpr_device_annotation, grids, layer, tile_global_port, tile_port, vpr_device_annotation, grids, layer,
vtr::Point<size_t>(ix, iy), NUM_SIDES, grid_instance_ids, vtr::Point<size_t>(ix, iy), NUM_2D_SIDES, grid_instance_ids,
perimeter_cb); perimeter_cb);
if (CMD_EXEC_FATAL_ERROR == status) { if (CMD_EXEC_FATAL_ERROR == status) {
return status; return status;

2
openfpga/src/fabric/build_top_module_memory.cpp
View File

@ -529,7 +529,7 @@ void organize_top_module_memory_modules(
module_manager, top_module, circuit_lib, config_protocol.type(), module_manager, top_module, circuit_lib, config_protocol.type(),
sram_model, grids, grid_instance_ids, device_rr_gsb, rr_graph, sram_model, grids, grid_instance_ids, device_rr_gsb, rr_graph,
sb_instance_ids, cb_instance_ids, compact_routing_hierarchy, layer, sb_instance_ids, cb_instance_ids, compact_routing_hierarchy, layer,
core_coord, NUM_SIDES); core_coord, NUM_2D_SIDES);
} }
/* Split memory modules into different regions */ /* Split memory modules into different regions */

4
openfpga/src/fabric/build_top_module_utils.cpp
View File

@ -79,7 +79,7 @@ std::string generate_grid_module_port_name_in_top_module(
* RIGHT/LEFT side: CHANX * RIGHT/LEFT side: CHANX
*******************************************************************/ *******************************************************************/
t_rr_type find_top_module_cb_type_by_sb_side(const e_side& sb_side) { t_rr_type find_top_module_cb_type_by_sb_side(const e_side& sb_side) {
VTR_ASSERT(NUM_SIDES != sb_side); VTR_ASSERT(NUM_2D_SIDES != sb_side);
if ((TOP == sb_side) || (BOTTOM == sb_side)) { if ((TOP == sb_side) || (BOTTOM == sb_side)) {
return CHANY; return CHANY;
@ -96,7 +96,7 @@ t_rr_type find_top_module_cb_type_by_sb_side(const e_side& sb_side) {
*******************************************************************/ *******************************************************************/
vtr::Point<size_t> find_top_module_gsb_coordinate_by_sb_side( vtr::Point<size_t> find_top_module_gsb_coordinate_by_sb_side(
const RRGSB& rr_gsb, const e_side& sb_side) { const RRGSB& rr_gsb, const e_side& sb_side) {
VTR_ASSERT(NUM_SIDES != sb_side); VTR_ASSERT(NUM_2D_SIDES != sb_side);
vtr::Point<size_t> gsb_coordinate; vtr::Point<size_t> gsb_coordinate;

2
openfpga/src/fabric/module_manager.cpp
View File

@ -797,7 +797,7 @@ ModulePortId ModuleManager::add_port(const ModuleId& module,
ports_[module].push_back(port_info); ports_[module].push_back(port_info);
port_types_[module].push_back(port_type); port_types_[module].push_back(port_type);
/* Deposit invalid value for each side */ /* Deposit invalid value for each side */
port_sides_[module].push_back(NUM_SIDES); port_sides_[module].push_back(NUM_2D_SIDES);
port_is_wire_[module].push_back(false); port_is_wire_[module].push_back(false);
port_is_mappable_io_[module].push_back(false); port_is_mappable_io_[module].push_back(false);
port_is_register_[module].push_back(false); port_is_register_[module].push_back(false);

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

@ -1007,7 +1007,7 @@ void build_grid_bitstream(
bitstream_manager, parent_block, module_manager, module_name_map, bitstream_manager, parent_block, module_manager, module_name_map,
fabric_tile, curr_tile, circuit_lib, mux_lib, atom_ctx, fabric_tile, curr_tile, circuit_lib, mux_lib, atom_ctx,
device_annotation, cluster_annotation, place_annotation, device_annotation, cluster_annotation, place_annotation,
bitstream_annotation, grids, layer, grid_coord, NUM_SIDES, verbose); bitstream_annotation, grids, layer, grid_coord, NUM_2D_SIDES, verbose);
} }
} }
VTR_LOGV(verbose, "Done\n"); VTR_LOGV(verbose, "Done\n");

6
openfpga/src/fpga_bitstream/build_io_mapping_info.cpp
View File

@ -90,9 +90,9 @@ IoMap build_fpga_io_mapping_info(
/* Find the index of the mapped GPIO in top-level FPGA fabric */ /* Find the index of the mapped GPIO in top-level FPGA fabric */
size_t temp_io_index = io_location_map.io_index( size_t temp_io_index = io_location_map.io_index(
place_ctx.block_locs[atom_ctx.lookup.atom_clb(atom_blk)].loc.x, place_ctx.block_locs()[atom_ctx.lookup.atom_clb(atom_blk)].loc.x,
place_ctx.block_locs[atom_ctx.lookup.atom_clb(atom_blk)].loc.y, place_ctx.block_locs()[atom_ctx.lookup.atom_clb(atom_blk)].loc.y,
place_ctx.block_locs[atom_ctx.lookup.atom_clb(atom_blk)].loc.sub_tile, place_ctx.block_locs()[atom_ctx.lookup.atom_clb(atom_blk)].loc.sub_tile,
module_io_port.get_name()); module_io_port.get_name());
/* Bypass invalid index (not mapped to this GPIO port) */ /* Bypass invalid index (not mapped to this GPIO port) */

2
openfpga/src/fpga_bitstream/extract_device_non_fabric_bitstream.cpp
View File

@ -154,7 +154,7 @@ static void extract_device_non_fabric_pb_bitstream(
// Get the mapped blocks to this grid // Get the mapped blocks to this grid
for (int isubtile = 0; isubtile < grid_type->capacity; ++isubtile) { for (int isubtile = 0; isubtile < grid_type->capacity; ++isubtile) {
ClusterBlockId cluster_blk_id = ClusterBlockId cluster_blk_id =
placement_ctx.grid_blocks.block_at_location( placement_ctx.grid_blocks().block_at_location(
{(int)ix, (int)iy, (int)isubtile, (int)layer}); {(int)ix, (int)iy, (int)isubtile, (int)layer});
if (grid_count) { if (grid_count) {
fp << ","; fp << ",";

2
openfpga/src/fpga_sdc/analysis_sdc_grid_writer.cpp
View File

@ -693,7 +693,7 @@ void print_analysis_sdc_disable_unused_grids(
for (size_t iy = 1; iy < grids.height() - 1; ++iy) { for (size_t iy = 1; iy < grids.height() - 1; ++iy) {
print_analysis_sdc_disable_unused_grid( print_analysis_sdc_disable_unused_grid(
fp, vtr::Point<size_t>(ix, iy), grids, device_annotation, fp, vtr::Point<size_t>(ix, iy), grids, device_annotation,
cluster_annotation, place_annotation, module_manager, NUM_SIDES); cluster_annotation, place_annotation, module_manager, NUM_2D_SIDES);
} }
} }

6
openfpga/src/fpga_sdc/analysis_sdc_writer.cpp
View File

@ -120,9 +120,9 @@ static void print_analysis_sdc_io_delays(
/* Find the index of the mapped GPIO in top-level FPGA fabric */ /* Find the index of the mapped GPIO in top-level FPGA fabric */
size_t io_index = io_location_map.io_index( size_t io_index = io_location_map.io_index(
place_ctx.block_locs[atom_ctx.lookup.atom_clb(atom_blk)].loc.x, place_ctx.block_locs()[atom_ctx.lookup.atom_clb(atom_blk)].loc.x,
place_ctx.block_locs[atom_ctx.lookup.atom_clb(atom_blk)].loc.y, place_ctx.block_locs()[atom_ctx.lookup.atom_clb(atom_blk)].loc.y,
place_ctx.block_locs[atom_ctx.lookup.atom_clb(atom_blk)].loc.sub_tile, place_ctx.block_locs()[atom_ctx.lookup.atom_clb(atom_blk)].loc.sub_tile,
module_io_port.get_name()); module_io_port.get_name());
if (size_t(-1) == io_index) { if (size_t(-1) == io_index) {

2
openfpga/src/fpga_sdc/pnr_sdc_grid_writer.cpp
View File

@ -593,7 +593,7 @@ void print_pnr_sdc_constrain_grid_timing(
/* For CLB and heterogenenous blocks */ /* For CLB and heterogenenous blocks */
std::string grid_module_name = generate_grid_block_module_name( std::string grid_module_name = generate_grid_block_module_name(
std::string(GRID_MODULE_NAME_PREFIX), std::string(physical_tile.name), std::string(GRID_MODULE_NAME_PREFIX), std::string(physical_tile.name),
is_io_type(&physical_tile), NUM_SIDES); is_io_type(&physical_tile), NUM_2D_SIDES);
/* Find the module Id */ /* Find the module Id */
ModuleId grid_module = module_manager.find_module(grid_module_name); ModuleId grid_module = module_manager.find_module(grid_module_name);
VTR_ASSERT(true == module_manager.valid_module_id(grid_module)); VTR_ASSERT(true == module_manager.valid_module_id(grid_module));

4
openfpga/src/fpga_sdc/sdc_hierarchy_writer.cpp
View File

@ -323,7 +323,7 @@ void print_pnr_sdc_grid_hierarchy(const std::string& sdc_dir,
* i.e., one or more from {TOP, RIGHT, BOTTOM, LEFT}, * i.e., one or more from {TOP, RIGHT, BOTTOM, LEFT},
* we will generate one module for each border side * we will generate one module for each border side
* - If a I/O block locates in the center of FPGA fabric: * - If a I/O block locates in the center of FPGA fabric:
* we will generate one module with NUM_SIDES (same treatment as * we will generate one module with NUM_2D_SIDES (same treatment as
* regular grids) * regular grids)
*/ */
std::set<e_side> io_type_sides = std::set<e_side> io_type_sides =
@ -361,7 +361,7 @@ void print_pnr_sdc_grid_hierarchy(const std::string& sdc_dir,
/* For CLB and heterogenenous blocks */ /* For CLB and heterogenenous blocks */
std::string grid_module_name = generate_grid_block_module_name( std::string grid_module_name = generate_grid_block_module_name(
std::string(GRID_MODULE_NAME_PREFIX), std::string(physical_tile.name), std::string(GRID_MODULE_NAME_PREFIX), std::string(physical_tile.name),
is_io_type(&physical_tile), NUM_SIDES); is_io_type(&physical_tile), NUM_2D_SIDES);
/* Find the module Id */ /* Find the module Id */
ModuleId grid_module = module_manager.find_module(grid_module_name); ModuleId grid_module = module_manager.find_module(grid_module_name);
VTR_ASSERT(true == module_manager.valid_module_id(grid_module)); VTR_ASSERT(true == module_manager.valid_module_id(grid_module));

6
openfpga/src/fpga_spice/spice_grid.cpp
View File

@ -274,7 +274,7 @@ static void print_spice_physical_tile_netlist(
const e_side& border_side) { const e_side& border_side) {
/* Check code: if this is an IO block, the border side MUST be valid */ /* Check code: if this is an IO block, the border side MUST be valid */
if (true == is_io_type(phy_block_type)) { if (true == is_io_type(phy_block_type)) {
VTR_ASSERT(NUM_SIDES != border_side); VTR_ASSERT(NUM_2D_SIDES != border_side);
} }
/* Give a name to the Verilog netlist */ /* Give a name to the Verilog netlist */
@ -393,7 +393,7 @@ void print_spice_grids(NetlistManager& netlist_manager,
* i.e., one or more from {TOP, RIGHT, BOTTOM, LEFT}, * i.e., one or more from {TOP, RIGHT, BOTTOM, LEFT},
* we will generate one module for each border side * we will generate one module for each border side
* - If a I/O block locates in the center of FPGA fabric: * - If a I/O block locates in the center of FPGA fabric:
* we will generate one module with NUM_SIDES (same treatment as regular * we will generate one module with NUM_2D_SIDES (same treatment as regular
* grids) * grids)
*/ */
std::set<e_side> io_type_sides = std::set<e_side> io_type_sides =
@ -407,7 +407,7 @@ void print_spice_grids(NetlistManager& netlist_manager,
} else { } else {
/* For CLB and heterogenenous blocks */ /* For CLB and heterogenenous blocks */
print_spice_physical_tile_netlist(netlist_manager, module_manager, print_spice_physical_tile_netlist(netlist_manager, module_manager,
subckt_dir, &physical_tile, NUM_SIDES); subckt_dir, &physical_tile, NUM_2D_SIDES);
} }
} }
VTR_LOG("Building physical tiles..."); VTR_LOG("Building physical tiles...");

2
openfpga/src/fpga_verilog/verilog_grid.cpp
View File

@ -445,7 +445,7 @@ void print_verilog_grids(
/* For CLB and heterogenenous blocks */ /* For CLB and heterogenenous blocks */
print_verilog_physical_tile_netlist( print_verilog_physical_tile_netlist(
netlist_manager, module_manager, module_name_map, subckt_dir, netlist_manager, module_manager, module_name_map, subckt_dir,
subckt_dir_name, &physical_tile, NUM_SIDES, options); subckt_dir_name, &physical_tile, NUM_2D_SIDES, options);
} }
} }
VTR_LOG("Building physical tiles..."); VTR_LOG("Building physical tiles...");

6
openfpga/src/fpga_verilog/verilog_mock_fpga_wrapper.cpp
View File

@ -115,9 +115,9 @@ static void print_verilog_mock_fpga_wrapper_connect_ios(
/* Find the index of the mapped GPIO in top-level FPGA fabric */ /* Find the index of the mapped GPIO in top-level FPGA fabric */
size_t temp_io_index = io_location_map.io_index( size_t temp_io_index = io_location_map.io_index(
place_ctx.block_locs[atom_ctx.lookup.atom_clb(atom_blk)].loc.x, place_ctx.block_locs()[atom_ctx.lookup.atom_clb(atom_blk)].loc.x,
place_ctx.block_locs[atom_ctx.lookup.atom_clb(atom_blk)].loc.y, place_ctx.block_locs()[atom_ctx.lookup.atom_clb(atom_blk)].loc.y,
place_ctx.block_locs[atom_ctx.lookup.atom_clb(atom_blk)].loc.sub_tile, place_ctx.block_locs()[atom_ctx.lookup.atom_clb(atom_blk)].loc.sub_tile,
module_io_port.get_name()); module_io_port.get_name());
/* Bypass invalid index (not mapped to this GPIO port) */ /* Bypass invalid index (not mapped to this GPIO port) */

6
openfpga/src/fpga_verilog/verilog_simulation_info_writer.cpp
View File

@ -137,9 +137,9 @@ void print_verilog_simulation_info(
/* Find the index of the mapped GPIO in top-level FPGA fabric */ /* Find the index of the mapped GPIO in top-level FPGA fabric */
size_t io_index = io_location_map.io_index( size_t io_index = io_location_map.io_index(
place_ctx.block_locs[atom_ctx.lookup.atom_clb(atom_blk)].loc.x, place_ctx.block_locs()[atom_ctx.lookup.atom_clb(atom_blk)].loc.x,
place_ctx.block_locs[atom_ctx.lookup.atom_clb(atom_blk)].loc.y, place_ctx.block_locs()[atom_ctx.lookup.atom_clb(atom_blk)].loc.y,
place_ctx.block_locs[atom_ctx.lookup.atom_clb(atom_blk)].loc.sub_tile, place_ctx.block_locs()[atom_ctx.lookup.atom_clb(atom_blk)].loc.sub_tile,
module_io_port.get_name()); module_io_port.get_name());
if (size_t(-1) == io_index) { if (size_t(-1) == io_index) {

6
openfpga/src/fpga_verilog/verilog_testbench_utils.cpp
View File

@ -383,9 +383,9 @@ void print_verilog_testbench_connect_fpga_ios(
/* Find the index of the mapped GPIO in top-level FPGA fabric */ /* Find the index of the mapped GPIO in top-level FPGA fabric */
size_t temp_io_index = io_location_map.io_index( size_t temp_io_index = io_location_map.io_index(
place_ctx.block_locs[atom_ctx.lookup.atom_clb(atom_blk)].loc.x, place_ctx.block_locs()[atom_ctx.lookup.atom_clb(atom_blk)].loc.x,
place_ctx.block_locs[atom_ctx.lookup.atom_clb(atom_blk)].loc.y, place_ctx.block_locs()[atom_ctx.lookup.atom_clb(atom_blk)].loc.y,
place_ctx.block_locs[atom_ctx.lookup.atom_clb(atom_blk)].loc.sub_tile, place_ctx.block_locs()[atom_ctx.lookup.atom_clb(atom_blk)].loc.sub_tile,
module_io_port.get_name()); module_io_port.get_name());
/* Bypass invalid index (not mapped to this GPIO port) */ /* Bypass invalid index (not mapped to this GPIO port) */

30
openfpga/src/tile_direct/build_tile_direct.cpp
View File

@ -60,14 +60,14 @@ static std::string parse_direct_port(const std::string& direct_tile_inf) {
/*************************************************************************************** /***************************************************************************************
* Check if a pin is located on a given side of physical tile * Check if a pin is located on a given side of physical tile
* If the given side is NUM_SIDES, we will search all the sides * If the given side is NUM_2D_SIDES, we will search all the sides
***************************************************************************************/ ***************************************************************************************/
static bool is_pin_locate_at_physical_tile_side( static bool is_pin_locate_at_physical_tile_side(
t_physical_tile_type_ptr physical_tile, const size_t& pin_width_offset, t_physical_tile_type_ptr physical_tile, const size_t& pin_width_offset,
const size_t& pin_height_offset, const size_t& pin_id, const size_t& pin_height_offset, const size_t& pin_id,
const e_side& pin_side) { const e_side& pin_side) {
if (NUM_SIDES == pin_side) { if (NUM_2D_SIDES == pin_side) {
for (size_t side = 0; side < NUM_SIDES; ++side) { for (size_t side = 0; side < NUM_2D_SIDES; ++side) {
if (true == physical_tile->pinloc[pin_width_offset][pin_height_offset] if (true == physical_tile->pinloc[pin_width_offset][pin_height_offset]
[side][pin_id]) { [side][pin_id]) {
return true; return true;
@ -418,7 +418,7 @@ static void build_inner_column_row_tile_direct(
} }
/* Search all the sides, the from pin may locate any side! /* Search all the sides, the from pin may locate any side!
* Note: the vpr_direct.from_side is NUM_SIDES, which is unintialized * Note: the vpr_direct.from_side is NUM_2D_SIDES, which is unintialized
* This should be reported to VPR!!! * This should be reported to VPR!!!
*/ */
for (const e_side& from_side : {TOP, RIGHT, BOTTOM, LEFT}) { for (const e_side& from_side : {TOP, RIGHT, BOTTOM, LEFT}) {
@ -453,7 +453,7 @@ static void build_inner_column_row_tile_direct(
} }
/* Search all the sides, the to pin may locate any side! /* Search all the sides, the to pin may locate any side!
* Note: the vpr_direct.to_side is NUM_SIDES, which is unintialized * Note: the vpr_direct.to_side is NUM_2D_SIDES, which is unintialized
* This should be reported to VPR!!! * This should be reported to VPR!!!
*/ */
for (const e_side& to_side : {TOP, RIGHT, BOTTOM, LEFT}) { for (const e_side& to_side : {TOP, RIGHT, BOTTOM, LEFT}) {
@ -482,10 +482,10 @@ static void build_inner_column_row_tile_direct(
"%s[%lu][%lu].%s[%lu] at side '%s'\n", "%s[%lu][%lu].%s[%lu] at side '%s'\n",
from_tile_name.c_str(), x, y, from_tile_name.c_str(), x, y,
from_tile_port.get_name().c_str(), from_pins[ipin], from_tile_port.get_name().c_str(), from_pins[ipin],
SIDE_STRING[from_side], to_tile_name.c_str(), TOTAL_2D_SIDE_STRINGS[from_side], to_tile_name.c_str(),
to_grid_coord.x(), to_grid_coord.y(), to_grid_coord.x(), to_grid_coord.y(),
to_tile_port.get_name().c_str(), to_pins[ipin], to_tile_port.get_name().c_str(), to_pins[ipin],
SIDE_STRING[to_side]); TOTAL_2D_SIDE_STRINGS[to_side]);
TileDirectId tile_direct_id = tile_direct.add_direct( TileDirectId tile_direct_id = tile_direct.add_direct(
from_grid_coord, from_side, from_pins[ipin], to_grid_coord, from_grid_coord, from_side, from_pins[ipin], to_grid_coord,
to_side, to_pins[ipin]); to_side, to_pins[ipin]);
@ -593,7 +593,7 @@ static void build_inter_column_row_tile_direct(
} }
/* Search all the sides, the from pin may locate any side! /* Search all the sides, the from pin may locate any side!
* Note: the vpr_direct.from_side is NUM_SIDES, which is unintialized * Note: the vpr_direct.from_side is NUM_2D_SIDES, which is unintialized
* This should be reported to VPR!!! * This should be reported to VPR!!!
*/ */
for (const e_side& from_side : {TOP, RIGHT, BOTTOM, LEFT}) { for (const e_side& from_side : {TOP, RIGHT, BOTTOM, LEFT}) {
@ -623,7 +623,7 @@ static void build_inter_column_row_tile_direct(
} }
/* Search all the sides, the to pin may locate any side! /* Search all the sides, the to pin may locate any side!
* Note: the vpr_direct.to_side is NUM_SIDES, which is unintialized * Note: the vpr_direct.to_side is NUM_2D_SIDES, which is unintialized
* This should be reported to VPR!!! * This should be reported to VPR!!!
*/ */
for (const e_side& to_side : {TOP, RIGHT, BOTTOM, LEFT}) { for (const e_side& to_side : {TOP, RIGHT, BOTTOM, LEFT}) {
@ -655,10 +655,10 @@ static void build_inter_column_row_tile_direct(
"%s[%lu][%lu].%s[%lu] at side '%s'\n", "%s[%lu][%lu].%s[%lu] at side '%s'\n",
from_tile_name.c_str(), from_grid_coord.x(), from_tile_name.c_str(), from_grid_coord.x(),
from_grid_coord.y(), from_tile_port.get_name().c_str(), from_grid_coord.y(), from_tile_port.get_name().c_str(),
from_pins[ipin], SIDE_STRING[from_side], from_pins[ipin], TOTAL_2D_SIDE_STRINGS[from_side],
to_tile_name.c_str(), to_grid_coord.x(), to_grid_coord.y(), to_tile_name.c_str(), to_grid_coord.x(), to_grid_coord.y(),
to_tile_port.get_name().c_str(), to_pins[ipin], to_tile_port.get_name().c_str(), to_pins[ipin],
SIDE_STRING[to_side]); TOTAL_2D_SIDE_STRINGS[to_side]);
TileDirectId tile_direct_id = tile_direct.add_direct( TileDirectId tile_direct_id = tile_direct.add_direct(
from_grid_coord, from_side, from_pins[ipin], to_grid_coord, from_grid_coord, from_side, from_pins[ipin], to_grid_coord,
@ -704,7 +704,7 @@ static void build_inter_column_row_tile_direct(
} }
/* Search all the sides, the from pin may locate any side! /* Search all the sides, the from pin may locate any side!
* Note: the vpr_direct.from_side is NUM_SIDES, which is unintialized * Note: the vpr_direct.from_side is NUM_2D_SIDES, which is unintialized
* This should be reported to VPR!!! * This should be reported to VPR!!!
*/ */
for (const e_side& from_side : {TOP, RIGHT, BOTTOM, LEFT}) { for (const e_side& from_side : {TOP, RIGHT, BOTTOM, LEFT}) {
@ -734,7 +734,7 @@ static void build_inter_column_row_tile_direct(
} }
/* Search all the sides, the to pin may locate any side! /* Search all the sides, the to pin may locate any side!
* Note: the vpr_direct.to_side is NUM_SIDES, which is unintialized * Note: the vpr_direct.to_side is NUM_2D_SIDES, which is unintialized
* This should be reported to VPR!!! * This should be reported to VPR!!!
*/ */
for (const e_side& to_side : {TOP, RIGHT, BOTTOM, LEFT}) { for (const e_side& to_side : {TOP, RIGHT, BOTTOM, LEFT}) {
@ -766,10 +766,10 @@ static void build_inter_column_row_tile_direct(
"at side '%s'\n", "at side '%s'\n",
from_tile_name.c_str(), from_grid_coord.x(), from_tile_name.c_str(), from_grid_coord.x(),
from_grid_coord.y(), from_tile_port.get_name().c_str(), from_grid_coord.y(), from_tile_port.get_name().c_str(),
from_pins[ipin], SIDE_STRING[from_side], from_pins[ipin], TOTAL_2D_SIDE_STRINGS[from_side],
to_tile_name.c_str(), to_grid_coord.x(), to_grid_coord.y(), to_tile_name.c_str(), to_grid_coord.x(), to_grid_coord.y(),
to_tile_port.get_name().c_str(), to_pins[ipin], to_tile_port.get_name().c_str(), to_pins[ipin],
SIDE_STRING[to_side]); TOTAL_2D_SIDE_STRINGS[to_side]);
TileDirectId tile_direct_id = TileDirectId tile_direct_id =
tile_direct.add_direct(from_grid_coord, from_side, from_pins[ipin], tile_direct.add_direct(from_grid_coord, from_side, from_pins[ipin],

8
openfpga/src/utils/openfpga_physical_tile_utils.cpp
View File

@ -45,7 +45,7 @@ std::vector<e_side> find_physical_tile_pin_side(
* - When perimeter cb is on, the expected sides can be on any sides except * - When perimeter cb is on, the expected sides can be on any sides except
* the border side. But we only expect 1 side * the border side. But we only expect 1 side
*/ */
if (NUM_SIDES == border_side) { if (NUM_2D_SIDES == border_side) {
VTR_ASSERT(1 == pin_sides.size()); VTR_ASSERT(1 == pin_sides.size());
} else if (!perimeter_cb) { } else if (!perimeter_cb) {
SideManager side_manager(border_side); SideManager side_manager(border_side);
@ -92,10 +92,10 @@ std::set<e_side> find_physical_io_tile_located_sides(
/* Search the core part */ /* Search the core part */
for (size_t ix = 1; ix < grids.width() - 1; ++ix) { for (size_t ix = 1; ix < grids.width() - 1; ++ix) {
for (size_t iy = 1; iy < grids.height() - 1; ++iy) { for (size_t iy = 1; iy < grids.height() - 1; ++iy) {
/* If located in center, we add a NUM_SIDES and finish */ /* If located in center, we add a NUM_2D_SIDES and finish */
if (physical_tile == if (physical_tile ==
grids.get_physical_type(t_physical_tile_loc(ix, iy, 0))) { grids.get_physical_type(t_physical_tile_loc(ix, iy, 0))) {
io_sides.insert(NUM_SIDES); io_sides.insert(NUM_2D_SIDES);
center_io = true; center_io = true;
break; break;
} }
@ -112,7 +112,7 @@ std::set<e_side> find_physical_io_tile_located_sides(
for (const e_side& fpga_side : FPGA_SIDES_CLOCKWISE) { for (const e_side& fpga_side : FPGA_SIDES_CLOCKWISE) {
for (const vtr::Point<size_t>& io_coordinate : io_coordinates[fpga_side]) { for (const vtr::Point<size_t>& io_coordinate : io_coordinates[fpga_side]) {
/* If located in center, we add a NUM_SIDES and finish */ /* If located in center, we add a NUM_2D_SIDES and finish */
if (physical_tile == grids.get_physical_type(t_physical_tile_loc( if (physical_tile == grids.get_physical_type(t_physical_tile_loc(
io_coordinate.x(), io_coordinate.y(), 0))) { io_coordinate.x(), io_coordinate.y(), 0))) {
io_sides.insert(fpga_side); io_sides.insert(fpga_side);