mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-13 04:28:18 +00:00
Code Activity

Merge pull request #1488 from whitequark/flowmap-fixes

Browse source 
flowmap: fix a few crashes
This commit is contained in:
whitequark 2019-11-13 11:57:17 +00:00 committed by GitHub
parent 6e332161db c68722818a
commit ab0fb19cff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
passes/techmap/flowmap.cc
View file

@ -394,7 +394,7 @@ struct FlowGraph
pair<pool<RTLIL::SigBit>, pool<RTLIL::SigBit>> edge_cut() pair<pool<RTLIL::SigBit>, pool<RTLIL::SigBit>> edge_cut()
{ {
pool<RTLIL::SigBit> x, xi; pool<RTLIL::SigBit> x = {source}, xi; // X and X̅ in the paper
NodePrime source_prime = {source, true}; NodePrime source_prime = {source, true};
pool<NodePrime> visited; pool<NodePrime> visited;
@ -437,6 +437,7 @@ struct FlowGraph
for (auto collapsed_node : collapsed[sink]) for (auto collapsed_node : collapsed[sink])
xi.insert(collapsed_node); xi.insert(collapsed_node);
log_assert(x[source] && !xi[source]);
log_assert(!x[sink] && xi[sink]); log_assert(!x[sink] && xi[sink]);
return {x, xi}; return {x, xi};
} }
@ -1050,7 +1051,7 @@ struct FlowmapWorker
auto cut_inputs = cut_lut_at_gate(lut, lut_gate); auto cut_inputs = cut_lut_at_gate(lut, lut_gate);
pool<RTLIL::SigBit> gate_inputs = cut_inputs.first, other_inputs = cut_inputs.second; pool<RTLIL::SigBit> gate_inputs = cut_inputs.first, other_inputs = cut_inputs.second;
if (gate_inputs.empty() && (int)other_inputs.size() == order) if (gate_inputs.empty() && (int)other_inputs.size() >= order)
{ {
if (debug_relax) if (debug_relax)
log(" Breaking would result in a (k+1)-LUT.\n"); log(" Breaking would result in a (k+1)-LUT.\n");