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

[core] fixed a bug

This commit is contained in:
tangxifan 2023-09-18 23:31:09 -07:00
parent 1cf119f8d1
commit 43fd08a3fe
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openfpga/src/base/openfpga_build_fabric_template.h
View File

@ -339,7 +339,7 @@ int add_fpga_core_to_fabric_template(T& openfpga_ctx, const Command& cmd,
}
return add_fpga_core_to_device_module_graph(
openfpga_ctx.mutable_module_graph(), openfpga_ctx.io_name_map(),
openfpga_ctx.mutable_module_graph(), openfpga_ctx.mutable_module_name_map(), openfpga_ctx.io_name_map(),
core_inst_name, frame_view, verbose_output);
}

12
openfpga/src/fabric/build_fpga_core_wrapper_module.cpp
View File

@ -333,6 +333,7 @@ static int create_fpga_top_module_using_naming_rules(
* - Create a wrapper module 'fpga_top' on the fpga_core
*******************************************************************/
int add_fpga_core_to_device_module_graph(ModuleManager& module_manager,
ModuleNameMap& module_name_map,
const IoNameMap& io_naming,
const std::string& core_inst_name,
const bool& frame_view,
@ -340,7 +341,7 @@ int add_fpga_core_to_device_module_graph(ModuleManager& module_manager,
int status = CMD_EXEC_SUCCESS;
/* Execute the module graph api */
std::string top_module_name = generate_fpga_top_module_name();
std::string top_module_name = module_name_map.name(generate_fpga_top_module_name());
ModuleId top_module = module_manager.find_module(top_module_name);
if (!module_manager.valid_module_id(top_module)) {
return CMD_EXEC_FATAL_ERROR;
@ -379,6 +380,15 @@ int add_fpga_core_to_device_module_graph(ModuleManager& module_manager,
VTR_LOGV(verbose, "Created a wrapper module '%s' on top of '%s'\n",
top_module_name.c_str(), core_module_name.c_str());
/* Update module name map */
status = module_name_map.set_tag_to_name_pair(core_module_name, core_module_name);
if (CMD_EXEC_SUCCESS != status) {
VTR_LOG_ERROR("Failed to register fpga core module '%s' in module name map!\n",
core_module_name.c_str());
return CMD_EXEC_FATAL_ERROR;
}
VTR_LOGV(verbose, "Updated module name map\n");
/* Now fpga_core should be the only configurable child under the top-level
* module */
module_manager.add_configurable_child(

2
openfpga/src/fabric/build_fpga_core_wrapper_module.h
View File

@ -7,6 +7,7 @@
#include <string>
#include "io_name_map.h"
#include "module_name_map.h"
#include "module_manager.h"
/********************************************************************
@ -17,6 +18,7 @@
namespace openfpga {
int add_fpga_core_to_device_module_graph(ModuleManager& module_manager,
ModuleNameMap& module_name_map,
const IoNameMap& io_naming,
const std::string& core_inst_name,
const bool& frame_view,