aboutsummaryrefslogtreecommitdiffstats
path: root/backends/aiger
diff options
context:
space:
mode:
authorEddie Hung <eddie@fpgeh.com>2020-01-14 16:32:46 -0800
committerEddie Hung <eddie@fpgeh.com>2020-01-14 16:32:46 -0800
commit48984a7605dc04463329263c3ada4ee2b42cbae7 (patch)
tree895950860fd69dc367a92bbf524406b3ff39fdfd /backends/aiger
parentf60e071e1c3ab64d1a45c4aea3580027b4242908 (diff)
parent1c41dc6b95c4c0261db96c15dd1b3cce8de6491f (diff)
downloadyosys-48984a7605dc04463329263c3ada4ee2b42cbae7.tar.gz
yosys-48984a7605dc04463329263c3ada4ee2b42cbae7.tar.bz2
yosys-48984a7605dc04463329263c3ada4ee2b42cbae7.zip
Merge remote-tracking branch 'origin/eddie/abc9_refactor' into eddie/abc9_required
Diffstat (limited to 'backends/aiger')
-rw-r--r--backends/aiger/xaiger.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/backends/aiger/xaiger.cc b/backends/aiger/xaiger.cc
index 268be432a..c2d076c86 100644
--- a/backends/aiger/xaiger.cc
+++ b/backends/aiger/xaiger.cc
@@ -226,6 +226,7 @@ struct XAigerWriter
}
if (inst_module) {
+ bool abc9_flop = inst_module->get_bool_attribute("\\abc9_flop");
auto it = cell->attributes.find("\\abc9_box_seq");
if (it != cell->attributes.end()) {
int abc9_box_seq = it->second.as_int();
@@ -234,7 +235,7 @@ struct XAigerWriter
box_list[abc9_box_seq] = cell;
// Only flop boxes may have arrival times
// (all others are combinatorial)
- if (!inst_module->get_bool_attribute("\\abc9_flop"))
+ if (!abc9_flop)
continue;
}
@@ -277,6 +278,9 @@ struct XAigerWriter
jt++;
}
}
+
+ if (abc9_flop)
+ continue;
}
}
@@ -616,7 +620,7 @@ struct XAigerWriter
// For flops only, create an extra 1-bit input that drives a new wire
// called "<cell>.abc9_ff.Q" that is used below
if (box_module->get_bool_attribute("\\abc9_flop"))
- box_inputs++;
+ box_inputs++;
std::get<0>(v) = box_inputs;
std::get<1>(v) = box_outputs;