luke
/
OpenSTA
mirror of https://github.com/The-OpenROAD-Project/OpenSTA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

exceptions don't merge when comments differ

This commit is contained in:
James Cherry 2019-11-25 13:48:53 -07:00
parent 7ef710054b
commit 74672531d1
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sdc/ExceptionPath.cc
View File

@ -313,6 +313,12 @@ ExceptionPath::hash(ExceptionPt *missing_pt) const
return hash;
}
bool
ExceptionPath::mergeable(ExceptionPath *exception) const
{
return stringEqualIf(comment_, exception->comment());
}
bool
ExceptionPath::mergeablePts(ExceptionPath *exception) const
{
@ -598,7 +604,8 @@ PathDelay::typeString() const
bool
PathDelay::mergeable(ExceptionPath *exception) const
{
return overrides(exception)
return ExceptionPath::mergeable(exception)
&& overrides(exception)
&& exception->ignoreClkLatency() == ignore_clk_latency_
&& exception->delay() == delay_;
}
@ -666,15 +673,15 @@ FalsePath::typeString() const
bool
FalsePath::mergeable(ExceptionPath *exception) const
{
return exception->isFalse()
&& exception->priority() == priority()
&& exception->minMax() == min_max_;
return ExceptionPath::mergeable(exception)
&& overrides(exception);
}
bool
FalsePath::overrides(ExceptionPath *exception) const
{
return mergeable(exception);
return exception->priority() == priority()
&& exception->minMax() == min_max_;
}
////////////////////////////////////////////////////////////////
@ -790,7 +797,8 @@ MultiCyclePath::typeString() const
bool
MultiCyclePath::mergeable(ExceptionPath *exception) const
{
return overrides(exception)
return ExceptionPath::mergeable(exception)
&& overrides(exception)
&& exception->pathMultiplier() == path_multiplier_;
}
@ -917,15 +925,16 @@ GroupPath::tighterThan(ExceptionPath *) const
bool
GroupPath::mergeable(ExceptionPath *exception) const
{
return exception->isGroupPath()
&& is_default_ == exception->isDefault()
&& (name_ && exception->name() && stringEq(name_, exception->name()));
return ExceptionPath::mergeable(exception)
&& overrides(exception);
}
bool
GroupPath::overrides(ExceptionPath *exception) const
{
return mergeable(exception);
return exception->isGroupPath()
&& is_default_ == exception->isDefault()
&& stringEqIf(name_, exception->name());
}
////////////////////////////////////////////////////////////////

2
sdc/ExceptionPath.hh
View File

@ -98,7 +98,7 @@ public:
size_t hash() const;
size_t hash(ExceptionPt *missing_pt) const;
// Mergeable properties (independent of exception points).
virtual bool mergeable(ExceptionPath *exception) const = 0;
virtual bool mergeable(ExceptionPath *exception) const;
bool mergeablePts(ExceptionPath *exception) const;
bool mergeablePts(ExceptionPath *exception2,
ExceptionPt *missing_pt2,