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

clangformat

Browse Source 
Signed-off-by: D. Shah <dave@ds0.me>
This commit is contained in:
D. Shah 2021-01-28 14:38:20 +00:00
parent b671d8f59d
commit 0d97904216
3 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
common/archcheck.cc
View File

@ -38,7 +38,7 @@ void archcheck_names(const Context *ctx)
for (BelId bel : ctx->getBels()) { for (BelId bel : ctx->getBels()) {
IdString name = ctx->getBelName(bel); IdString name = ctx->getBelName(bel);
BelId bel2 = ctx->getBelByName(name); BelId bel2 = ctx->getBelByName(name);
if(bel != bel2) { if (bel != bel2) {
log_error("bel != bel2, name = %s\n", name.c_str(ctx)); log_error("bel != bel2, name = %s\n", name.c_str(ctx));
} }
} }
@ -47,7 +47,7 @@ void archcheck_names(const Context *ctx)
for (WireId wire : ctx->getWires()) { for (WireId wire : ctx->getWires()) {
IdString name = ctx->getWireName(wire); IdString name = ctx->getWireName(wire);
WireId wire2 = ctx->getWireByName(name); WireId wire2 = ctx->getWireByName(name);
if(wire != wire2) { if (wire != wire2) {
log_error("wire != wire2, name = %s\n", name.c_str(ctx)); log_error("wire != wire2, name = %s\n", name.c_str(ctx));
} }
} }
@ -56,7 +56,7 @@ void archcheck_names(const Context *ctx)
for (PipId pip : ctx->getPips()) { for (PipId pip : ctx->getPips()) {
IdString name = ctx->getPipName(pip); IdString name = ctx->getPipName(pip);
PipId pip2 = ctx->getPipByName(name); PipId pip2 = ctx->getPipByName(name);
if(pip != pip2) { if (pip != pip2) {
log_error("pip != pip2, name = %s\n", name.c_str(ctx)); log_error("pip != pip2, name = %s\n", name.c_str(ctx));
} }
} }
@ -127,19 +127,18 @@ void archcheck_conn(const Context *ctx)
log_info("Checking all wires...\n"); log_info("Checking all wires...\n");
for (WireId wire : ctx->getWires()) for (WireId wire : ctx->getWires()) {
{ for (BelPin belpin : ctx->getWireBelPins(wire)) {
for(BelPin belpin : ctx->getWireBelPins(wire)) {
WireId wire2 = ctx->getBelPinWire(belpin.bel, belpin.pin); WireId wire2 = ctx->getBelPinWire(belpin.bel, belpin.pin);
log_assert(wire == wire2); log_assert(wire == wire2);
} }
for(PipId pip : ctx->getPipsDownhill(wire)) { for (PipId pip : ctx->getPipsDownhill(wire)) {
WireId wire2 = ctx->getPipSrcWire(pip); WireId wire2 = ctx->getPipSrcWire(pip);
log_assert(wire == wire2); log_assert(wire == wire2);
} }
for(PipId pip : ctx->getPipsUphill(wire)) { for (PipId pip : ctx->getPipsUphill(wire)) {
WireId wire2 = ctx->getPipDstWire(pip); WireId wire2 = ctx->getPipDstWire(pip);
log_assert(wire == wire2); log_assert(wire == wire2);
} }
@ -147,16 +146,16 @@ void archcheck_conn(const Context *ctx)
log_info("Checking all BELs...\n"); log_info("Checking all BELs...\n");
for (BelId bel : ctx->getBels()) { for (BelId bel : ctx->getBels()) {
for(IdString pin : ctx->getBelPins(bel)) { for (IdString pin : ctx->getBelPins(bel)) {
WireId wire = ctx->getBelPinWire(bel, pin); WireId wire = ctx->getBelPinWire(bel, pin);
if(wire == WireId()) { if (wire == WireId()) {
continue; continue;
} }
bool found_belpin = false; bool found_belpin = false;
for(BelPin belpin : ctx->getWireBelPins(wire)) { for (BelPin belpin : ctx->getWireBelPins(wire)) {
if(belpin.bel == bel && belpin.pin == pin) { if (belpin.bel == bel && belpin.pin == pin) {
found_belpin = true; found_belpin = true;
break; break;
} }
@ -169,10 +168,10 @@ void archcheck_conn(const Context *ctx)
log_info("Checking all PIPs...\n"); log_info("Checking all PIPs...\n");
for (PipId pip : ctx->getPips()) { for (PipId pip : ctx->getPips()) {
WireId src_wire = ctx->getPipSrcWire(pip); WireId src_wire = ctx->getPipSrcWire(pip);
if(src_wire != WireId()) { if (src_wire != WireId()) {
bool found_pip = false; bool found_pip = false;
for(PipId downhill_pip : ctx->getPipsDownhill(src_wire)) { for (PipId downhill_pip : ctx->getPipsDownhill(src_wire)) {
if(pip == downhill_pip) { if (pip == downhill_pip) {
found_pip = true; found_pip = true;
break; break;
} }
@ -182,10 +181,10 @@ void archcheck_conn(const Context *ctx)
} }
WireId dst_wire = ctx->getPipDstWire(pip); WireId dst_wire = ctx->getPipDstWire(pip);
if(dst_wire != WireId()) { if (dst_wire != WireId()) {
bool found_pip = false; bool found_pip = false;
for(PipId uphill_pip : ctx->getPipsUphill(dst_wire)) { for (PipId uphill_pip : ctx->getPipsUphill(dst_wire)) {
if(pip == uphill_pip) { if (pip == uphill_pip) {
found_pip = true; found_pip = true;
break; break;
} }

7
common/nextpnr.h
View File

@ -631,7 +631,7 @@ struct DeterministicRNG
rng64(); rng64();
} }
template <typename Iter> void shuffle(const Iter& begin, const Iter& end) template <typename Iter> void shuffle(const Iter &begin, const Iter &end)
{ {
size_t size = end - begin; size_t size = end - begin;
for (size_t i = 0; i != size; i++) { for (size_t i = 0; i != size; i++) {
@ -641,10 +641,7 @@ struct DeterministicRNG
} }
} }
template <typename T> void shuffle(std::vector<T> &a) template <typename T> void shuffle(std::vector<T> &a) { shuffle(a.begin(), a.end()); }
{
shuffle(a.begin(), a.end());
}
template <typename T> void sorted_shuffle(std::vector<T> &a) template <typename T> void sorted_shuffle(std::vector<T> &a)
{ {

5
json/jsonwrite.cc
View File

@ -135,8 +135,9 @@ void write_module(std::ostream &f, Context *ctx)
for (auto &port : ports) { for (auto &port : ports) {
f << stringf("%s\n", first ? "" : ","); f << stringf("%s\n", first ? "" : ",");
f << stringf(" %s: {\n", get_string(port.name).c_str()); f << stringf(" %s: {\n", get_string(port.name).c_str());
f << stringf(" \"direction\": \"%s\",\n", f << stringf(" \"direction\": \"%s\",\n", port.dir == PORT_IN ? "input"
port.dir == PORT_IN ? "input" : port.dir == PORT_INOUT ? "inout" : "output"); : port.dir == PORT_INOUT ? "inout"
: "output");
f << stringf(" \"bits\": %s\n", format_port_bits(port, dummy_idx).c_str()); f << stringf(" \"bits\": %s\n", format_port_bits(port, dummy_idx).c_str());
f << stringf(" }"); f << stringf(" }");
first = false; first = false;