diff options
| author | gatecat <gatecat@ds0.me> | 2021-05-06 13:58:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-06 13:58:08 +0100 |
| commit | c322cda3f875a5e5dd2575d3a390cbe1cee073e0 (patch) | |
| tree | fcd843131002f8986decf8dcd9352cf3ebd54290 /ice40 | |
| parent | ed17091e6ada98a55396186a22c748abf3fca310 (diff) | |
| parent | 0d6be6f4749174f4a6938a675456cb663edc47cb (diff) | |
| download | nextpnr-c322cda3f875a5e5dd2575d3a390cbe1cee073e0.tar.gz nextpnr-c322cda3f875a5e5dd2575d3a390cbe1cee073e0.tar.bz2 nextpnr-c322cda3f875a5e5dd2575d3a390cbe1cee073e0.zip | |
Merge pull request #688 from YosysHQ/gatecat/new-cluster-api
New cluster API
Diffstat (limited to 'ice40')
| -rw-r--r-- | ice40/archdefs.h | 4 | ||||
| -rw-r--r-- | ice40/chains.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ice40/archdefs.h b/ice40/archdefs.h index 038a3131..c2b7019c 100644 --- a/ice40/archdefs.h +++ b/ice40/archdefs.h @@ -22,6 +22,7 @@ #include <boost/functional/hash.hpp> +#include "base_clusterinfo.h" #include "idstring.h" #include "nextpnr_namespaces.h" @@ -122,7 +123,7 @@ struct ArchNetInfo struct NetInfo; -struct ArchCellInfo +struct ArchCellInfo : BaseClusterInfo { union { @@ -154,6 +155,7 @@ struct ArchCellInfo }; typedef IdString BelBucketId; +typedef IdString ClusterId; NEXTPNR_NAMESPACE_END diff --git a/ice40/chains.cc b/ice40/chains.cc index 7eb03105..2607959a 100644 --- a/ice40/chains.cc +++ b/ice40/chains.cc @@ -292,12 +292,14 @@ class ChainConstrainer // Place carry chain chain.cells.at(0)->constr_abs_z = true; chain.cells.at(0)->constr_z = 0; + chain.cells.at(0)->cluster = chain.cells.at(0)->name; + for (int i = 1; i < int(chain.cells.size()); i++) { chain.cells.at(i)->constr_x = 0; chain.cells.at(i)->constr_y = (i / 8); chain.cells.at(i)->constr_z = i % 8; chain.cells.at(i)->constr_abs_z = true; - chain.cells.at(i)->constr_parent = chain.cells.at(0); + chain.cells.at(i)->cluster = chain.cells.at(0)->name; chain.cells.at(0)->constr_children.push_back(chain.cells.at(i)); } } |