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

streamline fabric bitstream file format

This commit is contained in:
tangxifan 2020-07-27 16:34:43 -06:00
parent cec6bf0b6f
commit 35af0dd676
3 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libopenfpga/libfpgabitstream/src/bitstream_manager_utils.cpp
View File

@ -55,4 +55,21 @@ std::vector<ConfigBlockId> find_bitstream_manager_top_blocks(const BitstreamMana
return top_blocks; return top_blocks;
} }
/********************************************************************
* Find the index of a configuration bit in the children bits of its parent block
*******************************************************************/
size_t find_bitstream_manager_config_bit_index_in_parent_block(const BitstreamManager& bitstream_manager,
const ConfigBitId& bit_id) {
size_t curr_index = 0;
for (const ConfigBitId& cand_bit : bitstream_manager.block_bits(bitstream_manager.bit_parent_block(bit_id))) {
if (cand_bit == bit_id) {
break;
}
curr_index++;
}
return curr_index;
}
} /* end namespace openfpga */ } /* end namespace openfpga */

3
libopenfpga/libfpgabitstream/src/bitstream_manager_utils.h
View File

@ -19,6 +19,9 @@ std::vector<ConfigBlockId> find_bitstream_manager_block_hierarchy(const Bitstrea
std::vector<ConfigBlockId> find_bitstream_manager_top_blocks(const BitstreamManager& bitstream_manager); std::vector<ConfigBlockId> find_bitstream_manager_top_blocks(const BitstreamManager& bitstream_manager);
size_t find_bitstream_manager_config_bit_index_in_parent_block(const BitstreamManager& bitstream_manager,
const ConfigBitId& bit_id);
} /* end namespace openfpga */ } /* end namespace openfpga */
#endif #endif

28
openfpga/src/fpga_bitstream/write_xml_fabric_bitstream.cpp
View File

@ -77,30 +77,26 @@ int write_fabric_config_bit_to_xml_file(std::fstream& fp,
} }
write_tab_to_file(fp, 1); write_tab_to_file(fp, 1);
fp << "<bit id=\"" << size_t(fabric_bit) << "\" "; fp << "<bit id=\"" << size_t(fabric_bit) << "\"";
fp << "value=\""; fp << " value=\"";
fp << bitstream_manager.bit_value(fabric_bitstream.config_bit(fabric_bit)); fp << bitstream_manager.bit_value(fabric_bitstream.config_bit(fabric_bit));
fp << "\">\n"; fp << "\"";
/* Output hierarchy of this parent*/ /* Output hierarchy of this parent*/
const ConfigBitId& config_bit = fabric_bitstream.config_bit(fabric_bit); const ConfigBitId& config_bit = fabric_bitstream.config_bit(fabric_bit);
const ConfigBlockId& config_block = bitstream_manager.bit_parent_block(config_bit); const ConfigBlockId& config_block = bitstream_manager.bit_parent_block(config_bit);
std::vector<ConfigBlockId> block_hierarchy = find_bitstream_manager_block_hierarchy(bitstream_manager, config_block); std::vector<ConfigBlockId> block_hierarchy = find_bitstream_manager_block_hierarchy(bitstream_manager, config_block);
write_tab_to_file(fp, 2); std::string hie_path;
fp << "<hierarchy>\n";
size_t hierarchy_counter = 0;
for (const ConfigBlockId& temp_block : block_hierarchy) { for (const ConfigBlockId& temp_block : block_hierarchy) {
write_tab_to_file(fp, 3); hie_path += bitstream_manager.block_name(temp_block);
fp << "<instance level=\"" << hierarchy_counter << "\""; hie_path += std::string(".");
if (0 < bitstream_manager.block_bits(temp_block).size()) {
fp << " width=\"" << bitstream_manager.block_bits(temp_block).size() << "\"";
} }
fp << " name=\"" << bitstream_manager.block_name(temp_block) << "\""; hie_path += generate_configurable_memory_data_out_name();
fp << "/>\n"; hie_path += std::string("[");
hierarchy_counter++; hie_path += std::to_string(find_bitstream_manager_config_bit_index_in_parent_block(bitstream_manager, config_bit));
} hie_path += std::string("]");
write_tab_to_file(fp, 2);
fp << "</hierarchy>\n"; fp << " path=\"" << hie_path << "\"/>\n";
switch (config_type) { switch (config_type) {
case CONFIG_MEM_STANDALONE: case CONFIG_MEM_STANDALONE: