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

[core] fixed som ebugs

This commit is contained in:
tangxifan 2023-11-03 14:39:28 -07:00
parent b2e1eb30c7
commit e48de682ed
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
openfpga/src/fpga_verilog/verilog_top_testbench.cpp
View File

@ -1623,25 +1623,12 @@ static void print_verilog_full_testbench_configuration_chain_bitstream(
/* Additional constants for multiple programming clock */ /* Additional constants for multiple programming clock */
if (num_prog_clocks > 1) { if (num_prog_clocks > 1) {
for (size_t iclk = 0; iclk < num_prog_clocks; ++iclk) { for (size_t iclk = 0; iclk < num_prog_clocks; ++iclk) {
std::vector<size_t> curr_clk_ctrl_regions =
config_protocol.prog_clock_pin_ccff_head_indices(
config_protocol.prog_clock_pins()[iclk]);
size_t curr_regional_bitstream_max_size =
find_fabric_regional_bitstream_max_size(fabric_bitstream,
curr_clk_ctrl_regions);
size_t curr_num_bits_to_skip = 0;
if (true == fast_configuration) {
curr_num_bits_to_skip =
find_configuration_chain_fabric_bitstream_size_to_be_skipped(
fabric_bitstream, bitstream_manager, bit_value_to_skip,
curr_clk_ctrl_regions);
}
/* TODO: Try to apply different length as the bitstream size for ccffs are /* TODO: Try to apply different length as the bitstream size for ccffs are
* different driven by differnt clocks! Tried but no luck yet. */ * different driven by differnt clocks! Tried but no luck yet. */
print_verilog_define_flag( print_verilog_define_flag(
fp, fp,
std::string(TOP_TB_BITSTREAM_LENGTH_VARIABLE) + std::to_string(iclk), std::string(TOP_TB_BITSTREAM_LENGTH_VARIABLE) + std::to_string(iclk),
curr_regional_bitstream_max_size - curr_num_bits_to_skip); regional_bitstream_max_size - num_bits_to_skip);
} }
} }
@ -1708,8 +1695,14 @@ static void print_verilog_full_testbench_configuration_chain_bitstream(
} else { } else {
VTR_ASSERT(num_prog_clocks > 1); VTR_ASSERT(num_prog_clocks > 1);
for (size_t iclk = 0; iclk < num_prog_clocks; ++iclk) { for (size_t iclk = 0; iclk < num_prog_clocks; ++iclk) {
std::vector<size_t> curr_clk_ctrl_regions =
config_protocol.prog_clock_pin_ccff_head_indices(
config_protocol.prog_clock_pins()[iclk]);
size_t curr_regional_bitstream_max_size =
find_fabric_regional_bitstream_max_size(fabric_bitstream,
curr_clk_ctrl_regions);
fp << "\t"; fp << "\t";
fp << TOP_TB_BITSTREAM_INDEX_REG_NAME << iclk << " <= 0"; fp << TOP_TB_BITSTREAM_INDEX_REG_NAME << iclk << " <= " << regional_bitstream_max_size - curr_regional_bitstream_max_size;
fp << ";"; fp << ";";
fp << std::endl; fp << std::endl;
} }
@ -1918,8 +1911,7 @@ static void print_verilog_full_testbench_configuration_chain_bitstream(
} else { } else {
VTR_ASSERT(num_prog_clocks > 1); VTR_ASSERT(num_prog_clocks > 1);
for (size_t iclk = 0; iclk < num_prog_clocks; ++iclk) { for (size_t iclk = 0; iclk < num_prog_clocks; ++iclk) {
BasicPort curr_prog_clock_port(std::string(TOP_TB_PROG_CLOCK_PORT_NAME) + BasicPort curr_prog_clock_port(std::string(TOP_TB_PROG_CLOCK_PORT_NAME),
std::string(TOP_TB_CLOCK_REG_POSTFIX),
iclk, iclk); iclk, iclk);
fp << "always"; fp << "always";
fp << " @(negedge " fp << " @(negedge "

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

@ -33,7 +33,7 @@ size_t find_fabric_regional_bitstream_max_size(
for (const auto& region : fabric_bitstream.regions()) { for (const auto& region : fabric_bitstream.regions()) {
if (!region_whitelist.empty() && if (!region_whitelist.empty() &&
(std::find(region_whitelist.begin(), region_whitelist.end(), (std::find(region_whitelist.begin(), region_whitelist.end(),
size_t(region)) != region_whitelist.end())) { size_t(region)) == region_whitelist.end())) {
continue; continue;
} }
if (regional_bitstream_max_size < if (regional_bitstream_max_size <
@ -65,7 +65,7 @@ size_t find_configuration_chain_fabric_bitstream_size_to_be_skipped(
for (const auto& region : fabric_bitstream.regions()) { for (const auto& region : fabric_bitstream.regions()) {
if (!region_whitelist.empty() && if (!region_whitelist.empty() &&
(std::find(region_whitelist.begin(), region_whitelist.end(), (std::find(region_whitelist.begin(), region_whitelist.end(),
size_t(region)) != region_whitelist.end())) { size_t(region)) == region_whitelist.end())) {
continue; continue;
} }
size_t curr_region_num_bits_to_skip = 0; size_t curr_region_num_bits_to_skip = 0;