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

ecp5: remove debug and clangformat

Browse Source 
Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
David Shah 2018-11-07 15:08:47 +00:00
parent c9d83ec08b
commit 37cbabecfb
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ecp5/bitstream.cc
View File

@ -91,7 +91,6 @@ static void tie_cib_signal(Context *ctx, ChipConfig &cc, WireId wire, bool value
NPNR_ASSERT(signals.size() < 100); NPNR_ASSERT(signals.size() < 100);
cibsig = signals.front(); cibsig = signals.front();
basename = ctx->getWireBasename(cibsig).str(ctx); basename = ctx->getWireBasename(cibsig).str(ctx);
log_info("%s\n", basename.c_str());
signals.pop(); signals.pop();
if (std::regex_match(basename, cib_re)) if (std::regex_match(basename, cib_re))
break; break;
@ -467,7 +466,9 @@ void tieoff_dcu_ports(Context *ctx, ChipConfig &cc, CellInfo *ci)
{ {
for (auto port : ci->ports) { for (auto port : ci->ports) {
if (port.second.net == nullptr && port.second.type == PORT_IN) { if (port.second.net == nullptr && port.second.type == PORT_IN) {
if (port.first.str(ctx).find("CLK") != std::string::npos || port.first.str(ctx).find("HDIN") != std::string::npos || port.first.str(ctx).find("HDOUT") != std::string::npos) if (port.first.str(ctx).find("CLK") != std::string::npos ||
port.first.str(ctx).find("HDIN") != std::string::npos ||
port.first.str(ctx).find("HDOUT") != std::string::npos)
continue; continue;
bool value = bool_or_default(ci->params, ctx->id(port.first.str(ctx) + "MUX"), false); bool value = bool_or_default(ci->params, ctx->id(port.first.str(ctx) + "MUX"), false);
tie_cib_signal(ctx, cc, ctx->getBelPinWire(ci->bel, port.first), value); tie_cib_signal(ctx, cc, ctx->getBelPinWire(ci->bel, port.first), value);
@ -475,7 +476,6 @@ void tieoff_dcu_ports(Context *ctx, ChipConfig &cc, CellInfo *ci)
} }
} }
static void set_pip(Context *ctx, ChipConfig &cc, PipId pip) static void set_pip(Context *ctx, ChipConfig &cc, PipId pip)
{ {
std::string tile = ctx->getPipTilename(pip); std::string tile = ctx->getPipTilename(pip);
@ -484,7 +484,8 @@ static void set_pip(Context *ctx, ChipConfig &cc, PipId pip)
cc.tiles[tile].add_arc(sink, source); cc.tiles[tile].add_arc(sink, source);
} }
static std::vector<bool> parse_config_str(std::string str, int length) { static std::vector<bool> parse_config_str(std::string str, int length)
{
// For DCU config which might be bin, hex or dec using prefices accordingly // For DCU config which might be bin, hex or dec using prefices accordingly
std::string base = str.substr(0, 2); std::string base = str.substr(0, 2);
std::vector<bool> word; std::vector<bool> word;

11
ecp5/globals.cc
View File

@ -302,7 +302,8 @@ class Ecp5GlobalRouter
} }
// Return true if a short (<5) route exists between two wires // Return true if a short (<5) route exists between two wires
bool has_short_route(WireId src, WireId dst, int thresh = 5) { bool has_short_route(WireId src, WireId dst, int thresh = 5)
{
std::queue<WireId> visit; std::queue<WireId> visit;
std::unordered_map<WireId, PipId> backtrace; std::unordered_map<WireId, PipId> backtrace;
visit.push(src); visit.push(src);
@ -310,7 +311,8 @@ class Ecp5GlobalRouter
while (true) { while (true) {
if (visit.empty() || visit.size() > 1000) { if (visit.empty() || visit.size() > 1000) {
log_info ("dist %s -> %s = inf\n", ctx->getWireName(src).c_str(ctx), ctx->getWireName(dst).c_str(ctx)); // log_info ("dist %s -> %s = inf\n", ctx->getWireName(src).c_str(ctx),
// ctx->getWireName(dst).c_str(ctx));
return false; return false;
} }
cursor = visit.front(); cursor = visit.front();
@ -334,7 +336,8 @@ class Ecp5GlobalRouter
cursor = ctx->getPipSrcWire(fnd->second); cursor = ctx->getPipSrcWire(fnd->second);
length++; length++;
} }
log_info ("dist %s -> %s = %d\n", ctx->getWireName(src).c_str(ctx), ctx->getWireName(dst).c_str(ctx), length); // log_info ("dist %s -> %s = %d\n", ctx->getWireName(src).c_str(ctx), ctx->getWireName(dst).c_str(ctx),
// length);
return length < thresh; return length < thresh;
} }
@ -360,8 +363,6 @@ class Ecp5GlobalRouter
ctx->bindBel(best_bel, dcc, STRENGTH_LOCKED); ctx->bindBel(best_bel, dcc, STRENGTH_LOCKED);
} }
// Insert a DCC into a net to promote it to a global // Insert a DCC into a net to promote it to a global
NetInfo *insert_dcc(NetInfo *net) NetInfo *insert_dcc(NetInfo *net)
{ {

3
ecp5/pack.cc
View File

@ -1034,7 +1034,8 @@ class Ecp5Packer
} }
// "Pack" DCUs // "Pack" DCUs
void pack_dcus() { void pack_dcus()
{
for (auto cell : sorted(ctx->cells)) { for (auto cell : sorted(ctx->cells)) {
CellInfo *ci = cell.second; CellInfo *ci = cell.second;
if (ci->type == id_DCUA) { if (ci->type == id_DCUA) {