mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-06-24 06:43:41 +00:00
Code Activity

Fixes

Browse source
This commit is contained in:
Alain Dargelas 2025-02-20 10:30:04 -08:00
parent 2e7e1d2e72
commit 767b498603
2 changed files with 40 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
passes/silimate/Makefile.inc
View file

@ -10,3 +10,4 @@ OBJS += passes/silimate/segv.o
OBJS += passes/silimate/selectconst.o OBJS += passes/silimate/selectconst.o
OBJS += passes/silimate/splitfanout.o OBJS += passes/silimate/splitfanout.o
OBJS += passes/silimate/splitnetlist.o OBJS += passes/silimate/splitnetlist.o
OBJS += passes/silimate/obs_clean.o

58
passes/silimate/obs_clean.cc
View file

@ -47,9 +47,6 @@ void lhs2rhs_rhs2lhs(RTLIL::Module *module, SigMap &sigmap, dict<RTLIL::SigSpec,
std::vector<SigSpec> rhsBits; std::vector<SigSpec> rhsBits;
for (int i = 0; i < rhs.size(); i++) { for (int i = 0; i < rhs.size(); i++) {
SigSpec bit_sig = rhs.extract(i, 1); SigSpec bit_sig = rhs.extract(i, 1);
if (bit_sig.is_fully_const()) {
continue;
}
rhsBits.push_back(bit_sig); rhsBits.push_back(bit_sig);
} }
@ -62,13 +59,11 @@ void lhs2rhs_rhs2lhs(RTLIL::Module *module, SigMap &sigmap, dict<RTLIL::SigSpec,
} }
} }
// Collect transitive fanin of a sig
void collectTransitiveFanin(RTLIL::SigSpec &sig, dict<RTLIL::SigSpec, std::set<Cell *>> &sig2CellsInFanin, void collectTransitiveFanin(RTLIL::SigSpec &sig, dict<RTLIL::SigSpec, std::set<Cell *>> &sig2CellsInFanin,
dict<RTLIL::SigSpec, RTLIL::SigSpec> &lhsSig2RhsSig, std::set<Cell *> &visitedCells, dict<RTLIL::SigSpec, RTLIL::SigSpec> &lhsSig2RhsSig, std::set<Cell *> &visitedCells,
std::set<RTLIL::SigSpec> &visitedSigSpec) std::set<RTLIL::SigSpec> &visitedSigSpec)
{ {
if (sig.is_fully_const()) {
return;
}
if (visitedSigSpec.count(sig)) { if (visitedSigSpec.count(sig)) {
return; return;
} }
@ -84,14 +79,10 @@ void collectTransitiveFanin(RTLIL::SigSpec &sig, dict<RTLIL::SigSpec, std::set<C
IdString portName = conn.first; IdString portName = conn.first;
RTLIL::SigSpec actual = conn.second; RTLIL::SigSpec actual = conn.second;
if (cell->input(portName)) { if (cell->input(portName)) {
if (!actual.is_chunk()) { collectTransitiveFanin(actual, sig2CellsInFanin, lhsSig2RhsSig, visitedCells, visitedSigSpec);
for (auto it = actual.chunks().rbegin(); it != actual.chunks().rend(); ++it) { for (int i = 0; i < actual.size(); i++) {
RTLIL::SigSpec sub_actual = *it; SigSpec bit_sig = actual.extract(i, 1);
collectTransitiveFanin(sub_actual, sig2CellsInFanin, lhsSig2RhsSig, visitedCells, collectTransitiveFanin(bit_sig, sig2CellsInFanin, lhsSig2RhsSig, visitedCells, visitedSigSpec);
visitedSigSpec);
}
} else {
collectTransitiveFanin(actual, sig2CellsInFanin, lhsSig2RhsSig, visitedCells, visitedSigSpec);
} }
} }
} }
@ -100,9 +91,14 @@ void collectTransitiveFanin(RTLIL::SigSpec &sig, dict<RTLIL::SigSpec, std::set<C
if (lhsSig2RhsSig.count(sig)) { if (lhsSig2RhsSig.count(sig)) {
RTLIL::SigSpec rhs = lhsSig2RhsSig[sig]; RTLIL::SigSpec rhs = lhsSig2RhsSig[sig];
collectTransitiveFanin(rhs, sig2CellsInFanin, lhsSig2RhsSig, visitedCells, visitedSigSpec); collectTransitiveFanin(rhs, sig2CellsInFanin, lhsSig2RhsSig, visitedCells, visitedSigSpec);
for (int i = 0; i < rhs.size(); i++) {
SigSpec bit_sig = rhs.extract(i, 1);
collectTransitiveFanin(bit_sig, sig2CellsInFanin, lhsSig2RhsSig, visitedCells, visitedSigSpec);
}
} }
} }
// Only keep the cells and wires that are visited using the transitive fanin reached from output ports
void observabilityClean(RTLIL::Module *module, dict<RTLIL::SigSpec, std::set<Cell *>> &sig2CellsInFanin, void observabilityClean(RTLIL::Module *module, dict<RTLIL::SigSpec, std::set<Cell *>> &sig2CellsInFanin,
dict<RTLIL::SigSpec, RTLIL::SigSpec> &lhsSig2RhsSig) dict<RTLIL::SigSpec, RTLIL::SigSpec> &lhsSig2RhsSig)
{ {
@ -118,6 +114,10 @@ void observabilityClean(RTLIL::Module *module, dict<RTLIL::SigSpec, std::set<Cel
continue; continue;
} }
collectTransitiveFanin(po, sig2CellsInFanin, lhsSig2RhsSig, visitedCells, visitedSigSpec); collectTransitiveFanin(po, sig2CellsInFanin, lhsSig2RhsSig, visitedCells, visitedSigSpec);
for (int i = 0; i < po.size(); i++) {
SigSpec bit_sig = po.extract(i, 1);
collectTransitiveFanin(bit_sig, sig2CellsInFanin, lhsSig2RhsSig, visitedCells, visitedSigSpec);
}
} }
for (auto elt : lhsSig2RhsSig) { for (auto elt : lhsSig2RhsSig) {
@ -127,6 +127,10 @@ void observabilityClean(RTLIL::Module *module, dict<RTLIL::SigSpec, std::set<Cel
continue; continue;
} }
collectTransitiveFanin(po, sig2CellsInFanin, lhsSig2RhsSig, visitedCells, visitedSigSpec); collectTransitiveFanin(po, sig2CellsInFanin, lhsSig2RhsSig, visitedCells, visitedSigSpec);
for (int i = 0; i < po.size(); i++) {
SigSpec bit_sig = po.extract(i, 1);
collectTransitiveFanin(bit_sig, sig2CellsInFanin, lhsSig2RhsSig, visitedCells, visitedSigSpec);
}
} }
pool<RTLIL::SigSig> newConnections; pool<RTLIL::SigSig> newConnections;
@ -134,7 +138,14 @@ void observabilityClean(RTLIL::Module *module, dict<RTLIL::SigSpec, std::set<Cel
RTLIL::SigSpec lhs = it->first; RTLIL::SigSpec lhs = it->first;
if (visitedSigSpec.count(lhs)) { if (visitedSigSpec.count(lhs)) {
newConnections.insert(*it); newConnections.insert(*it);
continue; } else {
for (int i = 0; i < lhs.size(); i++) {
SigSpec bit_sig = lhs.extract(i, 1);
if (visitedSigSpec.count(bit_sig)) {
newConnections.insert(*it);
break;
}
}
} }
} }
@ -149,13 +160,22 @@ void observabilityClean(RTLIL::Module *module, dict<RTLIL::SigSpec, std::set<Cel
if (visitedSigSpec.count(sig)) { if (visitedSigSpec.count(sig)) {
continue; continue;
} }
RTLIL::Wire *w = sig[0].wire; bool bitVisited = false;
if (w->port_id) { for (int i = 0; i < sig.size(); i++) {
SigSpec bit_sig = sig.extract(i, 1);
if (visitedSigSpec.count(bit_sig)) {
bitVisited = true;
break;
}
}
if (bitVisited)
continue;
if (wire->port_id) {
continue; continue;
} }
if (w->get_bool_attribute(ID::keep)) if (wire->get_bool_attribute(ID::keep))
continue; continue;
wiresToRemove.insert(w); wiresToRemove.insert(wire);
} }
module->remove(wiresToRemove); module->remove(wiresToRemove);