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

Merge pull request #2205 from whitequark/fix-2204 

techmap: don't drop attributes on replaced cells
This commit is contained in:
whitequark 2020-06-30 00:08:08 +00:00 committed by GitHub
parent 4160acc0b1 a97c13f0ca
commit f7fdd99e45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
passes/techmap/techmap.cc
View File

@ -328,8 +328,9 @@ struct TechmapWorker
for (auto tpl_cell : tpl->cells()) for (auto tpl_cell : tpl->cells())
{ {
IdString c_name = tpl_cell->name; IdString c_name = tpl_cell->name;
bool techmap_replace_cell = (c_name == ID::_TECHMAP_REPLACE_);
if (c_name == ID::_TECHMAP_REPLACE_) if (techmap_replace_cell)
c_name = orig_cell_name; c_name = orig_cell_name;
else if (tpl_cell->name.begins_with("\\_TECHMAP_REPLACE_.")) else if (tpl_cell->name.begins_with("\\_TECHMAP_REPLACE_."))
c_name = stringf("%s%s", orig_cell_name.c_str(), c_name.c_str() + strlen("\\_TECHMAP_REPLACE_")); c_name = stringf("%s%s", orig_cell_name.c_str(), c_name.c_str() + strlen("\\_TECHMAP_REPLACE_"));
@ -384,7 +385,7 @@ struct TechmapWorker
if (c->attributes.count(ID::src)) if (c->attributes.count(ID::src))
c->add_strpool_attribute(ID::src, extra_src_attrs); c->add_strpool_attribute(ID::src, extra_src_attrs);
if (c_name == ID::_TECHMAP_REPLACE_) if (techmap_replace_cell)
for (auto attr : cell->attributes) for (auto attr : cell->attributes)
if (!c->attributes.count(attr.first)) if (!c->attributes.count(attr.first))
c->attributes[attr.first] = attr.second; c->attributes[attr.first] = attr.second;