aboutsummaryrefslogtreecommitdiffstats
path: root/passes
diff options
context:
space:
mode:
authorEddie Hung <eddie@fpgeh.com>2020-02-13 09:54:40 -0800
committerEddie Hung <eddie@fpgeh.com>2020-02-27 10:17:29 -0800
commit7317521c6fa897c90328ac127cb0cf98de0bb7dd (patch)
tree84e1eab3520bae6f4757998975dff2582d76106c /passes
parentd2284715fa3399b9afe8609a1035e563393a21b0 (diff)
downloadyosys-7317521c6fa897c90328ac127cb0cf98de0bb7dd.tar.gz
yosys-7317521c6fa897c90328ac127cb0cf98de0bb7dd.tar.bz2
yosys-7317521c6fa897c90328ac127cb0cf98de0bb7dd.zip
abc9_ops: output LUT area
Diffstat (limited to 'passes')
-rw-r--r--passes/techmap/abc9_ops.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/passes/techmap/abc9_ops.cc b/passes/techmap/abc9_ops.cc
index c202d3d66..61a3880b7 100644
--- a/passes/techmap/abc9_ops.cc
+++ b/passes/techmap/abc9_ops.cc
@@ -586,7 +586,7 @@ void prep_delays(RTLIL::Design *design)
void prep_lut(RTLIL::Design *design, int maxlut)
{
- std::vector<std::tuple<int, IdString, std::vector<int>>> table;
+ std::vector<std::tuple<int, IdString, int, std::vector<int>>> table;
for (auto module : design->modules()) {
auto it = module->attributes.find(ID(abc9_lut));
if (it == module->attributes.end())
@@ -618,7 +618,7 @@ void prep_lut(RTLIL::Design *design, int maxlut)
if (maxlut && GetSize(specify) > maxlut)
continue;
// ABC requires ascending LUT input delays
- table.emplace_back(GetSize(specify), module->name, std::move(specify));
+ table.emplace_back(GetSize(specify), module->name, it->second.as_int(), std::move(specify));
}
// ABC requires ascending size
std::sort(table.begin(), table.end());
@@ -629,15 +629,15 @@ void prep_lut(RTLIL::Design *design, int maxlut)
// (as ABC requires) crop the first entry to do so
for (int i = 1; i < std::get<0>(first); i++) {
ss << "# $__ABC9_LUT" << i << std::endl;
- ss << i;
+ ss << i << " " << std::get<2>(first);
for (int j = 0; j < i; j++)
- ss << " " << std::get<2>(first)[j];
+ ss << " " << std::get<3>(first)[j];
ss << std::endl;
}
for (const auto &i : table) {
ss << "# " << log_id(std::get<1>(i)) << std::endl;
- ss << GetSize(std::get<2>(i));
- for (const auto &j : std::get<2>(i))
+ ss << std::get<0>(i) << " " << std::get<2>(i);
+ for (const auto &j : std::get<3>(i))
ss << " " << j;
ss << std::endl;
}