aboutsummaryrefslogtreecommitdiffstats
path: root/ecp5/pack.cc
diff options
context:
space:
mode:
authorRoss Schlaikjer <ross@schlaikjer.net>2020-04-07 14:42:27 -0400
committerRoss Schlaikjer <ross@schlaikjer.net>2020-04-07 14:42:27 -0400
commitfc591421f970b8bb43c911adbfefccdd00d81b9c (patch)
treef76d681e2641ecf761c6368e030d0d57fb8c5913 /ecp5/pack.cc
parente46b990251a14ade7ede313226a97bd2a3c42191 (diff)
downloadnextpnr-fc591421f970b8bb43c911adbfefccdd00d81b9c.tar.gz
nextpnr-fc591421f970b8bb43c911adbfefccdd00d81b9c.tar.bz2
nextpnr-fc591421f970b8bb43c911adbfefccdd00d81b9c.zip
Change assert to error
Diffstat (limited to 'ecp5/pack.cc')
-rw-r--r--ecp5/pack.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/ecp5/pack.cc b/ecp5/pack.cc
index 91b8205d..eea05c83 100644
--- a/ecp5/pack.cc
+++ b/ecp5/pack.cc
@@ -2972,6 +2972,7 @@ bool Arch::pack()
void Arch::assignArchInfo()
{
+ Context *ctx = getCtx();
for (auto cell : sorted(cells)) {
CellInfo *ci = cell.second;
if (ci->type == id_TRELLIS_SLICE) {
@@ -3008,10 +3009,12 @@ void Arch::assignArchInfo()
// Output register mode (REGMODE_{A,B}). Valid options are 'NOREG' and 'OUTREG'.
std::string regmode_a = str_or_default(ci->params, id("REGMODE_A"), "NOREG");
if (regmode_a != "NOREG" && regmode_a != "OUTREG")
- NPNR_ASSERT_FALSE_STR("bad DP16KD REGMODE_A configuration '" + regmode_a + "'");
+ log_error("DP16KD %s has invalid REGMODE_A configuration '%s'\n", ci->name.c_str(ctx),
+ regmode_a.c_str());
std::string regmode_b = str_or_default(ci->params, id("REGMODE_B"), "NOREG");
if (regmode_b != "NOREG" && regmode_b != "OUTREG")
- NPNR_ASSERT_FALSE_STR("bad DP16KD REGMODE_B configuration '" + regmode_b + "'");
+ log_error("DP16KD %s has invalid REGMODE_B configuration '%s'\n", ci->name.c_str(ctx),
+ regmode_b.c_str());
ci->ramInfo.is_output_a_registered = regmode_a == "OUTREG";
ci->ramInfo.is_output_b_registered = regmode_b == "OUTREG";