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

Merge pull request #1873 from boqwxp/cleanup_bugpoint 

Clean up private member usage in `passes/cmds/bugpoint.cc`.
This commit is contained in:
whitequark 2020-04-06 10:13:06 +00:00 committed by GitHub
parent d61a6b81fc fdeeb48e62
commit df69febb1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
passes/cmds/bugpoint.cc
View File

@ -114,8 +114,8 @@ struct BugpointPass : public Pass {
return design;
RTLIL::Design *design_copy = new RTLIL::Design;
for (auto &it : design->modules_)
design_copy->add(it.second->clone());
for (auto module : design->modules())
design_copy->add(module->clone());
Pass::call(design_copy, "proc_clean -quiet");
Pass::call(design_copy, "clean -purge");
@ -127,21 +127,21 @@ struct BugpointPass : public Pass {
RTLIL::Design *simplify_something(RTLIL::Design *design, int &seed, bool stage2, bool modules, bool ports, bool cells, bool connections, bool assigns, bool updates)
{
RTLIL::Design *design_copy = new RTLIL::Design;
for (auto &it : design->modules_)
design_copy->add(it.second->clone());
for (auto module : design->modules())
design_copy->add(module->clone());
int index = 0;
if (modules)
{
for (auto &it : design_copy->modules_)
for (auto module : design_copy->modules())
{
if (it.second->get_blackbox_attribute())
if (module->get_blackbox_attribute())
continue;
if (index++ == seed)
{
log("Trying to remove module %s.\n", it.first.c_str());
design_copy->remove(it.second);
log("Trying to remove module %s.\n", module->name.c_str());
design_copy->remove(module);
return design_copy;
}
}
@ -178,12 +178,12 @@ struct BugpointPass : public Pass {
if (mod->get_blackbox_attribute())
continue;
for (auto &it : mod->cells_)
for (auto cell : mod->cells())
{
if (index++ == seed)
{
log("Trying to remove cell %s.%s.\n", mod->name.c_str(), it.first.c_str());
mod->remove(it.second);
log("Trying to remove cell %s.%s.\n", mod->name.c_str(), cell->name.c_str());
mod->remove(cell);
return design_copy;
}
}
@ -285,7 +285,7 @@ struct BugpointPass : public Pass {
}
}
}
return NULL;
return nullptr;
}
void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE
@ -433,8 +433,8 @@ struct BugpointPass : public Pass {
{
Pass::call(design, "design -reset");
crashing_design = clean_design(crashing_design, clean, /*do_delete=*/true);
for (auto &it : crashing_design->modules_)
design->add(it.second->clone());
for (auto module : crashing_design->modules())
design->add(module->clone());
delete crashing_design;
}
}