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

Cleanup and fixes, flow works now

Browse Source
This commit is contained in:
Miodrag Milanovic 2019-06-07 13:18:43 +02:00
parent 729e6c1ee9
commit a8871ea8aa
3 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/command.cc
View File

@ -233,22 +233,6 @@ void CommandHandler::setupContext(Context *ctx)
ctx->timing_driven = false;
}
std::vector<std::string> split(const std::string& str, const std::string& delim)
{
std::vector<std::string> tokens;
size_t prev = 0, pos = 0;
do
{
pos = str.find(delim, prev);
if (pos == std::string::npos) pos = str.length();
std::string token = str.substr(prev, pos-prev);
if (!token.empty()) tokens.push_back(token);
prev = pos + delim.length();
}
while (pos < str.length() && prev < str.length());
return tokens;
}
int CommandHandler::executeMain(std::unique_ptr<Context> ctx)
{
if (vm.count("test")) {

35
common/nextpnr.cc
View File

@ -19,6 +19,7 @@
#include "nextpnr.h"
#include "log.h"
#include <boost/algorithm/string.hpp>
NEXTPNR_NAMESPACE_BEGIN
@ -458,6 +459,9 @@ void BaseCtx::commonInfoToAttributes()
for (auto &cell : cells) {
auto ci = cell.second.get();
if (ci->bel != BelId()) {
if (ci->attrs.find(id("BEL")) != ci->attrs.end()) {
ci->attrs.erase(ci->attrs.find(id("BEL")));
}
ci->attrs[id("NEXTPNR_BEL")] = getCtx()->getBelName(ci->bel).c_str(this);
ci->attrs[id("BEL_STRENGTH")] = std::to_string((int)ci->belStrength);
}
@ -465,10 +469,21 @@ void BaseCtx::commonInfoToAttributes()
ci->attrs[id("CONSTR_X")] = std::to_string(ci->constr_x);
if (ci->constr_y!= ci->UNCONSTR)
ci->attrs[id("CONSTR_Y")] = std::to_string(ci->constr_y);
if (ci->constr_z!= ci->UNCONSTR)
if (ci->constr_z!= ci->UNCONSTR) {
ci->attrs[id("CONSTR_Z")] = std::to_string(ci->constr_z);
ci->attrs[id("CONSTR_ABS_Z")] = std::to_string(ci->constr_abs_z ? 1 : 0);
}
if (ci->constr_parent!= nullptr)
ci->attrs[id("CONSTR_PARENT")] = ci->constr_parent->name.c_str(this);
if (!ci->constr_children.empty()) {
std::string constr = "";
for(auto &item : ci->constr_children)
{
if (!constr.empty()) constr += std::string(";");
constr += item->name.c_str(this);
}
ci->attrs[id("CONSTR_CHILDREN")] = constr;
}
}
for (auto &net : getCtx()->nets) {
auto ni = net.second.get();
@ -506,16 +521,28 @@ void BaseCtx::attributesToCommonInfo()
ci->constr_y = std::stoi(val->second.str);
val = ci->attrs.find(id("CONSTR_Z"));
if (val != ci->attrs.end()) {
if (val != ci->attrs.end())
ci->constr_z = std::stoi(val->second.str);
ci->constr_abs_z = (ci->constr_z == 0);
}
val = ci->attrs.find(id("CONSTR_ABS_Z"));
if (val != ci->attrs.end())
ci->constr_abs_z = std::stoi(val->second.str)==1;
val = ci->attrs.find(id("CONSTR_PARENT"));
if (val != ci->attrs.end()) {
auto parent = cells.find(id(val->second.str));
if (parent != cells.end())
ci->constr_parent = parent->second.get();
}
val = ci->attrs.find(id("CONSTR_CHILDREN"));
if (val != ci->attrs.end()) {
std::vector<std::string> strs;
boost::split(strs,val->second.str,boost::is_any_of(";"));
for(auto val : strs)
{
ci->constr_children.push_back(cells.find(id(val.c_str()))->second.get());
}
}
}
}

2
json/jsonparse.cc
View File

@ -880,7 +880,7 @@ bool parse_json_file(std::istream &f, std::string &filename, Context *ctx)
log_info("Checksum: 0x%08x\n", ctx->checksum());
log_break();
ctx->settings.emplace(ctx->id("input/json"), filename);
ctx->attributesToCommonInfo();
ctx->attributesToArchInfo();
return true;
} catch (log_execution_error_exception) {
return false;