diff options
Diffstat (limited to 'src/map/mapper/mapperTime.c')
-rw-r--r-- | src/map/mapper/mapperTime.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/map/mapper/mapperTime.c b/src/map/mapper/mapperTime.c index 45de8309..ce909e24 100644 --- a/src/map/mapper/mapperTime.c +++ b/src/map/mapper/mapperTime.c @@ -100,9 +100,10 @@ float Map_TimeCutComputeArrival( Map_Node_t * pNode, Map_Cut_t * pCut, int fPhas Map_Time_t * ptArrRes = &pM->tArrive; Map_Time_t * ptArrIn; int fPinPhase; - float tDelay; + float tDelay, tExtra; int i; + tExtra = pNode->p->pNodeDelays ? pNode->p->pNodeDelays[pNode->Num] : 0; ptArrRes->Rise = ptArrRes->Fall = 0.0; ptArrRes->Worst = MAP_FLOAT_LARGE; for ( i = pCut->nLeaves - 1; i >= 0; i-- ) @@ -114,7 +115,7 @@ float Map_TimeCutComputeArrival( Map_Node_t * pNode, Map_Cut_t * pCut, int fPhas // get the rise of the output due to rise of the inputs if ( pSuper->tDelaysR[i].Rise > 0 ) { - tDelay = ptArrIn->Rise + pSuper->tDelaysR[i].Rise; + tDelay = ptArrIn->Rise + pSuper->tDelaysR[i].Rise + tExtra; if ( tDelay > tWorstLimit ) return MAP_FLOAT_LARGE; if ( ptArrRes->Rise < tDelay ) @@ -124,7 +125,7 @@ float Map_TimeCutComputeArrival( Map_Node_t * pNode, Map_Cut_t * pCut, int fPhas // get the rise of the output due to fall of the inputs if ( pSuper->tDelaysR[i].Fall > 0 ) { - tDelay = ptArrIn->Fall + pSuper->tDelaysR[i].Fall; + tDelay = ptArrIn->Fall + pSuper->tDelaysR[i].Fall + tExtra; if ( tDelay > tWorstLimit ) return MAP_FLOAT_LARGE; if ( ptArrRes->Rise < tDelay ) @@ -134,7 +135,7 @@ float Map_TimeCutComputeArrival( Map_Node_t * pNode, Map_Cut_t * pCut, int fPhas // get the fall of the output due to rise of the inputs if ( pSuper->tDelaysF[i].Rise > 0 ) { - tDelay = ptArrIn->Rise + pSuper->tDelaysF[i].Rise; + tDelay = ptArrIn->Rise + pSuper->tDelaysF[i].Rise + tExtra; if ( tDelay > tWorstLimit ) return MAP_FLOAT_LARGE; if ( ptArrRes->Fall < tDelay ) @@ -144,7 +145,7 @@ float Map_TimeCutComputeArrival( Map_Node_t * pNode, Map_Cut_t * pCut, int fPhas // get the fall of the output due to fall of the inputs if ( pSuper->tDelaysF[i].Fall > 0 ) { - tDelay = ptArrIn->Fall + pSuper->tDelaysF[i].Fall; + tDelay = ptArrIn->Fall + pSuper->tDelaysF[i].Fall + tExtra; if ( tDelay > tWorstLimit ) return MAP_FLOAT_LARGE; if ( ptArrRes->Fall < tDelay ) @@ -383,10 +384,11 @@ void Map_TimePropagateRequiredPhase( Map_Man_t * p, Map_Node_t * pNode, int fPha Map_Time_t * ptReqIn, * ptReqOut; Map_Cut_t * pCut; Map_Super_t * pSuper; - float tNewReqTime; + float tNewReqTime, tExtra; unsigned uPhase; int fPinPhase, i; + tExtra = pNode->p->pNodeDelays ? pNode->p->pNodeDelays[pNode->Num] : 0; // get the cut to be propagated pCut = pNode->pCutBest[fPhase]; assert( pCut != NULL ); @@ -408,7 +410,7 @@ void Map_TimePropagateRequiredPhase( Map_Man_t * p, Map_Node_t * pNode, int fPha // ptArrOut->Rise = ptArrIn->Rise + pSuper->tDelaysR[i].Rise; if ( pSuper->tDelaysR[i].Rise > 0 ) { - tNewReqTime = ptReqOut->Rise - pSuper->tDelaysR[i].Rise; + tNewReqTime = ptReqOut->Rise - pSuper->tDelaysR[i].Rise - tExtra; ptReqIn->Rise = MAP_MIN( ptReqIn->Rise, tNewReqTime ); } @@ -417,7 +419,7 @@ void Map_TimePropagateRequiredPhase( Map_Man_t * p, Map_Node_t * pNode, int fPha // ptArrOut->Rise = ptArrIn->Fall + pSuper->tDelaysR[i].Fall; if ( pSuper->tDelaysR[i].Fall > 0 ) { - tNewReqTime = ptReqOut->Rise - pSuper->tDelaysR[i].Fall; + tNewReqTime = ptReqOut->Rise - pSuper->tDelaysR[i].Fall - tExtra; ptReqIn->Fall = MAP_MIN( ptReqIn->Fall, tNewReqTime ); } @@ -426,7 +428,7 @@ void Map_TimePropagateRequiredPhase( Map_Man_t * p, Map_Node_t * pNode, int fPha // ptArrOut->Fall = ptArrIn->Rise + pSuper->tDelaysF[i].Rise; if ( pSuper->tDelaysF[i].Rise > 0 ) { - tNewReqTime = ptReqOut->Fall - pSuper->tDelaysF[i].Rise; + tNewReqTime = ptReqOut->Fall - pSuper->tDelaysF[i].Rise - tExtra; ptReqIn->Rise = MAP_MIN( ptReqIn->Rise, tNewReqTime ); } @@ -435,7 +437,7 @@ void Map_TimePropagateRequiredPhase( Map_Man_t * p, Map_Node_t * pNode, int fPha // ptArrOut->Fall = ptArrIn->Fall + pSuper->tDelaysF[i].Fall; if ( pSuper->tDelaysF[i].Fall > 0 ) { - tNewReqTime = ptReqOut->Fall - pSuper->tDelaysF[i].Fall; + tNewReqTime = ptReqOut->Fall - pSuper->tDelaysF[i].Fall - tExtra; ptReqIn->Fall = MAP_MIN( ptReqIn->Fall, tNewReqTime ); } } |