diff options
| author | Clifford Wolf <clifford@clifford.at> | 2015-12-22 11:15:25 +0100 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2015-12-22 11:15:25 +0100 |
| commit | ec93d258a4c1009cdbc2c67e44956b3b9dcd0841 (patch) | |
| tree | ff08820f21b880b06bf906def163299c5af88b3d /techlibs/ice40 | |
| parent | f1b959dc69ce691adb0e5a57236e062a21585e64 (diff) | |
| download | yosys-ec93d258a4c1009cdbc2c67e44956b3b9dcd0841.tar.gz yosys-ec93d258a4c1009cdbc2c67e44956b3b9dcd0841.tar.bz2 yosys-ec93d258a4c1009cdbc2c67e44956b3b9dcd0841.zip | |
Improved ice40_ffinit
Diffstat (limited to 'techlibs/ice40')
| -rw-r--r-- | techlibs/ice40/ice40_ffinit.cc | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/techlibs/ice40/ice40_ffinit.cc b/techlibs/ice40/ice40_ffinit.cc index 50400be80..c77ddc5f1 100644 --- a/techlibs/ice40/ice40_ffinit.cc +++ b/techlibs/ice40/ice40_ffinit.cc @@ -86,9 +86,15 @@ struct Ice40FfinitPass : public Pass { } } + pool<IdString> sb_dff_types = { + "\\SB_DFF", "\\SB_DFFE", "\\SB_DFFSR", "\\SB_DFFR", "\\SB_DFFSS", "\\SB_DFFS", "\\SB_DFFESR", + "\\SB_DFFER", "\\SB_DFFESS", "\\SB_DFFES", "\\SB_DFFN", "\\SB_DFFNE", "\\SB_DFFNSR", "\\SB_DFFNR", + "\\SB_DFFNSS", "\\SB_DFFNS", "\\SB_DFFNESR", "\\SB_DFFNER", "\\SB_DFFNESS", "\\SB_DFFNES" + }; + for (auto cell : module->selected_cells()) { - if (!cell->type.in("\\SB_DFF", "\\SB_DFFE", "\\SB_DFFN", "\\SB_DFFNE")) + if (!sb_dff_types.count(cell->type)) continue; SigBit sig_d = sigmap(cell->getPort("\\D")); @@ -106,6 +112,21 @@ struct Ice40FfinitPass : public Pass { if (val == State::S0) continue; + string type_str = cell->type.str(); + + if (type_str.back() == 'S') { + type_str.back() = 'R'; + cell->type = type_str; + cell->setPort("\\R", cell->getPort("\\S")); + cell->unsetPort("\\S"); + } else + if (type_str.back() == 'R') { + type_str.back() = 'S'; + cell->type = type_str; + cell->setPort("\\S", cell->getPort("\\R")); + cell->unsetPort("\\R"); + } + Wire *new_sig_d = module->addWire(NEW_ID); Wire *new_sig_q = module->addWire(NEW_ID); |