From 289fca0976071eabaeccedb7caf9125f70740ef8 Mon Sep 17 00:00:00 2001 From: David Shah Date: Sat, 23 Jun 2018 12:09:01 +0200 Subject: ice40: Move global net test to Arch Signed-off-by: David Shah --- ice40/arch_place.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'ice40/arch_place.cc') diff --git a/ice40/arch_place.cc b/ice40/arch_place.cc index 60fa928e..7b79e031 100644 --- a/ice40/arch_place.cc +++ b/ice40/arch_place.cc @@ -58,11 +58,11 @@ bool PlaceValidityChecker::logicCellsCompatible( clk = get_net_or_empty(cell, id_clk); sr = get_net_or_empty(cell, id_sr); - if (!is_global_net(ctx, cen) && cen != nullptr) + if (!ctx->isGlobalNet(cen) && cen != nullptr) locals_count++; - if (!is_global_net(ctx, clk) && clk != nullptr) + if (!ctx->isGlobalNet(clk) && clk != nullptr) locals_count++; - if (!is_global_net(ctx, sr) && sr != nullptr) + if (!ctx->isGlobalNet(sr) && sr != nullptr) locals_count++; if (bool_or_default(cell->params, id_neg_clk)) { @@ -140,7 +140,8 @@ bool PlaceValidityChecker::isValidBelForCell(CellInfo *cell, BelId bel) } else if (cell->type == id_sb_gb) { bool is_reset = false, is_cen = false; assert(cell->ports.at(ctx->id("GLOBAL_BUFFER_OUTPUT")).net != nullptr); - for (auto user : cell->ports.at(ctx->id("GLOBAL_BUFFER_OUTPUT")).net->users) { + for (auto user : + cell->ports.at(ctx->id("GLOBAL_BUFFER_OUTPUT")).net->users) { if (is_reset_port(ctx, user)) is_reset = true; if (is_enable_port(ctx, user)) -- cgit v1.2.3