caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clangformat

Browse Source 
Signed-off-by: gatecat <gatecat@ds0.me>
This commit is contained in:
gatecat 2024-06-18 13:54:12 +02:00
parent c89037db49
commit a29a17f8f2
8 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/kernel/command.cc
View File

@ -391,7 +391,6 @@ po::options_description CommandHandler::getGeneralOptions()
general.add_options()("static-dump-density", "write density csv files during placer-static flow"); general.add_options()("static-dump-density", "write density csv files during placer-static flow");
#if !defined(NPNR_DISABLE_THREADS) #if !defined(NPNR_DISABLE_THREADS)
general.add_options()("parallel-refine", "use new experimental parallelised engine for placement refinement"); general.add_options()("parallel-refine", "use new experimental parallelised engine for placement refinement");
#endif #endif
@ -549,7 +548,6 @@ void CommandHandler::setupContext(Context *ctx)
if (vm.count("static-dump-density")) if (vm.count("static-dump-density"))
ctx->settings[ctx->id("static/dump_density")] = true; ctx->settings[ctx->id("static/dump_density")] = true;
// Setting default values // Setting default values
if (ctx->settings.find(ctx->id("target_freq")) == ctx->settings.end()) if (ctx->settings.find(ctx->id("target_freq")) == ctx->settings.end())
ctx->settings[ctx->id("target_freq")] = std::to_string(12e6); ctx->settings[ctx->id("target_freq")] = std::to_string(12e6);

10
common/place/placer_static.cc
View File

@ -420,7 +420,8 @@ class StaticPlacer
if (!ctx->isBelLocationValid(bel)) { if (!ctx->isBelLocationValid(bel)) {
ctx->unbindBel(bel); ctx->unbindBel(bel);
} else { } else {
log_info(" placed potpourri cell '%s' at bel '%s'\n", ctx->nameOf(ci), ctx->nameOfBel(bel)); log_info(" placed potpourri cell '%s' at bel '%s'\n", ctx->nameOf(ci),
ctx->nameOfBel(bel));
break; break;
} }
} }
@ -1003,7 +1004,8 @@ class StaticPlacer
float penalty_beta = 2.0e3f; float penalty_beta = 2.0e3f;
float alpha_l = 1.05f, alpha_h = 1.06f; float alpha_l = 1.05f, alpha_h = 1.06f;
double penalty_incr = alpha_h - 1; double penalty_incr = alpha_h - 1;
void update_penalties() { void update_penalties()
{
float pot_norm = 0; float pot_norm = 0;
// compute L2-norm of relative system potential // compute L2-norm of relative system potential
std::vector<float> rel_pot; std::vector<float> rel_pot;
@ -1029,7 +1031,6 @@ class StaticPlacer
} }
} }
void initialise() void initialise()
{ {
float initial_steplength = 0.01f; float initial_steplength = 0.01f;
@ -1152,7 +1153,8 @@ class StaticPlacer
RealPair drv_loc = cell_loc(ni->driver.cell, false); RealPair drv_loc = cell_loc(ni->driver.cell, false);
for (auto usr : ni->users.enumerate()) { for (auto usr : ni->users.enumerate()) {
RealPair usr_loc = cell_loc(usr.value.cell, false); RealPair usr_loc = cell_loc(usr.value.cell, false);
delay_t est_delay = cfg.timing_c + cfg.timing_mx * std::abs(drv_loc.x - usr_loc.x) + cfg.timing_my * std::abs(drv_loc.y - usr_loc.y); delay_t est_delay = cfg.timing_c + cfg.timing_mx * std::abs(drv_loc.x - usr_loc.x) +
cfg.timing_my * std::abs(drv_loc.y - usr_loc.y);
tmg.set_route_delay(CellPortKey(usr.value), DelayPair(est_delay)); tmg.set_route_delay(CellPortKey(usr.value), DelayPair(est_delay));
} }
} }

2
himbaechel/arch.cc
View File

@ -18,11 +18,11 @@
*/ */
#include "arch.h" #include "arch.h"
#include <boost/filesystem/path.hpp>
#include "archdefs.h" #include "archdefs.h"
#include "chipdb.h" #include "chipdb.h"
#include "log.h" #include "log.h"
#include "nextpnr.h" #include "nextpnr.h"
#include <boost/filesystem/path.hpp>
#include "command.h" #include "command.h"
#include "placer1.h" #include "placer1.h"