diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2013-02-23 16:08:10 -0800 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2013-02-23 16:08:10 -0800 |
| commit | 7802db98af7705be65f7e58986ed52afc52d4d64 (patch) | |
| tree | 525963aa8792e1c79ea84e26b703c353101e40c3 /src/aig/gia/giaAig.c | |
| parent | 8281b56e9e2a6a9339fb2dc86711aa719055e014 (diff) | |
| download | abc-7802db98af7705be65f7e58986ed52afc52d4d64.tar.gz abc-7802db98af7705be65f7e58986ed52afc52d4d64.tar.bz2 abc-7802db98af7705be65f7e58986ed52afc52d4d64.zip | |
Integrating sweeping information.
Diffstat (limited to 'src/aig/gia/giaAig.c')
| -rw-r--r-- | src/aig/gia/giaAig.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/aig/gia/giaAig.c b/src/aig/gia/giaAig.c index d523c46e..6256b7fd 100644 --- a/src/aig/gia/giaAig.c +++ b/src/aig/gia/giaAig.c @@ -550,7 +550,6 @@ void Gia_ManReprFromAigRepr2( Aig_Man_t * pAig, Gia_Man_t * pGia ) ***********************************************************************/ Gia_Man_t * Gia_ManCompress2( Gia_Man_t * p, int fUpdateLevel, int fVerbose ) { -// extern Aig_Man_t * Dar_ManCompress2( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, int fFanout, int fPower, int fVerbose ); Gia_Man_t * pGia; Aig_Man_t * pNew, * pTemp; if ( p->pManTime && p->vLevels == NULL ) @@ -560,9 +559,9 @@ Gia_Man_t * Gia_ManCompress2( Gia_Man_t * p, int fUpdateLevel, int fVerbose ) Aig_ManStop( pTemp ); pGia = Gia_ManFromAig( pNew ); Aig_ManStop( pNew ); - pGia->pManTime = p->pManTime; p->pManTime = NULL; - pGia->pAigExtra = p->pAigExtra; p->pAigExtra = NULL; -// Gia_ManLevelWithBoxes( pGia ); + pGia->pManTime = p->pManTime; p->pManTime = NULL; + pGia->pAigExtra = p->pAigExtra; p->pAigExtra = NULL; + pGia->nAnd2Delay = p->nAnd2Delay; p->nAnd2Delay = 0; return pGia; } @@ -581,13 +580,16 @@ Gia_Man_t * Gia_ManPerformDch( Gia_Man_t * p, void * pPars ) { Gia_Man_t * pGia; Aig_Man_t * pNew; + if ( p->pManTime && p->vLevels == NULL ) + Gia_ManLevelWithBoxes( p ); pNew = Gia_ManToAig( p, 0 ); pNew = Dar_ManChoiceNew( pNew, (Dch_Pars_t *)pPars ); // pGia = Gia_ManFromAig( pNew ); pGia = Gia_ManFromAigChoices( pNew ); Aig_ManStop( pNew ); - pGia->pManTime = p->pManTime; p->pManTime = NULL; - pGia->pAigExtra = p->pAigExtra; p->pAigExtra = NULL; + pGia->pManTime = p->pManTime; p->pManTime = NULL; + pGia->pAigExtra = p->pAigExtra; p->pAigExtra = NULL; + pGia->nAnd2Delay = p->nAnd2Delay; p->nAnd2Delay = 0; return pGia; } |