From fdcfe8cd8188b6c4ea2450843bd22d822856a091 Mon Sep 17 00:00:00 2001 From: Maciej Dudek Date: Mon, 30 Aug 2021 11:12:49 +0200 Subject: Adding support for MacroCells --- common/exclusive_state_groups.impl.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'common') diff --git a/common/exclusive_state_groups.impl.h b/common/exclusive_state_groups.impl.h index 53e4e83c..4a5b1228 100644 --- a/common/exclusive_state_groups.impl.h +++ b/common/exclusive_state_groups.impl.h @@ -74,10 +74,11 @@ void ExclusiveStateGroup::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("%d\n", state); log_info("Placing cell %s at bel %s does violates %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)); + cell.c_str(ctx), ctx->nameOfBel(bel), object.c_str(ctx), definition.prefix.c_str(ctx), "-1"); +// definition.states.at(state).c_str(ctx)); for (const auto required_state : state_range) { log_info(" - %s\n", definition.states.at(required_state).c_str(ctx)); -- cgit v1.2.3 From 3cd459912a23b03640e3e1621dd454874ed11381 Mon Sep 17 00:00:00 2001 From: Maciej Dudek Date: Tue, 14 Sep 2021 12:51:15 +0200 Subject: Adding MacroCell placement Signed-off-by: Maciej Dudek --- common/exclusive_state_groups.impl.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'common') diff --git a/common/exclusive_state_groups.impl.h b/common/exclusive_state_groups.impl.h index 4a5b1228..f3ddb5fd 100644 --- a/common/exclusive_state_groups.impl.h +++ b/common/exclusive_state_groups.impl.h @@ -74,11 +74,10 @@ void ExclusiveStateGroup::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("%d\n", state); - 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), "-1"); -// definition.states.at(state).c_str(ctx)); + cell.c_str(ctx), ctx->nameOfBel(bel), object.c_str(ctx), definition.prefix.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)); -- cgit v1.2.3 From ea489f6d934ac6e649bcd81e10856e809f6b30d2 Mon Sep 17 00:00:00 2001 From: Maciej Dudek Date: Mon, 27 Sep 2021 16:16:33 +0200 Subject: Fix small isses and code formatting Signed-off-by: Maciej Dudek --- common/placer1.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common') 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 -- cgit v1.2.3