diff options
| author | gatecat <gatecat@ds0.me> | 2022-02-16 18:13:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-16 18:13:22 +0000 |
| commit | 61d1db16be2c68cf6ae8b4d2ff3266b5c7086ad2 (patch) | |
| tree | 379b38c06745919df0e87c1be1410e16793b0925 /mistral/arch.cc | |
| parent | 25c47e5b7e12d232cac9408b7d6d339ee11793b7 (diff) | |
| parent | 76683a1e3c123d28deff750c38467c6377936879 (diff) | |
| download | nextpnr-61d1db16be2c68cf6ae8b4d2ff3266b5c7086ad2.tar.gz nextpnr-61d1db16be2c68cf6ae8b4d2ff3266b5c7086ad2.tar.bz2 nextpnr-61d1db16be2c68cf6ae8b4d2ff3266b5c7086ad2.zip | |
Merge pull request #918 from YosysHQ/gatecat/netlist-ii
Refactor pt2, barnacle cleanup
Diffstat (limited to 'mistral/arch.cc')
| -rw-r--r-- | mistral/arch.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mistral/arch.cc b/mistral/arch.cc index c50e30f4..e79a3910 100644 --- a/mistral/arch.cc +++ b/mistral/arch.cc @@ -446,7 +446,7 @@ ArcBounds Arch::getRouteBoundingBox(WireId src, WireId dst) const bool Arch::place() { - std::string placer = str_or_default(settings, id("placer"), defaultPlacer); + std::string placer = str_or_default(settings, id_placer, defaultPlacer); if (placer == "heap") { PlacerHeapCfg cfg(getCtx()); @@ -468,7 +468,7 @@ bool Arch::place() log_error("Mistral architecture does not support placer '%s'\n", placer.c_str()); } - getCtx()->attrs[getCtx()->id("step")] = std::string("place"); + getCtx()->attrs[id_step] = std::string("place"); archInfoToAttributes(); return true; } @@ -479,7 +479,7 @@ bool Arch::route() lab_pre_route(); - std::string router = str_or_default(settings, id("router"), defaultRouter); + std::string router = str_or_default(settings, id_router, defaultRouter); bool result; if (router == "router1") { result = router1(getCtx(), Router1Cfg(getCtx())); @@ -489,7 +489,7 @@ bool Arch::route() } else { log_error("Mistral architecture does not support router '%s'\n", router.c_str()); } - getCtx()->attrs[getCtx()->id("step")] = std::string("route"); + getCtx()->attrs[id_step] = std::string("route"); archInfoToAttributes(); return result; } |