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

updated to use get_src_attribute() and set_src_attribute().

This commit is contained in:
Jason Lowdermilk 2017-08-31 14:51:56 -06:00
parent 71d43cfc08
commit 8dc6083de7
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
passes/techmap/alumacc.cc
View File

@ -352,13 +352,12 @@ struct AlumaccWorker
{ {
auto n = it.second; auto n = it.second;
auto cell = module->addCell(NEW_ID, "$macc"); auto cell = module->addCell(NEW_ID, "$macc");
auto src = n->cell->attributes["\\src"].decode_string();
macc_counter++; macc_counter++;
log(" creating $macc cell for %s: %s\n", log_id(n->cell), log_id(cell)); log(" creating $macc cell for %s: %s\n", log_id(n->cell), log_id(cell));
if (!src.empty()) cell->attributes["\\src"] = src; cell->set_src_attribute(n->cell->get_src_attribute());
n->macc.optimize(GetSize(n->y)); n->macc.optimize(GetSize(n->y));
n->macc.to_cell(cell); n->macc.to_cell(cell);
@ -480,8 +479,8 @@ struct AlumaccWorker
log("%s%s", i ? ", ": "", log_id(n->cells[i])); log("%s%s", i ? ", ": "", log_id(n->cells[i]));
log(": %s\n", log_id(n->alu_cell)); log(": %s\n", log_id(n->alu_cell));
src = n->cells.size() > 0 ? n->cells[0]->attributes["\\src"].decode_string() : ""; if (n->cells.size() > 0)
if (!src.empty()) n->alu_cell->attributes["\\src"] = src; n->alu_cell->set_src_attribute(n->cells[0]->get_src_attribute());
n->alu_cell->setPort("\\A", n->a); n->alu_cell->setPort("\\A", n->a);
n->alu_cell->setPort("\\B", n->b); n->alu_cell->setPort("\\B", n->b);

4
passes/techmap/dfflibmap.cc
View File

@ -478,14 +478,14 @@ static void dfflibmap(RTLIL::Design *design, RTLIL::Module *module, bool prepare
auto cell_type = cell->type; auto cell_type = cell->type;
auto cell_name = cell->name; auto cell_name = cell->name;
auto cell_connections = cell->connections(); auto cell_connections = cell->connections();
std::string src = cell->attributes["\\src"].decode_string(); std::string src = cell->get_src_attribute();
module->remove(cell); module->remove(cell);
cell_mapping &cm = cell_mappings[cell_type]; cell_mapping &cm = cell_mappings[cell_type];
RTLIL::Cell *new_cell = module->addCell(cell_name, prepare_mode ? cm.cell_name : "\\" + cm.cell_name); RTLIL::Cell *new_cell = module->addCell(cell_name, prepare_mode ? cm.cell_name : "\\" + cm.cell_name);
if (!src.empty()) new_cell->attributes["\\src"] = src; new_cell->set_src_attribute(src);
bool has_q = false, has_qn = false; bool has_q = false, has_qn = false;
for (auto &port : cm.ports) { for (auto &port : cm.ports) {

6
passes/techmap/techmap.cc
View File

@ -172,7 +172,6 @@ struct TechmapWorker
std::string orig_cell_name; std::string orig_cell_name;
pool<string> extra_src_attrs; pool<string> extra_src_attrs;
std::string src = cell->attributes["\\src"].decode_string();
if (!flatten_mode) if (!flatten_mode)
{ {
@ -341,7 +340,7 @@ struct TechmapWorker
RTLIL::Cell *c = module->addCell(c_name, it.second); RTLIL::Cell *c = module->addCell(c_name, it.second);
design->select(module, c); design->select(module, c);
if (!src.empty()) c->attributes["\\src"] = src; c->set_src_attribute(cell->get_src_attribute());
if (!flatten_mode && c->type.substr(0, 2) == "\\$") if (!flatten_mode && c->type.substr(0, 2) == "\\$")
c->type = c->type.substr(1); c->type = c->type.substr(1);
@ -467,7 +466,6 @@ struct TechmapWorker
log_assert(cell == module->cell(cell->name)); log_assert(cell == module->cell(cell->name));
bool mapped_cell = false; bool mapped_cell = false;
std::string src = cell->attributes["\\src"].decode_string();
std::string cell_type = cell->type.str(); std::string cell_type = cell->type.str();
if (in_recursion && cell_type.substr(0, 2) == "\\$") if (in_recursion && cell_type.substr(0, 2) == "\\$")
@ -517,7 +515,7 @@ struct TechmapWorker
extmapper_module = extmapper_design->addModule(m_name); extmapper_module = extmapper_design->addModule(m_name);
RTLIL::Cell *extmapper_cell = extmapper_module->addCell(cell->type, cell); RTLIL::Cell *extmapper_cell = extmapper_module->addCell(cell->type, cell);
if (!src.empty()) extmapper_cell->attributes["\\src"] = src; extmapper_cell->set_src_attribute(cell->get_src_attribute());
int port_counter = 1; int port_counter = 1;
for (auto &c : extmapper_cell->connections_) { for (auto &c : extmapper_cell->connections_) {