diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2014-04-06 12:26:25 -0700 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2014-04-06 12:26:25 -0700 |
commit | 2a399042baf62f67699350c96b8d30c374373c38 (patch) | |
tree | 6d23d57733921a7a58fb301722edbe3b46a5f164 /src/map | |
parent | faf3bf34af25297baeb454597c7d92aa75778961 (diff) | |
download | abc-2a399042baf62f67699350c96b8d30c374373c38.tar.gz abc-2a399042baf62f67699350c96b8d30c374373c38.tar.bz2 abc-2a399042baf62f67699350c96b8d30c374373c38.zip |
Improvement in SOP balancing.
Diffstat (limited to 'src/map')
-rw-r--r-- | src/map/if/ifMap.c | 8 | ||||
-rw-r--r-- | src/map/if/ifTime.c | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/map/if/ifMap.c b/src/map/if/ifMap.c index aa43cd43..24fc6b9b 100644 --- a/src/map/if/ifMap.c +++ b/src/map/if/ifMap.c @@ -124,8 +124,8 @@ void If_ObjPerformMappingAnd( If_Man_t * p, If_Obj_t * pObj, int Mode, int fPrep { // recompute the parameters of the best cut if ( p->pPars->fDelayOpt ) - pCut->Delay = If_CutDelaySopCost( p, pCut ); -// pCut->Delay = If_CutDelaySopArray3( p, pCut, NULL ); +// pCut->Delay = If_CutDelaySopCost( p, pCut ); + pCut->Delay = If_CutDelaySopArray3( p, pCut, NULL ); else if ( p->pPars->fDsdBalance ) pCut->Delay = If_DsdCutBalanceCost( p, pCut ); else if ( p->pPars->fUserRecLib ) @@ -281,8 +281,8 @@ void If_ObjPerformMappingAnd( If_Man_t * p, If_Obj_t * pObj, int Mode, int fPrep continue; // check if the cut satisfies the required times if ( p->pPars->fDelayOpt ) - pCut->Delay = If_CutDelaySopCost( p, pCut ); -// pCut->Delay = If_CutDelaySopArray3( p, pCut, NULL ); +// pCut->Delay = If_CutDelaySopCost( p, pCut ); + pCut->Delay = If_CutDelaySopArray3( p, pCut, NULL ); else if ( p->pPars->fDsdBalance ) pCut->Delay = If_DsdCutBalanceCost( p, pCut ); else if ( p->pPars->fUserRecLib ) diff --git a/src/map/if/ifTime.c b/src/map/if/ifTime.c index cc08cfab..6d8a3805 100644 --- a/src/map/if/ifTime.c +++ b/src/map/if/ifTime.c @@ -253,6 +253,7 @@ Vec_Wrd_t * If_CutDelaySopArray( If_Man_t * p, If_Cut_t * pCut ) abctime clk; Vec_Wrd_t * vAnds; int RetValue; + printf( "Running old code!!!\n" ); if ( p->vCover == NULL ) p->vCover = Vec_IntAlloc(0); if ( p->vAnds == NULL ) @@ -742,13 +743,11 @@ void If_CutPropagateRequired( If_Man_t * p, If_Obj_t * pObj, If_Cut_t * pCut, fl { if ( pCut->fUser ) { -/* if ( p->pPars->fDelayOpt ) { int Del = If_CutPinDelaysSopArray3( p, pCut, pCut->pPerm ); assert( Del == pCut->Delay ); } -*/ If_CutForEachLeaf( p, pCut, pLeaf, i ) { Pin2PinDelay = pCut->pPerm ? (pCut->pPerm[i] == IF_BIG_CHAR ? -IF_BIG_CHAR : pCut->pPerm[i]) : 1; |