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

[core] code format

This commit is contained in:
tangxifan 2023-06-26 10:06:17 -07:00
parent 70f40cd21a
commit 83fa6a421e
3 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/libfpgabitstream/src/bitstream_manager_utils.cpp
View File

@ -19,10 +19,12 @@ namespace openfpga {
* Return a vector of the block ids, where the top-level block * Return a vector of the block ids, where the top-level block
* locates in the head, while the leaf block locates in the tail * locates in the head, while the leaf block locates in the tail
* top, next, ... , block * top, next, ... , block
* Optionally, the top block name in the path can be specified. Useful to trim the hierarchy with a given range * Optionally, the top block name in the path can be specified. Useful to trim
*the hierarchy with a given range
*******************************************************************/ *******************************************************************/
std::vector<ConfigBlockId> find_bitstream_manager_block_hierarchy( std::vector<ConfigBlockId> find_bitstream_manager_block_hierarchy(
const BitstreamManager& bitstream_manager, const ConfigBlockId& block, const std::string& top_block_name) { const BitstreamManager& bitstream_manager, const ConfigBlockId& block,
const std::string& top_block_name) {
std::vector<ConfigBlockId> block_hierarchy; std::vector<ConfigBlockId> block_hierarchy;
ConfigBlockId temp_block = block; ConfigBlockId temp_block = block;
@ -30,7 +32,8 @@ std::vector<ConfigBlockId> find_bitstream_manager_block_hierarchy(
while (true == bitstream_manager.valid_block_id(temp_block)) { while (true == bitstream_manager.valid_block_id(temp_block)) {
block_hierarchy.push_back(temp_block); block_hierarchy.push_back(temp_block);
/* Check if we have reached the designated top block */ /* Check if we have reached the designated top block */
if (!top_block_name.empty() && bitstream_manager.block_name(temp_block) == top_block_name) { if (!top_block_name.empty() &&
bitstream_manager.block_name(temp_block) == top_block_name) {
break; break;
} }
/* Go to upper level */ /* Go to upper level */

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

@ -16,7 +16,8 @@
namespace openfpga { namespace openfpga {
std::vector<ConfigBlockId> find_bitstream_manager_block_hierarchy( std::vector<ConfigBlockId> find_bitstream_manager_block_hierarchy(
const BitstreamManager& bitstream_manager, const ConfigBlockId& block, const std::string& top_block_name = ""); const BitstreamManager& bitstream_manager, const ConfigBlockId& block,
const std::string& top_block_name = "");
std::vector<ConfigBlockId> find_bitstream_manager_top_blocks( std::vector<ConfigBlockId> find_bitstream_manager_top_blocks(
const BitstreamManager& bitstream_manager); const BitstreamManager& bitstream_manager);

34
openfpga/src/fpga_verilog/verilog_preconfig_top_module.cpp
View File

@ -306,8 +306,8 @@ static int print_verilog_preconfig_top_module_connect_global_ports(
* while uses 'force' syntax to impost the bitstream at mem_inv port * while uses 'force' syntax to impost the bitstream at mem_inv port
*******************************************************************/ *******************************************************************/
static void print_verilog_preconfig_top_module_force_bitstream( static void print_verilog_preconfig_top_module_force_bitstream(
std::fstream &fp, const std::string& top_block_name, const BitstreamManager &bitstream_manager, std::fstream &fp, const std::string &top_block_name,
const bool &output_datab_bits) { const BitstreamManager &bitstream_manager, const bool &output_datab_bits) {
/* Validate the file stream */ /* Validate the file stream */
valid_file_stream(fp); valid_file_stream(fp);
@ -324,10 +324,11 @@ static void print_verilog_preconfig_top_module_force_bitstream(
} }
/* Build the hierarchical path of the configuration bit in modules */ /* Build the hierarchical path of the configuration bit in modules */
std::vector<ConfigBlockId> block_hierarchy = std::vector<ConfigBlockId> block_hierarchy =
find_bitstream_manager_block_hierarchy(bitstream_manager, find_bitstream_manager_block_hierarchy(bitstream_manager, config_block_id,
config_block_id, top_block_name); top_block_name);
/* Ensure that this is the module we want to drop! */ /* Ensure that this is the module we want to drop! */
VTR_ASSERT(top_block_name == bitstream_manager.block_name(block_hierarchy[0])); VTR_ASSERT(top_block_name ==
bitstream_manager.block_name(block_hierarchy[0]));
block_hierarchy.erase(block_hierarchy.begin()); block_hierarchy.erase(block_hierarchy.begin());
/* Build the full hierarchy path */ /* Build the full hierarchy path */
std::string bit_hierarchy_path(FORMAL_VERIFICATION_TOP_MODULE_UUT_NAME); std::string bit_hierarchy_path(FORMAL_VERIFICATION_TOP_MODULE_UUT_NAME);
@ -381,8 +382,8 @@ static void print_verilog_preconfig_top_module_force_bitstream(
* This function uses '$deposit' syntax to do so * This function uses '$deposit' syntax to do so
*******************************************************************/ *******************************************************************/
static void print_verilog_preconfig_top_module_deposit_bitstream( static void print_verilog_preconfig_top_module_deposit_bitstream(
std::fstream &fp, const std::string& top_block_name, const BitstreamManager &bitstream_manager, std::fstream &fp, const std::string &top_block_name,
const bool &output_datab_bits) { const BitstreamManager &bitstream_manager, const bool &output_datab_bits) {
/* Validate the file stream */ /* Validate the file stream */
valid_file_stream(fp); valid_file_stream(fp);
@ -399,12 +400,13 @@ static void print_verilog_preconfig_top_module_deposit_bitstream(
} }
/* Build the hierarchical path of the configuration bit in modules */ /* Build the hierarchical path of the configuration bit in modules */
std::vector<ConfigBlockId> block_hierarchy = std::vector<ConfigBlockId> block_hierarchy =
find_bitstream_manager_block_hierarchy(bitstream_manager, find_bitstream_manager_block_hierarchy(bitstream_manager, config_block_id,
config_block_id, top_block_name); top_block_name);
/* Drop the first block, which is the top module, it should be replaced by /* Drop the first block, which is the top module, it should be replaced by
* the instance name here */ * the instance name here */
/* Ensure that this is the module we want to drop! */ /* Ensure that this is the module we want to drop! */
VTR_ASSERT(top_block_name == bitstream_manager.block_name(block_hierarchy[0])); VTR_ASSERT(top_block_name ==
bitstream_manager.block_name(block_hierarchy[0]));
block_hierarchy.erase(block_hierarchy.begin()); block_hierarchy.erase(block_hierarchy.begin());
/* Build the full hierarchy path */ /* Build the full hierarchy path */
@ -463,8 +465,9 @@ static void print_verilog_preconfig_top_module_deposit_bitstream(
* 2. Mentor Modelsim prefers using '$deposit' syntax to do so * 2. Mentor Modelsim prefers using '$deposit' syntax to do so
*******************************************************************/ *******************************************************************/
static void print_verilog_preconfig_top_module_load_bitstream( static void print_verilog_preconfig_top_module_load_bitstream(
std::fstream &fp, const std::string& top_block_name, const CircuitLibrary &circuit_lib, std::fstream &fp, const std::string &top_block_name,
const CircuitModelId &mem_model, const BitstreamManager &bitstream_manager, const CircuitLibrary &circuit_lib, const CircuitModelId &mem_model,
const BitstreamManager &bitstream_manager,
const e_embedded_bitstream_hdl_type &embedded_bitstream_hdl_type) { const e_embedded_bitstream_hdl_type &embedded_bitstream_hdl_type) {
/* Skip the datab port if there is only 1 output port in memory model /* Skip the datab port if there is only 1 output port in memory model
* Currently, it assumes that the data output port is always defined while * Currently, it assumes that the data output port is always defined while
@ -623,10 +626,13 @@ int print_verilog_preconfig_top_module(
CircuitModelId sram_model = config_protocol.memory_model(); CircuitModelId sram_model = config_protocol.memory_model();
VTR_ASSERT(true == circuit_lib.valid_model_id(sram_model)); VTR_ASSERT(true == circuit_lib.valid_model_id(sram_model));
/* If we do have the core module, and the dut is specified as core module, the hierarchy path when adding should be the instance name of the core module */ /* If we do have the core module, and the dut is specified as core module, the
* hierarchy path when adding should be the instance name of the core module
*/
std::string inst_name = generate_fpga_top_module_name(); std::string inst_name = generate_fpga_top_module_name();
if (options.dut_module() == generate_fpga_core_module_name()) { if (options.dut_module() == generate_fpga_core_module_name()) {
ModuleId parent_module = module_manager.find_module(generate_fpga_top_module_name()); ModuleId parent_module =
module_manager.find_module(generate_fpga_top_module_name());
inst_name = module_manager.instance_name(parent_module, core_module, 0); inst_name = module_manager.instance_name(parent_module, core_module, 0);
} }