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

[Engine] Bug fix for mistakes in calculating number of BLs/WLs for QL memory bank

This commit is contained in:
tangxifan 2021-09-09 15:23:29 -07:00
parent b787c4e100
commit 35c7b09888
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -693,12 +693,12 @@ TopModuleNumConfigBits find_top_module_regional_num_config_bit(const ModuleManag
vtr::Point<int> coord = module_manager.region_configurable_child_coordinates(top_module, config_region)[child_id]; vtr::Point<int> coord = module_manager.region_configurable_child_coordinates(top_module, config_region)[child_id];
num_bls[coord.x()] = std::max(num_bls[coord.x()], find_memory_decoder_data_size(find_module_num_config_bits(module_manager, child_module, circuit_lib, sram_model, config_protocol_type))); num_bls[coord.x()] = std::max(num_bls[coord.x()], find_memory_decoder_data_size(find_module_num_config_bits(module_manager, child_module, circuit_lib, sram_model, config_protocol_type)));
num_wls[coord.y()] = std::max(num_wls[coord.y()], find_memory_decoder_data_size(find_module_num_config_bits(module_manager, child_module, circuit_lib, sram_model, config_protocol_type))); num_wls[coord.y()] = std::max(num_wls[coord.y()], find_memory_decoder_data_size(find_module_num_config_bits(module_manager, child_module, circuit_lib, sram_model, config_protocol_type)));
for (const auto& kv : num_bls) { }
num_config_bits[config_region].first += kv.first; for (const auto& kv : num_bls) {
} num_config_bits[config_region].first += kv.second;
for (const auto& kv : num_wls) { }
num_config_bits[config_region].second += kv.second; for (const auto& kv : num_wls) {
} num_config_bits[config_region].second += kv.second;
} }
} }
break; break;
@ -853,7 +853,7 @@ void add_top_module_sram_ports(ModuleManager& module_manager,
/* BL address size is the largest among all the regions */ /* BL address size is the largest among all the regions */
size_t bl_addr_size = 0; size_t bl_addr_size = 0;
for (const ConfigRegionId& config_region : module_manager.regions(module_id)) { for (const ConfigRegionId& config_region : module_manager.regions(module_id)) {
bl_addr_size = std::max(bl_addr_size, find_memory_decoder_addr_size(num_config_bits[config_region].first)); bl_addr_size = std::max(bl_addr_size, find_mux_local_decoder_addr_size(num_config_bits[config_region].first));
} }
BasicPort bl_addr_port(std::string(DECODER_BL_ADDRESS_PORT_NAME), bl_addr_size); BasicPort bl_addr_port(std::string(DECODER_BL_ADDRESS_PORT_NAME), bl_addr_size);
module_manager.add_port(module_id, bl_addr_port, ModuleManager::MODULE_INPUT_PORT); module_manager.add_port(module_id, bl_addr_port, ModuleManager::MODULE_INPUT_PORT);
@ -861,7 +861,7 @@ void add_top_module_sram_ports(ModuleManager& module_manager,
/* WL address size is the largest among all the regions */ /* WL address size is the largest among all the regions */
size_t wl_addr_size = 0; size_t wl_addr_size = 0;
for (const ConfigRegionId& config_region : module_manager.regions(module_id)) { for (const ConfigRegionId& config_region : module_manager.regions(module_id)) {
wl_addr_size = std::max(wl_addr_size, find_memory_decoder_addr_size(num_config_bits[config_region].second)); wl_addr_size = std::max(wl_addr_size, find_mux_local_decoder_addr_size(num_config_bits[config_region].second));
} }
BasicPort wl_addr_port(std::string(DECODER_WL_ADDRESS_PORT_NAME), wl_addr_size); BasicPort wl_addr_port(std::string(DECODER_WL_ADDRESS_PORT_NAME), wl_addr_size);
module_manager.add_port(module_id, wl_addr_port, ModuleManager::MODULE_INPUT_PORT); module_manager.add_port(module_id, wl_addr_port, ModuleManager::MODULE_INPUT_PORT);

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

@ -151,12 +151,12 @@ void add_top_module_nets_cmos_ql_memory_bank_config_bus(ModuleManager& module_ma
/* Each memory bank has a unified number of BL/WLs */ /* Each memory bank has a unified number of BL/WLs */
size_t num_bls = 0; size_t num_bls = 0;
for (const auto& curr_config_bits : num_config_bits) { for (const auto& curr_config_bits : num_config_bits) {
num_bls = std::max(num_bls, find_memory_decoder_data_size(curr_config_bits.first)); num_bls = std::max(num_bls, curr_config_bits.first);
} }
size_t num_wls = 0; size_t num_wls = 0;
for (const auto& curr_config_bits : num_config_bits) { for (const auto& curr_config_bits : num_config_bits) {
num_wls = std::max(num_wls, find_memory_decoder_data_size(curr_config_bits.second)); num_wls = std::max(num_wls, curr_config_bits.second);
} }
/* Create separated memory bank circuitry, i.e., BL/WL decoders for each region */ /* Create separated memory bank circuitry, i.e., BL/WL decoders for each region */