diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-12-09 17:38:48 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-09 17:38:48 -0800 |
| commit | 7e5602ad17b20f14e56fc4c64198ca2d576917df (patch) | |
| tree | 5127cc0a4159e23f2e8fcdabcea4b792062ea09f /techlibs/ice40/ice40_opt.cc | |
| parent | ecb0c68f0751b3bd97f8da94e7bd2258987d58e1 (diff) | |
| parent | fb203d2a2c02c3df1a2c6a92ec196e579495c8d4 (diff) | |
| download | yosys-7e5602ad17b20f14e56fc4c64198ca2d576917df.tar.gz yosys-7e5602ad17b20f14e56fc4c64198ca2d576917df.tar.bz2 yosys-7e5602ad17b20f14e56fc4c64198ca2d576917df.zip | |
Merge pull request #1545 from YosysHQ/eddie/ice40_wrapcarry_attr
Preserve SB_CARRY name and attributes when using $__ICE40_CARRY_WRAPPER
Diffstat (limited to 'techlibs/ice40/ice40_opt.cc')
| -rw-r--r-- | techlibs/ice40/ice40_opt.cc | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/techlibs/ice40/ice40_opt.cc b/techlibs/ice40/ice40_opt.cc index ea56d3f4d..371ceb623 100644 --- a/techlibs/ice40/ice40_opt.cc +++ b/techlibs/ice40/ice40_opt.cc @@ -41,6 +41,11 @@ static void run_ice40_opts(Module *module) for (auto cell : module->selected_cells()) { + if (!cell->type.in("\\SB_LUT4", "\\SB_CARRY", "$__ICE40_CARRY_WRAPPER")) + continue; + if (cell->has_keep_attr()) + continue; + if (cell->type == "\\SB_LUT4") { sb_lut_cells.push_back(cell); @@ -112,6 +117,21 @@ static void run_ice40_opts(Module *module) if (GetSize(replacement_output)) { optimized_co.insert(sigmap(cell->getPort("\\CO")[0])); + auto it = cell->attributes.find(ID(SB_LUT4.name)); + if (it != cell->attributes.end()) { + module->rename(cell, it->second.decode_string()); + decltype(Cell::attributes) new_attr; + for (const auto &a : cell->attributes) + if (a.first.begins_with("\\SB_LUT4.\\")) + new_attr[a.first.c_str() + strlen("\\SB_LUT4.")] = a.second; + else if (a.first == ID(src)) + new_attr.insert(std::make_pair(a.first, a.second)); + else if (a.first.in(ID(SB_LUT4.name), ID::keep, ID(module_not_derived))) + continue; + else + log_abort(); + cell->attributes = std::move(new_attr); + } module->connect(cell->getPort("\\CO")[0], replacement_output); module->design->scratchpad_set_bool("opt.did_something", true); log("Optimized $__ICE40_CARRY_WRAPPER cell back to logic (without SB_CARRY) %s.%s: CO=%s\n", |