stv0g/yosys
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Only count non-trivial attributes when findinf master signal in opt_clean

Browse source
This commit is contained in:
Clifford Wolf 2014-02-08 14:21:04 +01:00
parent 669a6e462d
commit 922d1c9520
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
passes/opt/opt_clean.cc
View file

@ -96,6 +96,14 @@ static void rmunused_module_cells(RTLIL::Module *module, bool verbose)
}
}
static int count_nontrivial_wire_attrs(RTLIL::Wire *w)
{
int count = w->attributes.size();
count -= w->attributes.count("\\src");
count -= w->attributes.count("\\unused_bits");
return count;
}
static bool compare_signals(RTLIL::SigSpec &s1, RTLIL::SigSpec &s2, SigPool &regs, SigPool &conns, std::set<RTLIL::Wire*> &direct_wires)
{
assert(s1.width == 1);
@ -127,8 +135,11 @@ static bool compare_signals(RTLIL::SigSpec &s1, RTLIL::SigSpec &s2, SigPool &reg
if (w1->name[0] != w2->name[0])
return w2->name[0] == '\\';
if (w1->attributes.size() != w2->attributes.size())
return w2->attributes.size() > w1->attributes.size();
int attrs1 = count_nontrivial_wire_attrs(w1);
int attrs2 = count_nontrivial_wire_attrs(w2);
if (attrs1 != attrs2)
return attrs2 > attrs1;
return w2->name < w1->name;
}