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

Add a couple more tests

This commit is contained in:
Eddie Hung 2019-06-12 15:43:43 -07:00
parent 8bb67fa67c
commit 2e7b3eee40
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
backends/aiger/xaiger.cc
View File

@ -142,14 +142,6 @@ struct XAigerWriter
SigBit wirebit(wire, i); SigBit wirebit(wire, i);
SigBit bit = sigmap(wirebit); SigBit bit = sigmap(wirebit);
if (bit.wire == nullptr) {
if (wire->port_output) {
aig_map[wirebit] = (bit == State::S1) ? 1 : 0;
output_bits.insert(wirebit);
}
continue;
}
undriven_bits.insert(bit); undriven_bits.insert(bit);
unused_bits.insert(bit); unused_bits.insert(bit);
@ -160,8 +152,10 @@ struct XAigerWriter
} }
if (wire->port_output || keep) { if (wire->port_output || keep) {
if (bit != wirebit) if (bit != wirebit) {
alias_map[wirebit] = bit; alias_map[wirebit] = bit;
undriven_bits.insert(wirebit);
}
output_bits.insert(wirebit); output_bits.insert(wirebit);
} }
} }
@ -169,7 +163,6 @@ struct XAigerWriter
for (auto bit : input_bits) for (auto bit : input_bits)
undriven_bits.erase(sigmap(bit)); undriven_bits.erase(sigmap(bit));
for (auto bit : output_bits) for (auto bit : output_bits)
if (!bit.wire->port_input) if (!bit.wire->port_input)
unused_bits.erase(bit); unused_bits.erase(bit);
@ -178,8 +171,7 @@ struct XAigerWriter
TopoSort<IdString, RTLIL::sort_by_id_str> toposort; TopoSort<IdString, RTLIL::sort_by_id_str> toposort;
bool abc_box_seen = false; bool abc_box_seen = false;
for (auto cell : module->cells()) for (auto cell : module->cells()) {
{
RTLIL::Module* inst_module = module->design->module(cell->type); RTLIL::Module* inst_module = module->design->module(cell->type);
bool builtin_type = yosys_celltypes.cell_known(cell->type); bool builtin_type = yosys_celltypes.cell_known(cell->type);
bool abc_type = inst_module && inst_module->attributes.count("\\abc_box_id"); bool abc_type = inst_module && inst_module->attributes.count("\\abc_box_id");
@ -296,14 +288,15 @@ struct XAigerWriter
else { else {
for (const auto &c : cell->connections()) { for (const auto &c : cell->connections()) {
if (c.second.is_fully_const()) continue; if (c.second.is_fully_const()) continue;
for (auto b : c.second.bits()) { auto is_input = cell->input(c.first);
Wire *w = b.wire; auto is_output = cell->output(c.first);
if (!w) continue; log_assert(is_input || is_output);
auto is_input = cell->input(c.first);
auto is_output = cell->output(c.first); if (is_input) {
log_assert(is_input || is_output); for (auto b : c.second.bits()) {
if (is_input) { Wire *w = b.wire;
if (!w->port_input) { if (!w) continue;
if (!w->port_output) {
SigBit I = sigmap(b); SigBit I = sigmap(b);
if (I != b) if (I != b)
alias_map[b] = I; alias_map[b] = I;
@ -311,7 +304,11 @@ struct XAigerWriter
unused_bits.erase(b); unused_bits.erase(b);
} }
} }
if (is_output) { }
if (is_output) {
for (auto b : c.second.bits()) {
Wire *w = b.wire;
if (!w) continue;
input_bits.insert(b); input_bits.insert(b);
SigBit O = sigmap(b); SigBit O = sigmap(b);
if (O != b) if (O != b)

12
tests/simple_abc9/abc9.v
View File

@ -250,3 +250,15 @@ module abc9_test023 #(
wire [2*M-1:0] mask = {M{1'b1}}; wire [2*M-1:0] mask = {M{1'b1}};
assign dout = (mask << din[N-1:0]) >> M; assign dout = (mask << din[N-1:0]) >> M;
endmodule endmodule
module abc9_test024(input [3:0] i, output [3:0] o);
abc9_test024_sub a(i[1:0], o[1:0]);
endmodule
module abc9_test024_sub(input [1:0] i, output [1:0] o);
assign o = i;
endmodule
module abc9_test025(input [3:0] i, output [3:0] o);
abc9_test024_sub a(i[2:1], o[2:1]);
endmodule