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

clangformat

Browse Source 
Signed-off-by: David Shah <davey1576@gmail.com>
This commit is contained in:
David Shah 2018-10-01 18:20:14 +01:00
parent fd4498736e
commit 9ebec3b87f
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/timing.cc
View File

@ -174,11 +174,9 @@ struct Timing
log_info(" driver = %s.%s\n", net->driver.cell->name.c_str(ctx), log_info(" driver = %s.%s\n", net->driver.cell->name.c_str(ctx),
net->driver.port.c_str(ctx)); net->driver.port.c_str(ctx));
for (auto net_user : net->users) for (auto net_user : net->users)
log_info(" user: %s.%s\n", net_user.cell->name.c_str(ctx), log_info(" user: %s.%s\n", net_user.cell->name.c_str(ctx), net_user.port.c_str(ctx));
net_user.port.c_str(ctx));
} else { } else {
log_info(" remaining fanin includes %s (no net)\n", fanin.first->name.c_str(ctx)); log_info(" remaining fanin includes %s (no net)\n", fanin.first->name.c_str(ctx));
} }
} }
} }

2
ecp5/arch.cc
View File

@ -511,7 +511,7 @@ bool Arch::getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort
delay.delay = 193; delay.delay = 193;
return true; return true;
} }
#if 0 //FIXME #if 0 // FIXME
if (fromPort == id_WCK && (toPort == id_F0 || toPort == id_F1)) { if (fromPort == id_WCK && (toPort == id_F0 || toPort == id_F1)) {
delay.delay = 717; delay.delay = 717;
return true; return true;

4
ecp5/bitstream.cc
View File

@ -270,14 +270,12 @@ void write_bitstream(Context *ctx, std::string base_config_file, std::string tex
} }
if (str_or_default(ci->params, ctx->id("MODE"), "LOGIC") == "DPRAM" && slice == "SLICEA") { if (str_or_default(ci->params, ctx->id("MODE"), "LOGIC") == "DPRAM" && slice == "SLICEA") {
cc.tiles[tname].add_enum(slice + ".WREMUX", cc.tiles[tname].add_enum(slice + ".WREMUX", str_or_default(ci->params, ctx->id("WREMUX"), "WRE"));
str_or_default(ci->params, ctx->id("WREMUX"), "WRE"));
// FIXME: WCKMUX // FIXME: WCKMUX
NPNR_ASSERT(str_or_default(ci->params, ctx->id("WCKMUX"), "WCK") == "WCK"); NPNR_ASSERT(str_or_default(ci->params, ctx->id("WCKMUX"), "WCK") == "WCK");
} }
// Tie unused inputs high // Tie unused inputs high
for (auto input : {id_A0, id_B0, id_C0, id_D0, id_A1, id_B1, id_C1, id_D1}) { for (auto input : {id_A0, id_B0, id_C0, id_D0, id_A1, id_B1, id_C1, id_D1}) {
if (ci->ports.find(input) == ci->ports.end() || ci->ports.at(input).net == nullptr) { if (ci->ports.find(input) == ci->ports.end() || ci->ports.at(input).net == nullptr) {

4
ecp5/pack.cc
View File

@ -525,7 +525,7 @@ class Ecp5Packer
if (f1net != nullptr) { if (f1net != nullptr) {
ff1 = net_only_drives(ctx, f1net, is_ff, ctx->id("DI"), false); ff1 = net_only_drives(ctx, f1net, is_ff, ctx->id("DI"), false);
if (ff1 != nullptr && (ff0 == nullptr || can_pack_ffs(ff0, ff1)) && if (ff1 != nullptr && (ff0 == nullptr || can_pack_ffs(ff0, ff1)) &&
can_add_ff_to_tile(tile_ffs, ff1)) { can_add_ff_to_tile(tile_ffs, ff1)) {
ff_packing.push_back(std::make_tuple(ff1, slice.get(), 1)); ff_packing.push_back(std::make_tuple(ff1, slice.get(), 1));
tile_ffs.push_back(ff1); tile_ffs.push_back(ff1);
packed_cells.insert(ff1->name); packed_cells.insert(ff1->name);
@ -609,7 +609,7 @@ class Ecp5Packer
if (f1net != nullptr) { if (f1net != nullptr) {
ff1 = net_only_drives(ctx, f1net, is_ff, ctx->id("DI"), false); ff1 = net_only_drives(ctx, f1net, is_ff, ctx->id("DI"), false);
if (ff1 != nullptr && (ff0 == nullptr || can_pack_ffs(ff0, ff1)) && if (ff1 != nullptr && (ff0 == nullptr || can_pack_ffs(ff0, ff1)) &&
can_add_ff_to_tile(tile_ffs, ff1)) { can_add_ff_to_tile(tile_ffs, ff1)) {
ff_packing.push_back(std::make_tuple(ff1, slice, 1)); ff_packing.push_back(std::make_tuple(ff1, slice, 1));
tile_ffs.push_back(ff1); tile_ffs.push_back(ff1);
packed_cells.insert(ff1->name); packed_cells.insert(ff1->name);