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);

18
common/place/parallel_refine.cc
View File

@ -71,9 +71,9 @@ struct ThreadState : DetailPlacerThreadState
BelId old_bel = cell->bel; BelId old_bel = cell->bel;
CellInfo *bound = nullptr; CellInfo *bound = nullptr;
{ {
#if !defined(NPNR_DISABLE_THREADS) #if !defined(NPNR_DISABLE_THREADS)
std::shared_lock<std::shared_timed_mutex> l(g.archapi_mutex); std::shared_lock<std::shared_timed_mutex> l(g.archapi_mutex);
#endif #endif
bound = ctx->getBoundBelCell(new_bel); bound = ctx->getBoundBelCell(new_bel);
} }
if (bound && (bound->belStrength > STRENGTH_STRONG || bound->cluster != ClusterId())) if (bound && (bound->belStrength > STRENGTH_STRONG || bound->cluster != ClusterId()))
@ -127,9 +127,9 @@ struct ThreadState : DetailPlacerThreadState
used_bels.insert(db.second); used_bels.insert(db.second);
CellInfo *bound = nullptr; CellInfo *bound = nullptr;
{ {
#if !defined(NPNR_DISABLE_THREADS) #if !defined(NPNR_DISABLE_THREADS)
std::shared_lock<std::shared_timed_mutex> l(g.archapi_mutex); std::shared_lock<std::shared_timed_mutex> l(g.archapi_mutex);
#endif #endif
bound = ctx->getBoundBelCell(db.second); bound = ctx->getBoundBelCell(db.second);
} }
if (bound) { if (bound) {
@ -160,9 +160,9 @@ struct ThreadState : DetailPlacerThreadState
} else { } else {
bool avail = false; bool avail = false;
{ {
#if !defined(NPNR_DISABLE_THREADS) #if !defined(NPNR_DISABLE_THREADS)
std::shared_lock<std::shared_timed_mutex> l(g.archapi_mutex); std::shared_lock<std::shared_timed_mutex> l(g.archapi_mutex);
#endif #endif
avail = ctx->checkBelAvail(db.second); avail = ctx->checkBelAvail(db.second);
} }
if (!avail) if (!avail)

16
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,14 +1004,15 @@ 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;
for (int g = 0; g < int(groups.size()); g++) { for (int g = 0; g < int(groups.size()); g++) {
auto &group = groups.at(g); auto &group = groups.at(g);
if (!group.enabled) if (!group.enabled)
continue; continue;
float phi_hat = group.curr_potential / group.init_potential; float phi_hat = group.curr_potential / group.init_potential;
rel_pot.push_back(phi_hat); rel_pot.push_back(phi_hat);
pot_norm += phi_hat * phi_hat; pot_norm += phi_hat * phi_hat;
@ -1019,17 +1021,16 @@ class StaticPlacer
log_info("pot_norm: %f\n", pot_norm); log_info("pot_norm: %f\n", pot_norm);
// update penalty multiplier (ELFPlace equation 22) // update penalty multiplier (ELFPlace equation 22)
double log_term = std::log(penalty_beta * pot_norm + 1); double log_term = std::log(penalty_beta * pot_norm + 1);
penalty_incr = penalty_incr * ((log_term / (log_term + 1)) * (alpha_h - alpha_l) + alpha_l); penalty_incr = penalty_incr * ((log_term / (log_term + 1)) * (alpha_h - alpha_l) + alpha_l);
// update density penalties (ELFPlace equation 21) // update density penalties (ELFPlace equation 21)
for (int g = 0; g < int(groups.size()); g++) { for (int g = 0; g < int(groups.size()); g++) {
if (!groups.at(g).enabled) if (!groups.at(g).enabled)
continue; continue;
float next_penalty = dens_penalty.at(g) + (penalty_incr * (rel_pot.at(g) / pot_norm)); float next_penalty = dens_penalty.at(g) + (penalty_incr * (rel_pot.at(g) / pot_norm));
dens_penalty.at(g) = next_penalty; dens_penalty.at(g) = next_penalty;
} }
} }
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
ecp5/bitstream.cc
View File

@ -1548,7 +1548,7 @@ struct ECP5Bitgen
cc.tiles[tile].add_enum(eclkb + ".MODE", "ECLKBRIDGECS"); cc.tiles[tile].add_enum(eclkb + ".MODE", "ECLKBRIDGECS");
} else if (ci->type == id_DDRDLL) { } else if (ci->type == id_DDRDLL) {
Loc loc = ctx->getBelLocation(ci->bel); Loc loc = ctx->getBelLocation(ci->bel);
bool u = loc.y<15, r = loc.x> 15; bool u = loc.y < 15, r = loc.x > 15;
std::string tiletype = fmt_str("DDRDLL_" << (u ? 'U' : 'L') << (r ? 'R' : 'L')); std::string tiletype = fmt_str("DDRDLL_" << (u ? 'U' : 'L') << (r ? 'R' : 'L'));
if ((ctx->args.type == ArchArgs::LFE5U_12F || ctx->args.type == ArchArgs::LFE5U_25F || if ((ctx->args.type == ArchArgs::LFE5U_12F || ctx->args.type == ArchArgs::LFE5U_25F ||
ctx->args.type == ArchArgs::LFE5UM_25F || ctx->args.type == ArchArgs::LFE5UM5G_25F) && ctx->args.type == ArchArgs::LFE5UM_25F || ctx->args.type == ArchArgs::LFE5UM5G_25F) &&

4
ecp5/gfx.cc
View File

@ -134,9 +134,9 @@ void gfxTileBel(std::vector<GraphicElement> &g, int x, int y, int z, int w, int
} }
g.push_back(el); g.push_back(el);
} else if (bel_type == id_DCCA) { } else if (bel_type == id_DCCA) {
el.x1 = x + switchbox_x1 + (z)*0.025; el.x1 = x + switchbox_x1 + (z) * 0.025;
el.y1 = y + 0.14; el.y1 = y + 0.14;
el.x2 = x + switchbox_x1 + (z)*0.025 + 0.020; el.x2 = x + switchbox_x1 + (z) * 0.025 + 0.020;
el.y2 = y + 0.18; el.y2 = y + 0.18;
g.push_back(el); g.push_back(el);
} else if (bel_type.in(id_DP16KD, id_MULT18X18D, id_ALU54B)) { } else if (bel_type.in(id_DP16KD, id_MULT18X18D, id_ALU54B)) {

2
generic/viaduct/fabulous/fasm.cc
View File

@ -136,7 +136,7 @@ struct FabFasmWriter
continue; continue;
unsigned pip_data = pip_tags.at(pip.index).data; unsigned pip_data = pip_tags.at(pip.index).data;
unsigned from_pin = (pip_data >> 4) & 0xF; unsigned from_pin = (pip_data >> 4) & 0xF;
unsigned to_pin = (pip_data)&0xF; unsigned to_pin = (pip_data) & 0xF;
NPNR_ASSERT(to_pin == i); NPNR_ASSERT(to_pin == i);
phys_to_log[from_pin].push_back(i); phys_to_log[from_pin].push_back(i);
} }

2
gui/lineshader.h
View File

@ -170,7 +170,7 @@ class LineShader
public: public:
LineShader(QObject *parent) : parent_(parent), program_(nullptr) {} LineShader(QObject *parent) : parent_(parent), program_(nullptr) {}
~LineShader() { ((QOpenGLWidget*) parent_)->makeCurrent(); } ~LineShader() { ((QOpenGLWidget *)parent_)->makeCurrent(); }
static constexpr const char *vertexShaderSource_ = static constexpr const char *vertexShaderSource_ =
"#version 150\n" "#version 150\n"

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"