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

hacky way to support ECP5 for now

Browse Source
This commit is contained in:
Miodrag Milanovic 2019-06-03 21:13:47 +02:00
parent 44d6f16b66
commit d5f804832f
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
json/jsonparse.cc
View File

@ -349,7 +349,11 @@ void json_import_net_attrib(Context *ctx, string &modname, NetInfo *net, JsonNod
else else
log_error("JSON parameter type of \"%s\' of net \'%s\' not supported\n", pId.c_str(ctx), log_error("JSON parameter type of \"%s\' of net \'%s\' not supported\n", pId.c_str(ctx),
net->name.c_str(ctx)); net->name.c_str(ctx));
#ifdef ARCH_ECP5
if (param_node->data_dict_keys[param_id]== "NEXTPNR_IS_GLOBAL") {
net->is_global = (*dest)[pId].num;
}
#endif
if (json_debug) if (json_debug)
log_info(" Added parameter \'%s\'=%s to net \'%s\' " log_info(" Added parameter \'%s\'=%s to net \'%s\' "
"of module \'%s\'\n", "of module \'%s\'\n",

5
json/jsonwrite.cc
View File

@ -79,6 +79,11 @@ void write_routing(std::ostream &f, Context *ctx, NetInfo *net, bool first)
f << stringf("%s\n", first ? "" : ","); f << stringf("%s\n", first ? "" : ",");
f << stringf(" \"NEXTPNR_ROUTING\": "); f << stringf(" \"NEXTPNR_ROUTING\": ");
f << get_string(routing); f << get_string(routing);
#ifdef ARCH_ECP5
f << stringf(",\n");
f << stringf(" \"NEXTPNR_IS_GLOBAL\": ");
f << std::to_string(net->is_global ? 1:0);
#endif
} }
void write_constraints(std::ostream &f, Context *ctx, CellInfo *cell, bool first) void write_constraints(std::ostream &f, Context *ctx, CellInfo *cell, bool first)