diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2008-06-10 08:01:00 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2008-06-10 08:01:00 -0700 |
| commit | 9d09f583b6ea1181ebd5af1654acd3432c427445 (patch) | |
| tree | 2ea6fb1cc6f70871f861dd0ccbe7f8522c34c765 /src/aig/ntl/ntlFraig.c | |
| parent | 9604ecb1745da3bde720cd7be5ee8f89dc6bd5ff (diff) | |
| download | abc-9d09f583b6ea1181ebd5af1654acd3432c427445.tar.gz abc-9d09f583b6ea1181ebd5af1654acd3432c427445.tar.bz2 abc-9d09f583b6ea1181ebd5af1654acd3432c427445.zip | |
Version abc80610
Diffstat (limited to 'src/aig/ntl/ntlFraig.c')
| -rw-r--r-- | src/aig/ntl/ntlFraig.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/aig/ntl/ntlFraig.c b/src/aig/ntl/ntlFraig.c index 6de41679..cdc1323b 100644 --- a/src/aig/ntl/ntlFraig.c +++ b/src/aig/ntl/ntlFraig.c @@ -203,7 +203,7 @@ void Ntl_ManResetComplemented( Ntl_Man_t * p, Aig_Man_t * pAigCol ) pRoot = Ntl_ManRootModel(p); Ntl_ModelForEachLatch( pRoot, pObj, i ) { - if ( (pObj->LatchId & 3) == 1 ) + if ( Ntl_ObjIsInit1( pObj ) ) { pObjCol = Ntl_ObjFanout0(pObj)->pCopy; assert( pObjCol->fPhase == 0 ); @@ -275,7 +275,7 @@ Ntl_Man_t * Ntl_ManFraig( Ntl_Man_t * p, int nPartSize, int nConfLimit, int nLev // collapse the AIG pAig = Ntl_ManExtract( p ); pNew = Ntl_ManInsertAig( p, pAig ); - pAigCol = Ntl_ManCollapse( pNew, 0 ); + pAigCol = Ntl_ManCollapseComb( pNew ); // perform fraiging for the given design nPartSize = nPartSize? nPartSize : Aig_ManPoNum(pAigCol); @@ -309,7 +309,7 @@ Ntl_Man_t * Ntl_ManScl( Ntl_Man_t * p, int fLatchConst, int fLatchEqual, int fVe // collapse the AIG pAig = Ntl_ManExtract( p ); pNew = Ntl_ManInsertAig( p, pAig ); - pAigCol = Ntl_ManCollapse( pNew, 1 ); + pAigCol = Ntl_ManCollapseSeq( pNew ); // perform SCL for the given design Aig_ManSetRegNum( pAigCol, Ntl_ModelLatchNum(Ntl_ManRootModel(p)) ); @@ -343,7 +343,7 @@ Ntl_Man_t * Ntl_ManLcorr( Ntl_Man_t * p, int nConfMax, int fVerbose ) // collapse the AIG pAig = Ntl_ManExtract( p ); pNew = Ntl_ManInsertAig( p, pAig ); - pAigCol = Ntl_ManCollapse( pNew, 1 ); + pAigCol = Ntl_ManCollapseSeq( pNew ); // perform SCL for the given design Aig_ManSetRegNum( pAigCol, Ntl_ModelLatchNum(Ntl_ManRootModel(p)) ); @@ -377,7 +377,7 @@ Ntl_Man_t * Ntl_ManSsw( Ntl_Man_t * p, Fra_Ssw_t * pPars ) // collapse the AIG pAig = Ntl_ManExtract( p ); pNew = Ntl_ManInsertAig( p, pAig ); - pAigCol = Ntl_ManCollapse( pNew, 1 ); + pAigCol = Ntl_ManCollapseSeq( pNew ); // perform SCL for the given design Aig_ManSetRegNum( pAigCol, Ntl_ModelLatchNum(Ntl_ManRootModel(p)) ); @@ -502,7 +502,7 @@ void Ntl_ManFlipEdges( Ntl_Man_t * p, Aig_Man_t * pAigCol ) iLatch = 0; Ntl_ModelForEachLatch( pRoot, pObj, i ) { - if ( (pObj->LatchId & 3) == 1 ) + if ( Ntl_ObjIsInit1( pObj ) ) { pObjCol = Aig_ManPi( pAigCol, Ntl_ModelPiNum(pRoot) + iLatch ); assert( pObjCol->fMarkA == 0 ); @@ -524,7 +524,7 @@ void Ntl_ManFlipEdges( Ntl_Man_t * p, Aig_Man_t * pAigCol ) iLatch = 0; Ntl_ModelForEachLatch( pRoot, pObj, i ) { - if ( (pObj->LatchId & 3) == 1 ) + if ( Ntl_ObjIsInit1( pObj ) ) { // flip the latch input pObjCol = Aig_ManPo( pAigCol, Ntl_ModelPoNum(pRoot) + iLatch ); @@ -554,7 +554,7 @@ Ntl_Man_t * Ntl_ManSsw2( Ntl_Man_t * p, Fra_Ssw_t * pPars ) Ntl_Man_t * pNew; Aig_Man_t * pAigRed, * pAigCol; // collapse the AIG - pAigCol = Ntl_ManCollapse( p, 1 ); + pAigCol = Ntl_ManCollapseSeq( p ); Aig_ManSetRegNum( pAigCol, Ntl_ModelLatchNum(Ntl_ManRootModel(p)) ); // transform the collapsed AIG pAigRed = Fra_FraigInduction( pAigCol, pPars ); |