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

ecp5: Use new cluster API

Browse Source 
Signed-off-by: gatecat <gatecat@ds0.me>
This commit is contained in:
gatecat 2021-05-06 11:59:58 +01:00
parent 14863bc04e
commit c82df9e40d
3 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ecp5/archdefs.h
View File

@ -23,6 +23,7 @@
#include <boost/functional/hash.hpp> #include <boost/functional/hash.hpp>
#include "base_clusterinfo.h"
#include "idstring.h" #include "idstring.h"
#include "nextpnr_namespaces.h" #include "nextpnr_namespaces.h"
@ -148,7 +149,9 @@ struct ArchNetInfo
bool is_global = false; bool is_global = false;
}; };
struct ArchCellInfo typedef IdString ClusterId;
struct ArchCellInfo : BaseClusterInfo
{ {
struct struct
{ {

2
ecp5/bitstream.cc
View File

@ -1171,7 +1171,7 @@ void write_bitstream(Context *ctx, std::string base_config_file, std::string tex
tg.config.add_enum(dsp + ".RESETMODE", str_or_default(ci->params, ctx->id("RESETMODE"), "SYNC")); tg.config.add_enum(dsp + ".RESETMODE", str_or_default(ci->params, ctx->id("RESETMODE"), "SYNC"));
tg.config.add_enum(dsp + ".MODE", "MULT18X18D"); tg.config.add_enum(dsp + ".MODE", "MULT18X18D");
if (str_or_default(ci->params, ctx->id("REG_OUTPUT_CLK"), "NONE") == "NONE" && ci->constr_parent == nullptr) if (str_or_default(ci->params, ctx->id("REG_OUTPUT_CLK"), "NONE") == "NONE" && ci->cluster == ClusterId())
tg.config.add_enum(dsp + ".CIBOUT_BYP", "ON"); tg.config.add_enum(dsp + ".CIBOUT_BYP", "ON");
if (loc.z < 4) if (loc.z < 4)

42
ecp5/pack.cc
View File

@ -631,10 +631,11 @@ class Ecp5Packer
slice0->constr_z = 1; slice0->constr_z = 1;
slice0->constr_x = 0; slice0->constr_x = 0;
slice0->constr_y = 0; slice0->constr_y = 0;
slice0->constr_parent = slice1; slice0->cluster = slice1->name;
slice1->constr_z = 0; slice1->constr_z = 0;
slice1->constr_abs_z = true; slice1->constr_abs_z = true;
slice1->constr_children.push_back(slice0); slice1->constr_children.push_back(slice0);
slice1->cluster = slice1->name;
if (lutffPairs.find(ci->name) != lutffPairs.end()) { if (lutffPairs.find(ci->name) != lutffPairs.end()) {
CellInfo *ff = ctx->cells.at(lutffPairs[ci->name]).get(); CellInfo *ff = ctx->cells.at(lutffPairs[ci->name]).get();
@ -696,21 +697,22 @@ class Ecp5Packer
for (auto slice : {slice0, slice1, slice2, slice3}) { for (auto slice : {slice0, slice1, slice2, slice3}) {
slice->constr_children.clear(); slice->constr_children.clear();
slice->constr_abs_z = false; slice->constr_abs_z = false;
slice->constr_x = slice->UNCONSTR; slice->constr_x = 0;
slice->constr_y = slice->UNCONSTR; slice->constr_y = 0;
slice->constr_z = slice->UNCONSTR; slice->constr_z = 0;
slice->constr_parent = nullptr; slice->cluster = ClusterId();
} }
slice3->constr_children.clear(); slice3->constr_children.clear();
slice3->constr_abs_z = true; slice3->constr_abs_z = true;
slice3->constr_z = 0; slice3->constr_z = 0;
slice3->cluster = slice3->name;
slice2->constr_children.clear(); slice2->constr_children.clear();
slice2->constr_abs_z = true; slice2->constr_abs_z = true;
slice2->constr_z = 1; slice2->constr_z = 1;
slice2->constr_x = 0; slice2->constr_x = 0;
slice2->constr_y = 0; slice2->constr_y = 0;
slice2->constr_parent = slice3; slice2->cluster = slice3->name;
slice3->constr_children.push_back(slice2); slice3->constr_children.push_back(slice2);
slice1->constr_children.clear(); slice1->constr_children.clear();
@ -718,7 +720,7 @@ class Ecp5Packer
slice1->constr_z = 2; slice1->constr_z = 2;
slice1->constr_x = 0; slice1->constr_x = 0;
slice1->constr_y = 0; slice1->constr_y = 0;
slice1->constr_parent = slice3; slice1->cluster = slice3->name;
slice3->constr_children.push_back(slice1); slice3->constr_children.push_back(slice1);
slice0->constr_children.clear(); slice0->constr_children.clear();
@ -726,7 +728,7 @@ class Ecp5Packer
slice0->constr_z = 3; slice0->constr_z = 3;
slice0->constr_x = 0; slice0->constr_x = 0;
slice0->constr_y = 0; slice0->constr_y = 0;
slice0->constr_parent = slice3; slice0->cluster = slice3->name;
slice3->constr_children.push_back(slice0); slice3->constr_children.push_back(slice0);
if (lutffPairs.find(ci->name) != lutffPairs.end()) { if (lutffPairs.find(ci->name) != lutffPairs.end()) {
@ -956,12 +958,13 @@ class Ecp5Packer
for (auto &chain : packed_chains) { for (auto &chain : packed_chains) {
chain.at(0)->constr_abs_z = true; chain.at(0)->constr_abs_z = true;
chain.at(0)->constr_z = 0; chain.at(0)->constr_z = 0;
chain.at(0)->cluster = chain.at(0)->name;
for (int i = 1; i < int(chain.size()); i++) { for (int i = 1; i < int(chain.size()); i++) {
chain.at(i)->constr_x = (i / 4); chain.at(i)->constr_x = (i / 4);
chain.at(i)->constr_y = 0; chain.at(i)->constr_y = 0;
chain.at(i)->constr_z = i % 4; chain.at(i)->constr_z = i % 4;
chain.at(i)->constr_abs_z = true; chain.at(i)->constr_abs_z = true;
chain.at(i)->constr_parent = chain.at(0); chain.at(i)->cluster = chain.at(0)->name;
chain.at(0)->constr_children.push_back(chain.at(i)); chain.at(0)->constr_children.push_back(chain.at(i));
} }
} }
@ -1037,15 +1040,16 @@ class Ecp5Packer
// Setup placement constraints // Setup placement constraints
ram0_slice->constr_abs_z = true; ram0_slice->constr_abs_z = true;
ram0_slice->constr_z = 0; ram0_slice->constr_z = 0;
ram0_slice->cluster = ram0_slice->name;
ram1_slice->constr_parent = ram0_slice.get(); ram1_slice->cluster = ram0_slice->name;
ram1_slice->constr_abs_z = true; ram1_slice->constr_abs_z = true;
ram1_slice->constr_x = 0; ram1_slice->constr_x = 0;
ram1_slice->constr_y = 0; ram1_slice->constr_y = 0;
ram1_slice->constr_z = 1; ram1_slice->constr_z = 1;
ram0_slice->constr_children.push_back(ram1_slice.get()); ram0_slice->constr_children.push_back(ram1_slice.get());
ramw_slice->constr_parent = ram0_slice.get(); ramw_slice->cluster = ram0_slice->name;
ramw_slice->constr_abs_z = true; ramw_slice->constr_abs_z = true;
ramw_slice->constr_x = 0; ramw_slice->constr_x = 0;
ramw_slice->constr_y = 0; ramw_slice->constr_y = 0;
@ -1189,17 +1193,15 @@ class Ecp5Packer
CellInfo *target = find_nearby_cell(ci, [&](CellInfo *cursor) { CellInfo *target = find_nearby_cell(ci, [&](CellInfo *cursor) {
if (cursor->type != id_TRELLIS_SLICE) if (cursor->type != id_TRELLIS_SLICE)
return false; return false;
if (!cursor->constr_children.empty() || cursor->constr_parent != nullptr) { if (cursor->cluster != ClusterId()) {
auto &constr_children = (cursor->constr_parent != nullptr) auto &constr_children = ctx->cells.at(cursor->cluster)->constr_children;
? cursor->constr_parent->constr_children
: cursor->constr_children;
// Skip big chains for performance // Skip big chains for performance
if (constr_children.size() > 8) if (constr_children.size() > 8)
return false; return false;
// Have to check the whole of the tile for legality when dealing with chains, not just slice // Have to check the whole of the tile for legality when dealing with chains, not just slice
ltile.clear(); ltile.clear();
if (cursor->constr_parent != nullptr) if (cursor->cluster != cursor->name)
ltile.push_back(cursor->constr_parent); ltile.push_back(ctx->cells.at(cursor->cluster).get());
else else
ltile.push_back(cursor); ltile.push_back(cursor);
for (auto c : constr_children) for (auto c : constr_children)
@ -1596,7 +1598,11 @@ class Ecp5Packer
mult_b = mult; mult_b = mult;
} }
mult->constr_y = 0; mult->constr_y = 0;
mult->constr_parent = ci; mult->cluster = ci->name;
ci->constr_x = 0;
ci->constr_y = 0;
ci->constr_z = 0;
ci->cluster = ci->name;
ci->constr_children.push_back(mult); ci->constr_children.push_back(mult);
log_info("DSP: Constraining MULT18X18D '%s' to ALU54B '%s' port %s\n", mult->name.c_str(ctx), log_info("DSP: Constraining MULT18X18D '%s' to ALU54B '%s' port %s\n", mult->name.c_str(ctx),
cell.first.c_str(ctx), ctx->nameOf(port)); cell.first.c_str(ctx), ctx->nameOf(port));