aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/router2.cc3
-rw-r--r--nexus/pack.cc3
2 files changed, 3 insertions, 3 deletions
diff --git a/common/router2.cc b/common/router2.cc
index d19b8291..8373fa70 100644
--- a/common/router2.cc
+++ b/common/router2.cc
@@ -396,7 +396,8 @@ struct Router2
if (ctx->getBelPinType(bp.bel, bp.pin) != PORT_IN)
return false;
for (auto p : ctx->getPipsUphill(wire))
- return false;
+ if (ctx->checkPipAvail(p))
+ return false;
return true;
}
diff --git a/nexus/pack.cc b/nexus/pack.cc
index 99a6e214..df479ef5 100644
--- a/nexus/pack.cc
+++ b/nexus/pack.cc
@@ -1700,9 +1700,8 @@ struct NexusPacker
: std::string("USED_AS_LOWER_BIT_GENERATION");
}
// Create final mult36 if needed
- CellInfo *mult36 = nullptr;
if (mult36_used) {
- mult36 = create_dsp_cell(ci->name, id_MULT36_CORE, preadd9[0], 6, 6);
+ create_dsp_cell(ci->name, id_MULT36_CORE, preadd9[0], 6, 6);
}
// Configure output registers