diff options
| -rw-r--r-- | COPYING | 12 | ||||
| -rw-r--r-- | common/placer_heap.cc | 4 | ||||
| -rw-r--r-- | ecp5/family.cmake | 2 |
3 files changed, 11 insertions, 7 deletions
@@ -1,9 +1,9 @@ -Copyright (C) 2018 Clifford Wolf <clifford@symbioticeda.com> -Copyright (C) 2018 David Shah <david@symbioticeda.com> -Copyright (C) 2018 Dan Gisselquist <dan@symbioticeda.com> -Copyright (C) 2018 Serge Bazanski <q3k@symbioticeda.com> -Copyright (C) 2018 Miodrag Milanovic <miodrag@symbioticeda.com> -Copyright (C) 2018 Eddie Hung <eddieh@ece.ubc.ca> +Copyright (C) 2018-2020 Claire Xen <claire@symbioticeda.com> +Copyright (C) 2018-2020 David Shah <david@symbioticeda.com> +Copyright (C) 2018-2020 Dan Gisselquist <dan@symbioticeda.com> +Copyright (C) 2018-2020 Serge Bazanski <q3k@symbioticeda.com> +Copyright (C) 2018-2020 Miodrag Milanovic <miodrag@symbioticeda.com> +Copyright (C) 2018-2020 Eddie Hung <eddieh@ece.ubc.ca> Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/common/placer_heap.cc b/common/placer_heap.cc index 8c43c433..790c2230 100644 --- a/common/placer_heap.cc +++ b/common/placer_heap.cc @@ -542,10 +542,14 @@ class HeAPPlacer cell_locs[cell.first].global = ctx->getBelGlobalBuf(ci->bel); } else if (ci->constr_parent == nullptr) { bool placed = false; + int attempt_count = 0; while (!placed) { if (!available_bels.count(ci->type) || available_bels.at(ci->type).empty()) log_error("Unable to place cell '%s', no Bels remaining of type '%s'\n", ci->name.c_str(ctx), ci->type.c_str(ctx)); + ++attempt_count; + if (attempt_count > 25000) + log_error("Unable to find a placement location for cell '%s'\n", ci->name.c_str(ctx)); BelId bel = available_bels.at(ci->type).back(); available_bels.at(ci->type).pop_back(); Loc loc = ctx->getBelLocation(bel); diff --git a/ecp5/family.cmake b/ecp5/family.cmake index cc97ae5e..0c4fa695 100644 --- a/ecp5/family.cmake +++ b/ecp5/family.cmake @@ -42,7 +42,7 @@ endif() add_custom_target(chipdb-${family}-bins DEPENDS ${chipdb_sources} ${chipdb_binaries}) -add_library(chipdb-${family} OBJECT ${ICE40_CHIPDB} ${chipdb_sources}) +add_library(chipdb-${family} OBJECT ${ECP5_CHIPDB} ${chipdb_sources}) add_dependencies(chipdb-${family} chipdb-${family}-bins) target_compile_options(chipdb-${family} PRIVATE -g0 -O0 -w) target_compile_definitions(chipdb-${family} PRIVATE NEXTPNR_NAMESPACE=nextpnr_${family}) |