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

solves #675

This commit is contained in:
rafaeltp 2018-10-20 17:50:21 -07:00
parent f25d0de6f8
commit 0ad4321781
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/rtlil.h
View File

@ -1304,6 +1304,10 @@ inline const RTLIL::SigBit &RTLIL::SigSpecConstIterator::operator*() const {
} }
inline RTLIL::SigBit::SigBit(const RTLIL::SigSpec &sig) { inline RTLIL::SigBit::SigBit(const RTLIL::SigSpec &sig) {
if(sig.size() != 1 || sig.chunks().size() != 1) {
std::cout << "rtp " << sig.size() << std::endl;
std::cout << "rtp " << sig.chunks().size() << std::endl;
}
log_assert(sig.size() == 1 && sig.chunks().size() == 1); log_assert(sig.size() == 1 && sig.chunks().size() == 1);
*this = SigBit(sig.chunks().front()); *this = SigBit(sig.chunks().front());
} }

28
passes/equiv/equiv_make.cc
View File

@ -290,22 +290,28 @@ struct EquivMakeWorker
init_bit2driven(); init_bit2driven();
pool<Cell*> visited_cells; pool<Cell*> visited_cells;
for (auto c : cells_list) for (auto c : cells_list)
for (auto &conn : c->connections()) for (auto &conn : c->connections())
if (!ct.cell_output(c->type, conn.first)) { if (!ct.cell_output(c->type, conn.first)) {
SigSpec old_sig = assign_map(conn.second); SigSpec old_sig = assign_map(conn.second);
SigSpec new_sig = rd_signal_map(old_sig); SigSpec new_sig = rd_signal_map(old_sig);
visited_cells.clear();
if (old_sig != new_sig) {
if (check_signal_in_fanout(visited_cells, old_sig, new_sig))
continue;
log("Changing input %s of cell %s (%s): %s -> %s\n", if(old_sig != new_sig) {
log_id(conn.first), log_id(c), log_id(c->type), for(auto & old_bit : old_sig.bits()) {
log_signal(old_sig), log_signal(new_sig)); SigBit new_bit = new_sig.bits()[old_bit.offset];
c->setPort(conn.first, new_sig);
visited_cells.clear();
if (old_bit != new_bit) {
if (check_signal_in_fanout(visited_cells, old_bit, new_bit))
continue;
log("Changing input %s of cell %s (%s): %s -> %s\n",
log_id(conn.first), log_id(c), log_id(c->type),
log_signal(old_bit), log_signal(new_bit));
c->setPort(conn.first, new_bit);
}
}
} }
} }
@ -412,7 +418,7 @@ struct EquivMakeWorker
} }
} }
bool check_signal_in_fanout(pool<Cell*> & visited_cells, SigBit source_bit, SigBit target_bit) bool check_signal_in_fanout(pool<Cell*> & visited_cells, SigSpec source_bit, SigSpec target_bit)
{ {
if (source_bit == target_bit) if (source_bit == target_bit)
return true; return true;