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 2021-04-30 18:38:30 +01:00
parent 3dd8986322
commit 4bdf4582f0
1 changed files with 30 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
ecp5/pack.cc
View File

@ -1575,33 +1575,31 @@ class Ecp5Packer
autocreate_empty_port(ci, ctx->id("OP" + std::to_string(i)));
// Find the MULT18X18Ds feeding this ALU54B's MA and MB inputs.
CellInfo* mult_a = nullptr;
CellInfo* mult_b = nullptr;
CellInfo *mult_a = nullptr;
CellInfo *mult_b = nullptr;
for (auto port : {id_MA0, id_MB0}) {
CellInfo *mult = net_driven_by(
ctx, ci->ports.at(port).net,
[](const Context *ctx, const CellInfo *cell) {
return cell->type == id_MULT18X18D;
}, id_P0
);
[](const Context *ctx, const CellInfo *cell) { return cell->type == id_MULT18X18D; },
id_P0);
// We'll handle the mult not existing in check_alu below.
if(mult == nullptr)
if (mult == nullptr)
break;
// Set relative constraint depending on ALU port.
if(port == id_MA0) {
if (port == id_MA0) {
mult->constr_x = mult->constr_z = -3;
mult_a = mult;
} else if(port == id_MB0) {
} else if (port == id_MB0) {
mult->constr_x = mult->constr_z = -2;
mult_b = mult;
}
mult->constr_y = 0;
mult->constr_parent = ci;
ci->constr_children.push_back(mult);
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));
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));
}
// Check existance of, and connectivity to, each MULT.
@ -1611,15 +1609,13 @@ class Ecp5Packer
}
// Check ALU54B is correctly connected to two MULT18X18Ds.
void check_alu(CellInfo* alu, CellInfo* mult_a, CellInfo* mult_b)
void check_alu(CellInfo *alu, CellInfo *mult_a, CellInfo *mult_b)
{
// MULT18X18Ds must be detected on both inputs.
if (mult_a == nullptr) {
log_error("No MULT18X18D found connected to ALU54B '%s' port A\n",
alu->name.c_str(ctx));
log_error("No MULT18X18D found connected to ALU54B '%s' port A\n", alu->name.c_str(ctx));
} else if (mult_b == nullptr) {
log_error("No MULT18X18D found connected to ALU54B '%s' port B\n",
alu->name.c_str(ctx));
log_error("No MULT18X18D found connected to ALU54B '%s' port B\n", alu->name.c_str(ctx));
}
// Placement doesn't work if only one or the other of
@ -1627,11 +1623,11 @@ class Ecp5Packer
auto alu_has_bel = alu->attrs.count(ctx->id("BEL"));
for (auto mult : {mult_a, mult_b}) {
auto mult_has_bel = mult->attrs.count(ctx->id("BEL"));
if(alu_has_bel && !mult_has_bel) {
if (alu_has_bel && !mult_has_bel) {
log_error("ALU54B '%s' has a fixed BEL specified, but connected "
"MULT18X18D '%s' does not, specify both or neither.\n",
alu->name.c_str(ctx), mult->name.c_str(ctx));
} else if(!alu_has_bel && mult_has_bel) {
} else if (!alu_has_bel && mult_has_bel) {
log_error("ALU54B '%s' does not have a fixed BEL specified, but "
"connected MULT18X18D '%s' does, specify both or neither.\n",
alu->name.c_str(ctx), mult->name.c_str(ctx));
@ -1640,17 +1636,16 @@ class Ecp5Packer
// Cannot have MULT OUTPUT_CLK set when connected to an ALU unless
// MULT_BYPASS is also enabled.
for ( auto mult : {mult_a, mult_b}) {
for (auto mult : {mult_a, mult_b}) {
if (str_or_default(mult->params, ctx->id("REG_OUTPUT_CLK"), "NONE") != "NONE" &&
str_or_default(mult->params, ctx->id("MULT_BYPASS"), "DISABLED") != "ENABLED")
{
str_or_default(mult->params, ctx->id("MULT_BYPASS"), "DISABLED") != "ENABLED") {
log_error("MULT18X18D '%s' REG_OUTPUT_CLK must be NONE when driving ALU without MULT_BYPASS\n",
mult->name.c_str(ctx));
}
}
// SIGNEDIA and SIGNEDIB inputs must be connected to SIGNEDP output.
NetInfo* net = alu->ports.at(id_SIGNEDIA).net;
NetInfo *net = alu->ports.at(id_SIGNEDIA).net;
if (net == nullptr || net->driver.cell != mult_a || net->driver.port != id_SIGNEDP) {
log_error("ALU54B '%s' input SIGNEDIA must be driven by SIGNEDP of"
" MULT18X18D '%s'\n",
@ -1674,39 +1669,34 @@ class Ecp5Packer
IdString alu_port = ctx->id(std::string("A") + std::to_string(i));
net = alu->ports.at(alu_port).net;
if(net == nullptr || net->driver.cell != mult_a || net->driver.port != mult_port) {
log_error("ALU54B '%s' input %s must be driven by %s of MULT18X18D '%s'\n",
alu->name.c_str(ctx), alu_port.c_str(ctx), mult_port.c_str(ctx),
mult_a->name.c_str(ctx));
if (net == nullptr || net->driver.cell != mult_a || net->driver.port != mult_port) {
log_error("ALU54B '%s' input %s must be driven by %s of MULT18X18D '%s'\n", alu->name.c_str(ctx),
alu_port.c_str(ctx), mult_port.c_str(ctx), mult_a->name.c_str(ctx));
}
alu_port = ctx->id(std::string("B") + std::to_string(i));
net = alu->ports.at(alu_port).net;
if(net == nullptr || net->driver.cell != mult_b || net->driver.port != mult_port) {
log_error("ALU54B '%s' input %s must be driven by %s of MULT18X18D '%s'\n",
alu->name.c_str(ctx), alu_port.c_str(ctx), mult_port.c_str(ctx),
mult_b->name.c_str(ctx));
if (net == nullptr || net->driver.cell != mult_b || net->driver.port != mult_port) {
log_error("ALU54B '%s' input %s must be driven by %s of MULT18X18D '%s'\n", alu->name.c_str(ctx),
alu_port.c_str(ctx), mult_port.c_str(ctx), mult_b->name.c_str(ctx));
}
mult_port = ctx->id(std::string("P") + std::to_string(i));
alu_port = ctx->id(std::string("MA") + std::to_string(i));
net = alu->ports.at(alu_port).net;
if(net == nullptr || net->driver.cell != mult_a || net->driver.port != mult_port) {
log_error("ALU54B '%s' input %s must be driven by %s of MULT18X18D '%s'\n",
alu->name.c_str(ctx), alu_port.c_str(ctx), mult_port.c_str(ctx),
mult_a->name.c_str(ctx));
if (net == nullptr || net->driver.cell != mult_a || net->driver.port != mult_port) {
log_error("ALU54B '%s' input %s must be driven by %s of MULT18X18D '%s'\n", alu->name.c_str(ctx),
alu_port.c_str(ctx), mult_port.c_str(ctx), mult_a->name.c_str(ctx));
}
alu_port = ctx->id(std::string("MB") + std::to_string(i));
net = alu->ports.at(alu_port).net;
if(net == nullptr || net->driver.cell != mult_b || net->driver.port != mult_port) {
log_error("ALU54B '%s' input %s must be driven by %s of MULT18X18D '%s'\n",
alu->name.c_str(ctx), alu_port.c_str(ctx), mult_port.c_str(ctx),
mult_b->name.c_str(ctx));
if (net == nullptr || net->driver.cell != mult_b || net->driver.port != mult_port) {
log_error("ALU54B '%s' input %s must be driven by %s of MULT18X18D '%s'\n", alu->name.c_str(ctx),
alu_port.c_str(ctx), mult_port.c_str(ctx), mult_b->name.c_str(ctx));
}
}
}
// "Pack" DCUs