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

[Engine] Fixed bugs

This commit is contained in:
tangxifan 2021-09-25 18:22:55 -07:00
parent a56d1f4fdb
commit 3cf31f1565
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
openfpga/src/fpga_bitstream/build_fabric_bitstream_memory_bank.cpp
View File

@ -19,6 +19,7 @@
#include "decoder_library_utils.h" #include "decoder_library_utils.h"
#include "bitstream_manager_utils.h" #include "bitstream_manager_utils.h"
#include "memory_utils.h"
#include "memory_bank_utils.h" #include "memory_bank_utils.h"
#include "build_fabric_bitstream_memory_bank.h" #include "build_fabric_bitstream_memory_bank.h"
@ -73,7 +74,9 @@ void rec_build_module_fabric_dependent_ql_memory_bank_regional_bitstream(const B
std::vector<ModuleId> configurable_children = module_manager.region_configurable_children(parent_module, config_region); std::vector<ModuleId> configurable_children = module_manager.region_configurable_children(parent_module, config_region);
VTR_ASSERT(2 <= configurable_children.size()); VTR_ASSERT(2 <= configurable_children.size());
size_t num_configurable_children = configurable_children.size() - 2; size_t num_config_child_to_skip = estimate_num_configurable_children_to_skip_by_config_protocol(config_protocol,
configurable_children.size());
size_t num_configurable_children = configurable_children.size() - num_config_child_to_skip;
/* Early exit if there is no configurable children */ /* Early exit if there is no configurable children */
if (0 == num_configurable_children) { if (0 == num_configurable_children) {
@ -179,7 +182,7 @@ void rec_build_module_fabric_dependent_ql_memory_bank_regional_bitstream(const B
if (BLWL_PROTOCOL_DECODER == config_protocol.bl_protocol_type()) { if (BLWL_PROTOCOL_DECODER == config_protocol.bl_protocol_type()) {
bl_addr_bits_vec = itobin_charvec(cur_bl_index, bl_addr_size); bl_addr_bits_vec = itobin_charvec(cur_bl_index, bl_addr_size);
} else if (BLWL_PROTOCOL_FLATTEN == config_protocol.bl_protocol_type() } else if (BLWL_PROTOCOL_FLATTEN == config_protocol.bl_protocol_type()
|| BLWL_PROTOCOL_FLATTEN == config_protocol.bl_protocol_type()) { || BLWL_PROTOCOL_SHIFT_REGISTER == config_protocol.bl_protocol_type()) {
bl_addr_bits_vec = ito1hot_charvec(cur_bl_index, bl_addr_size); bl_addr_bits_vec = ito1hot_charvec(cur_bl_index, bl_addr_size);
} }
@ -189,15 +192,15 @@ void rec_build_module_fabric_dependent_ql_memory_bank_regional_bitstream(const B
if (BLWL_PROTOCOL_DECODER == config_protocol.wl_protocol_type()) { if (BLWL_PROTOCOL_DECODER == config_protocol.wl_protocol_type()) {
wl_addr_bits_vec = itobin_charvec(cur_wl_index, wl_addr_size); wl_addr_bits_vec = itobin_charvec(cur_wl_index, wl_addr_size);
} else if (BLWL_PROTOCOL_FLATTEN == config_protocol.wl_protocol_type() } else if (BLWL_PROTOCOL_FLATTEN == config_protocol.wl_protocol_type()
|| BLWL_PROTOCOL_FLATTEN == config_protocol.wl_protocol_type()) { || BLWL_PROTOCOL_SHIFT_REGISTER == config_protocol.wl_protocol_type()) {
wl_addr_bits_vec = ito1hot_charvec(cur_wl_index, wl_addr_size); wl_addr_bits_vec = ito1hot_charvec(cur_wl_index, wl_addr_size);
} }
/* Set BL address */ /* Set BL address */
fabric_bitstream.set_bit_bl_address(fabric_bit, bl_addr_bits_vec, true); fabric_bitstream.set_bit_bl_address(fabric_bit, bl_addr_bits_vec, BLWL_PROTOCOL_DECODER != config_protocol.bl_protocol_type());
/* Set WL address */ /* Set WL address */
fabric_bitstream.set_bit_wl_address(fabric_bit, wl_addr_bits_vec, true); fabric_bitstream.set_bit_wl_address(fabric_bit, wl_addr_bits_vec, BLWL_PROTOCOL_DECODER != config_protocol.wl_protocol_type());
/* Set data input */ /* Set data input */
fabric_bitstream.set_bit_din(fabric_bit, bitstream_manager.bit_value(config_bit)); fabric_bitstream.set_bit_din(fabric_bit, bitstream_manager.bit_value(config_bit));

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

@ -370,7 +370,7 @@ int write_fabric_bitstream_to_text_file(const BitstreamManager& bitstream_manage
bit_value_to_skip, bit_value_to_skip,
fabric_bitstream); fabric_bitstream);
} else { } else {
VTR_ASSERT(BLWL_PROTOCOL_DECODER == config_protocol.bl_protocol_type() VTR_ASSERT(BLWL_PROTOCOL_FLATTEN == config_protocol.bl_protocol_type()
|| BLWL_PROTOCOL_SHIFT_REGISTER == config_protocol.bl_protocol_type()); || BLWL_PROTOCOL_SHIFT_REGISTER == config_protocol.bl_protocol_type());
status = write_memory_bank_flatten_fabric_bitstream_to_text_file(fp, status = write_memory_bank_flatten_fabric_bitstream_to_text_file(fp,
bit_value_to_skip, bit_value_to_skip,

2
openfpga/src/utils/fabric_bitstream_utils.cpp
View File

@ -240,7 +240,7 @@ MemoryBankFlattenFabricBitstream build_memory_bank_flatten_fabric_bitstream(cons
for (const FabricBitRegionId& region : fabric_bitstream.regions()) { for (const FabricBitRegionId& region : fabric_bitstream.regions()) {
for (const FabricBitId& bit_id : fabric_bitstream.region_bits(region)) { for (const FabricBitId& bit_id : fabric_bitstream.region_bits(region)) {
/* Skip din because they should be pre-configured through programming reset/set */ /* Skip din because they should be pre-configured through programming reset/set */
if ((fabric_bitstream.bit_din(bit_id) == '1') == bit_value_to_skip) { if (fabric_bitstream.bit_din(bit_id) == bit_value_to_skip) {
continue; continue;
} }
/* Create string for BL address */ /* Create string for BL address */