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

clangformat.

Browse Source
This commit is contained in:
William D. Jones 2021-12-16 17:09:29 -05:00
parent 78ce9971ff
commit 064b6d808e
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
machxo2/bitstream.cc
View File

@ -62,6 +62,7 @@ static std::string get_trellis_wirename(Context *ctx, Location loc, WireId wire)
// relative coords push them outside the bounds of the chip. // relative coords push them outside the bounds of the chip.
// Indents are based on wires proximity/purpose. // Indents are based on wires proximity/purpose.
auto is_pio_wire = [](std::string name) { auto is_pio_wire = [](std::string name) {
// clang-format off
return (name.find("DI") != std::string::npos || name.find("JDI") != std::string::npos || return (name.find("DI") != std::string::npos || name.find("JDI") != std::string::npos ||
name.find("PADD") != std::string::npos || name.find("INDD") != std::string::npos || name.find("PADD") != std::string::npos || name.find("INDD") != std::string::npos ||
name.find("IOLDO") != std::string::npos || name.find("IOLTO") != std::string::npos || name.find("IOLDO") != std::string::npos || name.find("IOLTO") != std::string::npos ||
@ -77,6 +78,7 @@ static std::string get_trellis_wirename(Context *ctx, Location loc, WireId wire)
name.find("JIN") != std::string::npos || name.find("JIP") != std::string::npos || name.find("JIN") != std::string::npos || name.find("JIP") != std::string::npos ||
// Connections to global mux // Connections to global mux
name.find("JINCK") != std::string::npos); name.find("JINCK") != std::string::npos);
// clang-format on
}; };
if (prefix2 == "G_" || prefix2 == "L_" || prefix2 == "R_" || prefix7 == "BRANCH_") if (prefix2 == "G_" || prefix2 == "L_" || prefix2 == "R_" || prefix7 == "BRANCH_")
@ -103,14 +105,14 @@ static std::string get_trellis_wirename(Context *ctx, Location loc, WireId wire)
if (wire.location.x == 0) { if (wire.location.x == 0) {
std::string pio_name = "W1_" + basename; std::string pio_name = "W1_" + basename;
if (ctx->verbose) if (ctx->verbose)
log_info("PIO wire %s was adjusted by W1 to form Trellis name %s.\n", \ log_info("PIO wire %s was adjusted by W1 to form Trellis name %s.\n", ctx->nameOfWire(wire),
ctx->nameOfWire(wire), pio_name.c_str()); pio_name.c_str());
return pio_name; return pio_name;
} else if (wire.location.x == max_col) { } else if (wire.location.x == max_col) {
std::string pio_name = "E1_" + basename; std::string pio_name = "E1_" + basename;
if (ctx->verbose) if (ctx->verbose)
log_info("PIO wire %s was adjusted by E1 to form Trellis name %s.\n", \ log_info("PIO wire %s was adjusted by E1 to form Trellis name %s.\n", ctx->nameOfWire(wire),
ctx->nameOfWire(wire), pio_name.c_str()); pio_name.c_str());
return pio_name; return pio_name;
} }
} }

3
machxo2/pack.cc
View File

@ -229,7 +229,8 @@ static bool is_nextpnr_iob(Context *ctx, CellInfo *cell)
static bool is_facade_iob(const Context *ctx, const CellInfo *cell) { return cell->type == id_FACADE_IO; } static bool is_facade_iob(const Context *ctx, const CellInfo *cell) { return cell->type == id_FACADE_IO; }
static bool nextpnr_iob_connects_only_facade_iob(Context *ctx, CellInfo *iob, NetInfo *&top) { static bool nextpnr_iob_connects_only_facade_iob(Context *ctx, CellInfo *iob, NetInfo *&top)
{
NPNR_ASSERT(is_nextpnr_iob(ctx, iob)); NPNR_ASSERT(is_nextpnr_iob(ctx, iob));
if (iob->type == ctx->id("$nextpnr_ibuf")) { if (iob->type == ctx->id("$nextpnr_ibuf")) {