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

[core] fixed the bug in I/O location map build-up when supporting subtiles

This commit is contained in:
tangxifan 2023-05-04 09:51:05 +08:00
parent f89b7a82cf
commit dab89322b3
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openfpga/src/fabric/build_fabric_io_location_map.cpp
View File

@ -80,21 +80,32 @@ IoLocationMap build_fabric_io_location_map(const ModuleManager& module_manager,
module_manager.io_children(child).size()); module_manager.io_children(child).size());
for (size_t isubchild = 0; for (size_t isubchild = 0;
isubchild < module_manager.io_children(child).size(); ++isubchild) { isubchild < module_manager.io_children(child).size(); ++isubchild) {
/* Note that we should use the subchild module when checking the GPIO
* ports. The child module is actually the grid-level I/O module, while
* the subchild module is the subtile inside grid-level I/O modules. Note
* that grid-level I/O module contains all the GPIO ports while the
* subtile may have part of it. For example, a grid I/O module may have 24
* GPINs and 12 GPOUTs, while the first subtile only have 4 GPINs, and the
* second subtile only have 3 GPOUTs. Therefore, to accurately build the
* I/O location map downto subtile level, we need to check the subchild
* module here.
*/
ModuleId subchild = module_manager.io_children(child)[isubchild];
vtr::Point<int> subchild_coord = vtr::Point<int> subchild_coord =
module_manager.io_child_coordinates(child)[isubchild]; module_manager.io_child_coordinates(child)[isubchild];
for (const ModuleManager::e_module_port_type& module_io_port_type : for (const ModuleManager::e_module_port_type& module_io_port_type :
MODULE_IO_PORT_TYPES) { MODULE_IO_PORT_TYPES) {
for (const ModulePortId& gpio_port_id : for (const ModulePortId& gpio_port_id :
module_manager.module_port_ids_by_type(child, module_manager.module_port_ids_by_type(subchild,
module_io_port_type)) { module_io_port_type)) {
/* Only care mappable I/O */ /* Only care mappable I/O */
if (false == if (false ==
module_manager.port_is_mappable_io(child, gpio_port_id)) { module_manager.port_is_mappable_io(subchild, gpio_port_id)) {
continue; continue;
} }
const BasicPort& gpio_port = const BasicPort& gpio_port =
module_manager.module_port(child, gpio_port_id); module_manager.module_port(subchild, gpio_port_id);
auto curr_io_index = io_counter.find(gpio_port.get_name()); auto curr_io_index = io_counter.find(gpio_port.get_name());
/* Index always start from zero */ /* Index always start from zero */

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

@ -1093,7 +1093,8 @@ static void build_physical_tile_module(
* it as a mode under a <pb_type> * it as a mode under a <pb_type>
*/ */
for (const t_sub_tile& sub_tile : phy_block_type->sub_tiles) { for (const t_sub_tile& sub_tile : phy_block_type->sub_tiles) {
for (int iz = sub_tile.capacity.low; iz < sub_tile.capacity.high + 1; ++iz) { for (int iz = sub_tile.capacity.low; iz < sub_tile.capacity.high + 1;
++iz) {
VTR_ASSERT(1 == sub_tile.equivalent_sites.size()); VTR_ASSERT(1 == sub_tile.equivalent_sites.size());
t_logical_block_type_ptr lb_type = sub_tile.equivalent_sites[0]; t_logical_block_type_ptr lb_type = sub_tile.equivalent_sites[0];
/* Bypass empty pb_graph */ /* Bypass empty pb_graph */