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

ecp5: DSCS clock propagation if modesel is 0 constant

Browse Source
This commit is contained in:
rowanG077 2023-02-06 15:40:28 +01:00
parent a38ee0786a
commit d2bf44ba45
1 changed files with 102 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
ecp5/pack.cc
View File

@ -36,6 +36,18 @@ static bool is_nextpnr_iob(Context *ctx, CellInfo *cell)
cell->type == ctx->id("$nextpnr_iobuf"); cell->type == ctx->id("$nextpnr_iobuf");
} }
static bool net_is_constant(const Context *ctx, NetInfo *net, bool &value)
{
if (net == nullptr)
return false;
if (net->name == ctx->id("$PACKER_GND_NET") || net->name == ctx->id("$PACKER_VCC_NET")) {
value = (net->name == ctx->id("$PACKER_VCC_NET"));
return true;
} else {
return false;
}
}
class Ecp5Packer class Ecp5Packer
{ {
public: public:
@ -2724,19 +2736,22 @@ class Ecp5Packer
} else if (ci->type == id_DCSC) { } else if (ci->type == id_DCSC) {
if ((!ci->ports.count(id_CLK0) && !ci->ports.count(id_CLK1)) || !ci->ports.count(id_DCSOUT)) if ((!ci->ports.count(id_CLK0) && !ci->ports.count(id_CLK1)) || !ci->ports.count(id_DCSOUT))
continue; continue;
auto mode = str_or_default(ci->params, id_DCSMODE, "POS");
// TODO: We can do this simplification if we know auto mode = str_or_default(ci->params, id_DCSMODE, "POS");
// MODESEL is tied to 0. I don't know how I can check this bool mode_constant = false;
// if (mode == "CLK0_LOW" || mode == "CLK0_HIGH" || mode == "CLK0") { auto mode_is_constant = net_is_constant(ctx, ci->ports.at(id_MODESEL).net, mode_constant);
// copy_constraint(ci, id_CLK0, id_DCSOUT, 1.0);
// continue; if (mode_is_constant && mode_constant == false) {
// } else if (mode == "CLK1_LOW" || mode == "CLK1_HIGH" || mode == "CLK1") { if (mode == "CLK0_LOW" || mode == "CLK0_HIGH" || mode == "CLK0") {
// copy_constraint(ci, id_CLK1, id_DCSOUT, 1.0); copy_constraint(ci, id_CLK0, id_DCSOUT, 1.0);
// continue; continue;
// } else if (mode == "LOW" || mode == "HIGH") { } else if (mode == "CLK1_LOW" || mode == "CLK1_HIGH" || mode == "CLK1") {
// continue; copy_constraint(ci, id_CLK1, id_DCSOUT, 1.0);
// } continue;
} else if (mode == "LOW" || mode == "HIGH") {
continue;
}
}
std::unique_ptr<ClockConstraint> derived_constr = nullptr; std::unique_ptr<ClockConstraint> derived_constr = nullptr;
std::vector<NetInfo*> in_ports = { std::vector<NetInfo*> in_ports = {
@ -2744,63 +2759,95 @@ class Ecp5Packer
ci->ports.at(id_CLK1).net, ci->ports.at(id_CLK1).net,
}; };
for (auto p : in_ports) { // Generate all unique clock pairs find the worst
if (p == nullptr || p->clkconstr == nullptr) { // constraint from switching between them and merge them
// into the final output constraint.
for (size_t i = 0; i < in_ports.size(); ++i) {
auto p1 = in_ports[i];
if (p1 == nullptr || p1->clkconstr == nullptr) {
derived_constr = nullptr; derived_constr = nullptr;
break; break;
} }
for (size_t j = i + 1; j < in_ports.size(); ++j) {
auto p2 = in_ports[j];
if (p2 == nullptr || p2->clkconstr == nullptr) {
break;
}
auto& c1 = p1->clkconstr;
auto& c2 = p2->clkconstr;
if (derived_constr == nullptr) { auto merged_constr = std::unique_ptr<ClockConstraint>(new ClockConstraint());
derived_constr = std::unique_ptr<ClockConstraint>(new ClockConstraint ());
derived_constr->low = p->clkconstr->low;
derived_constr->high = p->clkconstr->high;
derived_constr->period = p->clkconstr->period;
continue;
}
auto& c1 = p->clkconstr; if (mode == "NEG") {
auto& c2 = derived_constr; merged_constr->low = DelayPair(
std::min(c1->low.min_delay, c2->low.min_delay),
std::max(
c1->low.max_delay + c2->period.max_delay,
c2->low.max_delay + c1->period.max_delay
)
);
} else {
merged_constr->low = DelayPair(
std::min(c1->low.min_delay, c2->low.min_delay),
std::max(c1->low.max_delay, c2->low.max_delay)
);
}
if (mode == "NEG") { if (mode == "POS") {
derived_constr->low = DelayPair( merged_constr->high = DelayPair(
std::min(c1->low.min_delay, c2->low.min_delay), std::min(c1->high.min_delay, c2->high.min_delay),
std::max( std::max(
c1->low.max_delay + c2->period.max_delay, c1->high.max_delay + c2->period.max_delay,
c2->low.max_delay + c1->period.max_delay c2->high.max_delay + c1->period.max_delay
) )
);
} else {
merged_constr->high = DelayPair(
std::min(c1->high.min_delay, c2->high.min_delay),
std::max(c1->high.max_delay, c2->high.max_delay)
);
}
merged_constr->period = DelayPair(
std::min(c1->period.min_delay, c2->period.min_delay),
std::max(c1->period.max_delay, c2->period.max_delay)
); );
} else {
derived_constr->low = DelayPair( if (derived_constr == nullptr) {
std::min(c1->low.min_delay, c2->low.min_delay), derived_constr = std::move(merged_constr);
std::max(c1->low.max_delay, c2->low.max_delay) continue;
}
derived_constr->period.min_delay = std::min(
derived_constr->period.min_delay,
merged_constr->period.min_delay
);
derived_constr->period.max_delay = std::max(
derived_constr->period.max_delay,
merged_constr->period.max_delay
);
derived_constr->low.min_delay = std::min(
derived_constr->low.min_delay,
merged_constr->low.min_delay
);
derived_constr->low.max_delay = std::max(
derived_constr->low.max_delay,
merged_constr->low.max_delay
);
derived_constr->high.min_delay = std::min(
derived_constr->high.min_delay,
merged_constr->high.min_delay
);
derived_constr->high.max_delay = std::max(
derived_constr->high.max_delay,
merged_constr->high.max_delay
); );
} }
if (mode == "POS") {
derived_constr->high = DelayPair(
std::min(c1->high.min_delay, c2->high.min_delay),
std::max(
c1->high.max_delay + c2->period.max_delay,
c2->high.max_delay + c1->period.max_delay
)
);
} else {
derived_constr->high = DelayPair(
std::min(c1->high.min_delay, c2->high.min_delay),
std::max(c1->high.max_delay, c2->high.max_delay)
);
}
derived_constr->period = DelayPair(
std::min(c1->period.min_delay, c2->period.min_delay),
std::max(c1->period.max_delay, c2->period.max_delay)
);
} }
if (derived_constr != nullptr) { if (derived_constr != nullptr) {
set_constraint(ci, id_DCSOUT, std::move(derived_constr)); set_constraint(ci, id_DCSOUT, std::move(derived_constr));
} }
} else if (ci->type == id_EHXPLLL) { } else if (ci->type == id_EHXPLLL) {
delay_t period_in; delay_t period_in;
if (!get_period(ci, id_CLKI, period_in)) if (!get_period(ci, id_CLKI, period_in))