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

nexus: Fixes

Browse Source 
Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
David Shah 2020-01-11 19:49:37 +00:00
parent cef0e1db8f
commit 1ff42e9936
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nexus/fasm.cc
View File

@ -135,7 +135,7 @@ struct NexusFasmWriter
return; return;
std::string tile = tile_name(pip.tile, tile_by_type_and_loc(pip.tile, pd.tile_type)); std::string tile = tile_name(pip.tile, tile_by_type_and_loc(pip.tile, pd.tile_type));
std::string source_wire = escape_name(ctx->pip_src_wire_name(pip).str(ctx)); std::string source_wire = escape_name(ctx->pip_src_wire_name(pip).str(ctx));
std::string dest_wire = escape_name(ctx->pip_src_wire_name(pip).str(ctx)); std::string dest_wire = escape_name(ctx->pip_dst_wire_name(pip).str(ctx));
write_bit(stringf("%s.PIP.%s.%s", tile.c_str(), dest_wire.c_str(), source_wire.c_str())); write_bit(stringf("%s.PIP.%s.%s", tile.c_str(), dest_wire.c_str(), source_wire.c_str()));
} }
void write_net(const NetInfo *net) void write_net(const NetInfo *net)
@ -143,7 +143,8 @@ struct NexusFasmWriter
write_comment(stringf("Net %s", ctx->nameOf(net))); write_comment(stringf("Net %s", ctx->nameOf(net)));
std::set<PipId> sorted_pips; std::set<PipId> sorted_pips;
for (auto &w : net->wires) for (auto &w : net->wires)
sorted_pips.insert(w.second.pip); if (w.second.pip != PipId())
sorted_pips.insert(w.second.pip);
for (auto p : sorted_pips) for (auto p : sorted_pips)
write_pip(p); write_pip(p);
blank(); blank();
@ -157,11 +158,13 @@ struct NexusFasmWriter
push_tile(bel.tile, id_PLC); push_tile(bel.tile, id_PLC);
push(stringf("SLICE%c", slice)); push(stringf("SLICE%c", slice));
if (cell->params.count(id_INIT)) if (cell->params.count(id_INIT))
write_int_vector(stringf("K%d.INIT", k), int_or_default(cell->params, id_INIT, 0), 16); write_int_vector(stringf("K%d.INIT[15:0]", k), int_or_default(cell->params, id_INIT, 0), 16);
#if 0
if (cell->lutInfo.is_carry) { if (cell->lutInfo.is_carry) {
write_bit("MODE.CCU2"); write_bit("MODE.CCU2");
write_enum(cell, "INJECT", "NO"); write_enum(cell, "INJECT", "NO");
} }
#endif
pop(2); pop(2);
} }
void write_ff(const CellInfo *cell) void write_ff(const CellInfo *cell)