mirror of https://github.com/YosysHQ/yosys.git
proc_clean: remove any empty cases if all cases use all-def compare.
This commit is contained in:
parent
b784440857
commit
18291c20d2
|
@ -3793,6 +3793,11 @@ RTLIL::CaseRule::~CaseRule()
|
|||
delete *it;
|
||||
}
|
||||
|
||||
bool RTLIL::CaseRule::empty() const
|
||||
{
|
||||
return actions.empty() && switches.empty();
|
||||
}
|
||||
|
||||
RTLIL::CaseRule *RTLIL::CaseRule::clone() const
|
||||
{
|
||||
RTLIL::CaseRule *new_caserule = new RTLIL::CaseRule;
|
||||
|
@ -3809,6 +3814,11 @@ RTLIL::SwitchRule::~SwitchRule()
|
|||
delete *it;
|
||||
}
|
||||
|
||||
bool RTLIL::SwitchRule::empty() const
|
||||
{
|
||||
return cases.empty();
|
||||
}
|
||||
|
||||
RTLIL::SwitchRule *RTLIL::SwitchRule::clone() const
|
||||
{
|
||||
RTLIL::SwitchRule *new_switchrule = new RTLIL::SwitchRule;
|
||||
|
|
|
@ -1227,6 +1227,8 @@ struct RTLIL::CaseRule
|
|||
~CaseRule();
|
||||
void optimize();
|
||||
|
||||
bool empty() const;
|
||||
|
||||
template<typename T> void rewrite_sigspecs(T &functor);
|
||||
RTLIL::CaseRule *clone() const;
|
||||
};
|
||||
|
@ -1238,6 +1240,8 @@ struct RTLIL::SwitchRule : public RTLIL::AttrObject
|
|||
|
||||
~SwitchRule();
|
||||
|
||||
bool empty() const;
|
||||
|
||||
template<typename T> void rewrite_sigspecs(T &functor);
|
||||
RTLIL::SwitchRule *clone() const;
|
||||
};
|
||||
|
|
|
@ -77,14 +77,36 @@ void proc_clean_switch(RTLIL::SwitchRule *sw, RTLIL::CaseRule *parent, bool &did
|
|||
}
|
||||
else
|
||||
{
|
||||
for (auto cs : sw->cases) {
|
||||
bool all_fully_def = true;
|
||||
for (auto cs : sw->cases)
|
||||
{
|
||||
if (max_depth != 0)
|
||||
proc_clean_case(cs, did_something, count, max_depth-1);
|
||||
for (auto cmp : cs->compare)
|
||||
if (!cmp.is_fully_def())
|
||||
all_fully_def = false;
|
||||
}
|
||||
while (!sw->cases.empty() && (sw->cases.back()->actions.empty() && sw->cases.back()->switches.empty())) {
|
||||
did_something = true;
|
||||
delete sw->cases.back();
|
||||
sw->cases.pop_back();
|
||||
if (all_fully_def)
|
||||
{
|
||||
for (auto cs = sw->cases.begin(); cs != sw->cases.end();)
|
||||
{
|
||||
if ((*cs)->empty())
|
||||
{
|
||||
did_something = true;
|
||||
delete *cs;
|
||||
cs = sw->cases.erase(cs);
|
||||
}
|
||||
else ++cs;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
while (!sw->cases.empty() && sw->cases.back()->empty())
|
||||
{
|
||||
did_something = true;
|
||||
delete sw->cases.back();
|
||||
sw->cases.pop_back();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -102,7 +124,7 @@ void proc_clean_case(RTLIL::CaseRule *cs, bool &did_something, int &count, int m
|
|||
}
|
||||
for (size_t i = 0; i < cs->switches.size(); i++) {
|
||||
RTLIL::SwitchRule *sw = cs->switches[i];
|
||||
if (sw->cases.size() == 0) {
|
||||
if (sw->empty()) {
|
||||
cs->switches.erase(cs->switches.begin() + (i--));
|
||||
did_something = true;
|
||||
delete sw;
|
||||
|
|
Loading…
Reference in New Issue