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

bugpoint: add -wires option.

This commit is contained in:
whitequark 2020-12-07 09:24:35 +00:00
parent 2b474a01e1
commit 1838edf35c
2 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/rtlil.cc
View File

@ -1826,7 +1826,7 @@ void RTLIL::Module::remove(const pool<RTLIL::Wire*> &wires)
sig.pack(); sig.pack();
for (auto &c : sig.chunks_) for (auto &c : sig.chunks_)
if (c.wire != NULL && wires_p->count(c.wire)) { if (c.wire != NULL && wires_p->count(c.wire)) {
c.wire = module->addWire(NEW_ID, c.width); c.wire = module->addWire(stringf("$delete_wire$%d", autoidx++), c.width);
c.offset = 0; c.offset = 0;
} }
} }

41
passes/cmds/bugpoint.cc
View File

@ -136,7 +136,7 @@ struct BugpointPass : public Pass {
return design_copy; return design_copy;
} }
RTLIL::Design *simplify_something(RTLIL::Design *design, int &seed, bool stage2, bool modules, bool ports, bool cells, bool connections, bool processes, bool assigns, bool updates) RTLIL::Design *simplify_something(RTLIL::Design *design, int &seed, bool stage2, bool modules, bool ports, bool cells, bool connections, bool processes, bool assigns, bool updates, bool wires)
{ {
RTLIL::Design *design_copy = new RTLIL::Design; RTLIL::Design *design_copy = new RTLIL::Design;
for (auto module : design->modules()) for (auto module : design->modules())
@ -343,6 +343,35 @@ struct BugpointPass : public Pass {
} }
} }
} }
if (wires)
{
for (auto mod : design_copy->modules())
{
if (mod->get_blackbox_attribute())
continue;
Wire *removed_wire = nullptr;
for (auto wire : mod->wires())
{
if (wire->get_bool_attribute(ID::bugpoint_keep))
continue;
if (wire->name.begins_with("$delete_wire"))
continue;
if (index++ == seed)
{
log_header(design, "Trying to remove wire %s.%s.\n", log_id(mod), log_id(wire));
removed_wire = wire;
break;
}
}
if (removed_wire) {
mod->remove({removed_wire});
return design_copy;
}
}
}
return nullptr; return nullptr;
} }
@ -350,7 +379,7 @@ struct BugpointPass : public Pass {
{ {
string yosys_cmd = "yosys", yosys_arg, grep; string yosys_cmd = "yosys", yosys_arg, grep;
bool fast = false, clean = false; bool fast = false, clean = false;
bool modules = false, ports = false, cells = false, connections = false, processes = false, assigns = false, updates = false, has_part = false; bool modules = false, ports = false, cells = false, connections = false, processes = false, assigns = false, updates = false, wires = false, has_part = false;
log_header(design, "Executing BUGPOINT pass (minimize testcases).\n"); log_header(design, "Executing BUGPOINT pass (minimize testcases).\n");
log_push(); log_push();
@ -421,6 +450,11 @@ struct BugpointPass : public Pass {
has_part = true; has_part = true;
continue; continue;
} }
if (args[argidx] == "-wires") {
wires = true;
has_part = true;
continue;
}
break; break;
} }
extra_args(args, argidx, design); extra_args(args, argidx, design);
@ -437,6 +471,7 @@ struct BugpointPass : public Pass {
processes = true; processes = true;
assigns = true; assigns = true;
updates = true; updates = true;
wires = true;
} }
if (!design->full_selection()) if (!design->full_selection())
@ -452,7 +487,7 @@ struct BugpointPass : public Pass {
bool found_something = false, stage2 = false; bool found_something = false, stage2 = false;
while (true) while (true)
{ {
if (RTLIL::Design *simplified = simplify_something(crashing_design, seed, stage2, modules, ports, cells, connections, processes, assigns, updates)) if (RTLIL::Design *simplified = simplify_something(crashing_design, seed, stage2, modules, ports, cells, connections, processes, assigns, updates, wires))
{ {
simplified = clean_design(simplified, fast, /*do_delete=*/true); simplified = clean_design(simplified, fast, /*do_delete=*/true);