diff options
| author | gatecat <gatecat@ds0.me> | 2021-09-27 17:50:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-27 17:50:55 +0100 |
| commit | 535b2490c422f2343e97404c7c304c71b549e3a3 (patch) | |
| tree | 0c9a4e687fccf488fd8a0f4df58103f4de8eea8a /common | |
| parent | 9782a46a9b4edb24cc73ea65f1ad7697ed74ab41 (diff) | |
| parent | ea489f6d934ac6e649bcd81e10856e809f6b30d2 (diff) | |
| download | nextpnr-535b2490c422f2343e97404c7c304c71b549e3a3.tar.gz nextpnr-535b2490c422f2343e97404c7c304c71b549e3a3.tar.bz2 nextpnr-535b2490c422f2343e97404c7c304c71b549e3a3.zip | |
Merge pull request #812 from antmicro/MacroCells
Convert macros to clusters for better placement
Diffstat (limited to 'common')
| -rw-r--r-- | common/exclusive_state_groups.impl.h | 4 | ||||
| -rw-r--r-- | common/placer1.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/common/exclusive_state_groups.impl.h b/common/exclusive_state_groups.impl.h index 53e4e83c..f3ddb5fd 100644 --- a/common/exclusive_state_groups.impl.h +++ b/common/exclusive_state_groups.impl.h @@ -74,10 +74,10 @@ void ExclusiveStateGroup<StateCount, StateType, CountType>::explain_requires(con log_info("Placing cell %s at bel %s does not violate %s.%s\n", cell.c_str(ctx), ctx->nameOfBel(bel), object.c_str(ctx), definition.prefix.c_str(ctx)); } else { - log_info("Placing cell %s at bel %s does violates %s.%s, because current state is %s, constraint requires one " + log_info("Placing cell %s at bel %s does violate %s.%s, because current state is %s, constraint requires one " "of:\n", cell.c_str(ctx), ctx->nameOfBel(bel), object.c_str(ctx), definition.prefix.c_str(ctx), - definition.states.at(state).c_str(ctx)); + state != -1 ? definition.states.at(state).c_str(ctx) : "unset"); for (const auto required_state : state_range) { log_info(" - %s\n", definition.states.at(required_state).c_str(ctx)); diff --git a/common/placer1.cc b/common/placer1.cc index 3501e446..4db1c951 100644 --- a/common/placer1.cc +++ b/common/placer1.cc @@ -731,11 +731,11 @@ class SAPlacer return true; swap_fail: #if CHAIN_DEBUG - log_info("Swap failed\n"); + log_info("Swap failed\n"); #endif for (auto cell_pair : moved_cells) { CellInfo *cell = ctx->cells.at(cell_pair.first).get(); - if (cell->bel != BelId()){ + if (cell->bel != BelId()) { #if CHAIN_DEBUG log_info("%d unbind %s\n", __LINE__, ctx->nameOfBel(cell->bel)); #endif |