riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #735 from daveshah1/trifixes 

deminout fixes
This commit is contained in:
Clifford Wolf 2018-12-16 16:02:21 +01:00 committed by GitHub
parent 1e1452c7ff 4c59447168
commit 0d9c850a07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
passes/techmap/deminout.cc
View File

@ -83,9 +83,9 @@ struct DeminoutPass : public Pass {
for (auto bit : sigmap(conn.second)) for (auto bit : sigmap(conn.second))
bits_used.insert(bit); bits_used.insert(bit);
if (conn.first == "\\Y" && cell->type.in("$mux", "$pmux", "$_MUX_", "$_TBUF_")) if (conn.first == "\\Y" && cell->type.in("$mux", "$pmux", "$_MUX_", "$_TBUF_", "$tribuf"))
{ {
bool tribuf = (cell->type == "$_TBUF_"); bool tribuf = (cell->type == "$_TBUF_" || cell->type == "$tribuf");
if (!tribuf) { if (!tribuf) {
for (auto &c : cell->connections()) { for (auto &c : cell->connections()) {
@ -113,7 +113,8 @@ struct DeminoutPass : public Pass {
{ {
if (bits_numports[bit] > 1 || bits_inout.count(bit)) if (bits_numports[bit] > 1 || bits_inout.count(bit))
new_input = true, new_output = true; new_input = true, new_output = true;
if (bit == State::S0 || bit == State::S1)
new_output = true;
if (bits_written.count(bit)) { if (bits_written.count(bit)) {
new_output = true; new_output = true;
if (bits_tribuf.count(bit)) if (bits_tribuf.count(bit))