caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

frontend_base: Import cell hierarchy

Browse Source 
Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
David Shah 2019-11-29 15:58:02 +00:00
parent 6bf3c261fa
commit 9f6031cda1
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
frontend/frontend_base.h
View File

@ -131,8 +131,10 @@ template <typename FrontendType> struct GenericFrontend
HierModuleState m; HierModuleState m;
m.is_toplevel = true; m.is_toplevel = true;
m.prefix = ""; m.prefix = "";
m.path = top;
ctx->top_module = top;
// Do the actual import, starting from the top level module // Do the actual import, starting from the top level module
import_module(m, mod_refs.at(top)); import_module(m, top.str(ctx), top.str(ctx), mod_refs.at(top));
} }
Context *ctx; Context *ctx;
@ -239,6 +241,7 @@ template <typename FrontendType> struct GenericFrontend
{ {
bool is_toplevel; bool is_toplevel;
std::string prefix; std::string prefix;
IdString parent_path, path;
// Map from index in module to "flat" index of nets // Map from index in module to "flat" index of nets
std::vector<int> index_to_net_flatindex; std::vector<int> index_to_net_flatindex;
// Get a reference to index_to_net; resizing if // Get a reference to index_to_net; resizing if
@ -255,8 +258,14 @@ template <typename FrontendType> struct GenericFrontend
std::vector<std::vector<std::string>> net_names; std::vector<std::vector<std::string>> net_names;
}; };
void import_module(HierModuleState &m, const mod_dat_t &data) void import_module(HierModuleState &m, const std::string &name, const std::string &type, const mod_dat_t &data)
{ {
NPNR_ASSERT(!ctx->hierarchy.count(m.path));
ctx->hierarchy[m.path].name = ctx->id(name);
ctx->hierarchy[m.path].type = ctx->id(type);
ctx->hierarchy[m.path].parent = m.parent_path;
ctx->hierarchy[m.path].fullpath = m.path;
std::vector<NetInfo *> index_to_net; std::vector<NetInfo *> index_to_net;
if (!m.is_toplevel) { if (!m.is_toplevel) {
// Import port connections; for submodules only // Import port connections; for submodules only
@ -414,6 +423,7 @@ template <typename FrontendType> struct GenericFrontend
void import_leaf_cell(HierModuleState &m, const std::string &name, const cell_dat_t &cd) void import_leaf_cell(HierModuleState &m, const std::string &name, const cell_dat_t &cd)
{ {
IdString inst_name = unique_name(m.prefix, name, false); IdString inst_name = unique_name(m.prefix, name, false);
ctx->hierarchy[m.path].leaf_cells[ctx->id(name)] = inst_name;
CellInfo *ci = ctx->createCell(inst_name, ctx->id(impl.get_cell_type(cd))); CellInfo *ci = ctx->createCell(inst_name, ctx->id(impl.get_cell_type(cd)));
// Import port directions // Import port directions
std::unordered_map<IdString, PortType> port_dirs; std::unordered_map<IdString, PortType> port_dirs;
@ -488,8 +498,11 @@ template <typename FrontendType> struct GenericFrontend
submod.prefix = m.prefix; submod.prefix = m.prefix;
submod.prefix += name; submod.prefix += name;
submod.prefix += '.'; submod.prefix += '.';
submod.parent_path = m.path;
submod.path = ctx->id(m.path.str(ctx) + "/" + name);
// Do the submodule import // Do the submodule import
import_module(submod, mod_refs.at(ctx->id(impl.get_cell_type(cd)))); auto type = impl.get_cell_type(cd);
import_module(submod, name, type, mod_refs.at(ctx->id(type)));
} }
// Import the cells section of a module // Import the cells section of a module