mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-10-31 03:32:29 +00:00
Code Activity

Fix broken abc9.v test due to inout being 1'bx

Browse source
This commit is contained in:
Eddie Hung 2019-06-20 19:27:00 -07:00
parent eb09ea6d54
commit 9faeba7a66
2 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
backends/aiger/xaiger.cc
View file

@ -75,6 +75,7 @@ struct XAigerWriter
dict<SigBit, int> ordered_outputs; dict<SigBit, int> ordered_outputs;
vector<Cell*> box_list; vector<Cell*> box_list;
bool omode = false;
int mkgate(int a0, int a1) int mkgate(int a0, int a1)
{ {
@ -409,9 +410,9 @@ struct XAigerWriter
// If encountering an inout port, or a keep-ed wire, then create a new wire // If encountering an inout port, or a keep-ed wire, then create a new wire
// with $inout.out suffix, make it a PO driven by the existing inout, and // with $inout.out suffix, make it a PO driven by the existing inout, and
// inherit existing inout's drivers // inherit existing inout's drivers
if ((wire->port_input && wire->port_output && !undriven_bits.count(bit)) if ((wire->port_input && wire->port_output && output_bits.count(bit) && !undriven_bits.count(bit))
|| wire->attributes.count("\\keep")) { || wire->attributes.count("\\keep")) {
log_assert(input_bits.count(bit) && output_bits.count(bit)); log_assert(output_bits.count(bit));
RTLIL::IdString wire_name = wire->name.str() + "$inout.out"; RTLIL::IdString wire_name = wire->name.str() + "$inout.out";
RTLIL::Wire *new_wire = module->wire(wire_name); RTLIL::Wire *new_wire = module->wire(wire_name);
if (!new_wire) if (!new_wire)
@ -486,6 +487,12 @@ struct XAigerWriter
ordered_outputs[bit] = aig_o++; ordered_outputs[bit] = aig_o++;
aig_outputs.push_back(bit2aig(bit)); aig_outputs.push_back(bit2aig(bit));
} }
if (output_bits.empty()) {
aig_o++;
aig_outputs.push_back(0);
omode = true;
}
} }
void write_aiger(std::ostream &f, bool ascii_mode) void write_aiger(std::ostream &f, bool ascii_mode)
@ -741,6 +748,8 @@ struct XAigerWriter
for (auto &it : output_lines) for (auto &it : output_lines)
f << it.second; f << it.second;
log_assert(output_lines.size() == output_bits.size()); log_assert(output_lines.size() == output_bits.size());
if (omode && output_bits.empty())
f << "output " << output_lines.size() << " 0 $__dummy__\n";
wire_lines.sort(); wire_lines.sort();
for (auto &it : wire_lines) for (auto &it : wire_lines)

13
frontends/aiger/aigerparse.cc
View file

@ -839,6 +839,10 @@ void AigerReader::post_process()
RTLIL::Wire* wire = outputs[variable + co_count]; RTLIL::Wire* wire = outputs[variable + co_count];
log_assert(wire); log_assert(wire);
log_assert(wire->port_output); log_assert(wire->port_output);
if (escaped_s == "$__dummy__") {
wire->port_output = false;
continue;
}
if (index == 0) { if (index == 0) {
// Cope with the fact that a CO might be identical // Cope with the fact that a CO might be identical
@ -948,12 +952,15 @@ void AigerReader::post_process()
other_wire->port_input = false; other_wire->port_input = false;
other_wire->port_output = false; other_wire->port_output = false;
} }
if (wire->port_input && other_wire) if (wire->port_input) {
module->connect(other_wire, SigSpec(wire, i)); if (other_wire)
else module->connect(other_wire, SigSpec(wire, i));
}
else {
// Since we skip POs that are connected to Sx, // Since we skip POs that are connected to Sx,
// re-connect them here // re-connect them here
module->connect(SigSpec(wire, i), other_wire ? other_wire : SigSpec(RTLIL::Sx)); module->connect(SigSpec(wire, i), other_wire ? other_wire : SigSpec(RTLIL::Sx));
}
} }
} }