Merge remote-tracking branch 'upstream/master' into sta_latest_0710
This commit is contained in:
commit
82ee5f6f7c
|
|
@ -686,7 +686,11 @@ GraphDelayCalc::findVertexDelay(Vertex *vertex,
|
||||||
debugPrint(debug_, "delay_calc", 2, "find delays {} ({})",
|
debugPrint(debug_, "delay_calc", 2, "find delays {} ({})",
|
||||||
vertex->to_string(this),
|
vertex->to_string(this),
|
||||||
network_->cellName(network_->instance(pin)));
|
network_->cellName(network_->instance(pin)));
|
||||||
if (vertex->isRoot())
|
if (vertex->isRoot()
|
||||||
|
// Bidirect port drivers are enqueued by their load vertex in
|
||||||
|
// annotateLoadDelays.
|
||||||
|
|| (vertex->isBidirectDriver()
|
||||||
|
&& network_->isTopLevelPort(pin)))
|
||||||
seedRootSlew(vertex, arc_delay_calc);
|
seedRootSlew(vertex, arc_delay_calc);
|
||||||
else {
|
else {
|
||||||
if (network_->isLeaf(pin)) {
|
if (network_->isLeaf(pin)) {
|
||||||
|
|
|
||||||
|
|
@ -96,6 +96,8 @@ EvalPred::searchThru(Edge *edge,
|
||||||
{
|
{
|
||||||
const TimingRole *role = edge->role();
|
const TimingRole *role = edge->role();
|
||||||
return SearchPred0::searchThru(edge, mode)
|
return SearchPred0::searchThru(edge, mode)
|
||||||
|
&& (sta_->variables()->dynamicLoopBreaking()
|
||||||
|
|| !edge->isDisabledLoop())
|
||||||
&& (search_thru_latches_
|
&& (search_thru_latches_
|
||||||
|| role->isLatchDtoQ()
|
|| role->isLatchDtoQ()
|
||||||
|| sta_->latches()->latchDtoQState(edge, mode) == LatchEnableState::open);
|
|| sta_->latches()->latchDtoQState(edge, mode) == LatchEnableState::open);
|
||||||
|
|
@ -2775,7 +2777,7 @@ Search::reportArrivals(Vertex *vertex,
|
||||||
for (const Path *path : paths) {
|
for (const Path *path : paths) {
|
||||||
const Tag *tag = path->tag(this);
|
const Tag *tag = path->tag(this);
|
||||||
const RiseFall *rf = tag->transition();
|
const RiseFall *rf = tag->transition();
|
||||||
bool report_prev = false;
|
bool report_prev = true;
|
||||||
std::string prev_str;
|
std::string prev_str;
|
||||||
if (report_prev) {
|
if (report_prev) {
|
||||||
Path *prev_path = path->prevPath();
|
Path *prev_path = path->prevPath();
|
||||||
|
|
@ -2796,7 +2798,8 @@ Search::reportArrivals(Vertex *vertex,
|
||||||
path->minMax(this)->to_string(),
|
path->minMax(this)->to_string(),
|
||||||
delayAsString(path->arrival(), digits, this),
|
delayAsString(path->arrival(), digits, this),
|
||||||
delayAsString(path->required(), digits, this),
|
delayAsString(path->required(), digits, this),
|
||||||
tag->to_string(report_tag_index, false, this), prev_str);
|
tag->to_string(report_tag_index, false, this),
|
||||||
|
prev_str);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue