diff --git a/common/router1.cc b/common/router1.cc index a171374f..f8d86a5b 100644 --- a/common/router1.cc +++ b/common/router1.cc @@ -251,7 +251,8 @@ struct Router } } - Router(Context *ctx, RipupScoreboard &scores, IdString net_name, int user_idx = -1, bool reroute = false, bool ripup = false, delay_t ripup_penalty = 0) + Router(Context *ctx, RipupScoreboard &scores, IdString net_name, int user_idx = -1, bool reroute = false, + bool ripup = false, delay_t ripup_penalty = 0) : ctx(ctx), scores(scores), net_name(net_name), ripup(ripup), ripup_penalty(ripup_penalty) { auto net_info = ctx->nets.at(net_name).get(); @@ -336,7 +337,8 @@ struct Router user_it.port.c_str(ctx), user_port.c_str(ctx), user_it.cell->name.c_str(ctx), ctx->getBelName(dst_bel).c_str(ctx)); - std::function register_existing_path = [ctx, net_info, &src_wires, ®ister_existing_path](WireId wire) -> delay_t { + std::function register_existing_path = + [ctx, net_info, &src_wires, ®ister_existing_path](WireId wire) -> delay_t { auto it = src_wires.find(wire); if (it != src_wires.end()) return it->second; @@ -345,7 +347,7 @@ struct Router delay_t delay = register_existing_path(ctx->getPipSrcWire(pip)); delay += ctx->getPipDelay(pip).maxDelay(); delay += ctx->getWireDelay(wire).maxDelay(); - delay -= 2*ctx->getDelayEpsilon(); + delay -= 2 * ctx->getDelayEpsilon(); src_wires[wire] = delay; return delay; @@ -361,7 +363,7 @@ struct Router } register_existing_path(dst_wire); - check_next_user_for_existing_path:; + check_next_user_for_existing_path:; } std::vector ripup_wires; @@ -371,8 +373,8 @@ struct Router for (auto &it : ripup_wires) { if (ctx->debug) - log(" Unbind dangling wire for net %s: %s\n", - net_name.c_str(ctx), ctx->getWireName(it).c_str(ctx)); + log(" Unbind dangling wire for net %s: %s\n", net_name.c_str(ctx), + ctx->getWireName(it).c_str(ctx)); ctx->unbindWire(it); } } @@ -499,9 +501,8 @@ struct RouteJob }; }; -void addFullNetRouteJob(Context *ctx, IdString net_name, - std::unordered_map> &cache, - std::priority_queue, RouteJob::Greater> &queue) +void addFullNetRouteJob(Context *ctx, IdString net_name, std::unordered_map> &cache, + std::priority_queue, RouteJob::Greater> &queue) { NetInfo *net_info = ctx->nets.at(net_name).get(); @@ -541,8 +542,7 @@ void addFullNetRouteJob(Context *ctx, IdString net_name, bool got_slack = false; - for (int user_idx = 0; user_idx < int(net_info->users.size()); user_idx++) - { + for (int user_idx = 0; user_idx < int(net_info->users.size()); user_idx++) { if (net_cache[user_idx]) continue; @@ -550,8 +550,8 @@ void addFullNetRouteJob(Context *ctx, IdString net_name, auto dst_bel = user_info.cell->bel; if (dst_bel == BelId()) - log_error("Destination cell %s (%s) is not mapped to a bel.\n", - user_info.cell->name.c_str(ctx), user_info.cell->type.c_str(ctx)); + log_error("Destination cell %s (%s) is not mapped to a bel.\n", user_info.cell->name.c_str(ctx), + user_info.cell->type.c_str(ctx)); IdString user_port = user_info.port; @@ -595,8 +595,7 @@ void addFullNetRouteJob(Context *ctx, IdString net_name, net_cache[user_idx] = true; } -void addNetRouteJobs(Context *ctx, IdString net_name, - std::unordered_map> &cache, +void addNetRouteJobs(Context *ctx, IdString net_name, std::unordered_map> &cache, std::priority_queue, RouteJob::Greater> &queue) { NetInfo *net_info = ctx->nets.at(net_name).get(); @@ -629,8 +628,7 @@ void addNetRouteJobs(Context *ctx, IdString net_name, if (net_cache.empty()) net_cache.resize(net_info->users.size()); - for (int user_idx = 0; user_idx < int(net_info->users.size()); user_idx++) - { + for (int user_idx = 0; user_idx < int(net_info->users.size()); user_idx++) { if (net_cache[user_idx]) continue; @@ -638,8 +636,8 @@ void addNetRouteJobs(Context *ctx, IdString net_name, auto dst_bel = user_info.cell->bel; if (dst_bel == BelId()) - log_error("Destination cell %s (%s) is not mapped to a bel.\n", - user_info.cell->name.c_str(ctx), user_info.cell->type.c_str(ctx)); + log_error("Destination cell %s (%s) is not mapped to a bel.\n", user_info.cell->name.c_str(ctx), + user_info.cell->type.c_str(ctx)); IdString user_port = user_info.port; @@ -661,12 +659,10 @@ void addNetRouteJobs(Context *ctx, IdString net_name, auto it = net_info->wires.find(cursor); if (it == net_info->wires.end()) { if (ctx->debug) - log("Adding job [%s %d]: %s %s (%s) -> %s %s (%s)\n", - net_name.c_str(ctx), user_idx, + log("Adding job [%s %d]: %s %s (%s) -> %s %s (%s)\n", net_name.c_str(ctx), user_idx, ctx->getBelName(src_bel).c_str(ctx), driver_port.c_str(ctx), - ctx->getWireName(src_wire).c_str(ctx), - ctx->getBelName(dst_bel).c_str(ctx), user_port.c_str(ctx), - ctx->getWireName(dst_wire).c_str(ctx)); + ctx->getWireName(src_wire).c_str(ctx), ctx->getBelName(dst_bel).c_str(ctx), + user_port.c_str(ctx), ctx->getWireName(dst_wire).c_str(ctx)); RouteJob job; job.net = net_name; job.user_idx = user_idx; @@ -736,7 +732,7 @@ bool router1(Context *ctx) bool printNets = ctx->verbose && (jobQueue.size() < 10); while (!jobQueue.empty()) { - if(ctx->debug) + if (ctx->debug) log("Next job slack: %f\n", double(jobQueue.top().slack)); auto net_name = jobQueue.top().net; @@ -745,8 +741,8 @@ bool router1(Context *ctx) if (printNets) { if (user_idx < 0) - log_info(" routing all %d users of net %s\n", - int(ctx->nets.at(net_name)->users.size()), net_name.c_str(ctx)); + log_info(" routing all %d users of net %s\n", int(ctx->nets.at(net_name)->users.size()), + net_name.c_str(ctx)); else log_info(" routing user %d of net %s\n", user_idx, net_name.c_str(ctx)); } @@ -854,9 +850,8 @@ bool router1(Context *ctx) } if (!ctx->verbose) - log_info("iteration %d: routed %d nets without ripup, routed %d nets with ripup.\n", - iterCnt, int(normalRouteNets.size()), int(ripupQueue.size())); - + log_info("iteration %d: routed %d nets without ripup, routed %d nets with ripup.\n", iterCnt, + int(normalRouteNets.size()), int(ripupQueue.size())); totalVisitCnt += visitCnt; totalRevisitCnt += revisitCnt; diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc index 847698c5..810a98ae 100644 --- a/gui/ice40/mainwindow.cc +++ b/gui/ice40/mainwindow.cc @@ -222,7 +222,7 @@ void MainWindow::new_proj() QString package = QInputDialog::getItem(this, "Select package", "Package:", getSupportedPackages(chipArgs.type), 0, false, &ok); - if (ok && !item.isEmpty()) { + if (ok && !item.isEmpty()) { currentProj = ""; currentJson = ""; currentPCF = ""; diff --git a/ice40/arch.cc b/ice40/arch.cc index 5d7d1fb4..3833dcb7 100644 --- a/ice40/arch.cc +++ b/ice40/arch.cc @@ -283,8 +283,7 @@ BelRange Arch::getBelsByTile(int x, int y) const br.e.cursor = br.b.cursor; if (br.e.cursor != -1) { - while (br.e.cursor < chip_info->num_bels && - chip_info->bel_data[br.e.cursor].x == x && + while (br.e.cursor < chip_info->num_bels && chip_info->bel_data[br.e.cursor].x == x && chip_info->bel_data[br.e.cursor].y == y) br.e.cursor++; } diff --git a/ice40/arch.h b/ice40/arch.h index b7e66414..9a8ec7bc 100644 --- a/ice40/arch.h +++ b/ice40/arch.h @@ -455,10 +455,7 @@ struct Arch : BaseCtx BelId getBelByLocation(Loc loc) const; BelRange getBelsByTile(int x, int y) const; - bool getBelGlobalBuf(BelId bel) const - { - return chip_info->bel_data[bel.index].type == TYPE_SB_GB; - } + bool getBelGlobalBuf(BelId bel) const { return chip_info->bel_data[bel.index].type == TYPE_SB_GB; } BelRange getBelsAtSameTile(BelId bel) const NPNR_DEPRECATED; diff --git a/ice40/main.cc b/ice40/main.cc index 70324a91..b84d6d92 100644 --- a/ice40/main.cc +++ b/ice40/main.cc @@ -69,8 +69,8 @@ void svg_dump_decal(const Context *ctx, const DecalXY &decal) void conflicting_options(const boost::program_options::variables_map &vm, const char *opt1, const char *opt2) { if (vm.count(opt1) && !vm[opt1].defaulted() && vm.count(opt2) && !vm[opt2].defaulted()) { - std::string msg = "Conflicting options '"+ std::string(opt1) + "' and '" + std::string(opt1) + "'."; - log_error("%s\n",msg.c_str()); + std::string msg = "Conflicting options '" + std::string(opt1) + "' and '" + std::string(opt1) + "'."; + log_error("%s\n", msg.c_str()); } }