diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-03-09 19:50:18 -0800 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-03-09 19:50:18 -0800 |
commit | c46c957a0721004eb21c5f3d3f316ba1c8ab8df1 (patch) | |
tree | ede7a13119d06c192e7da95992d503107d2f1651 /src/opt/cgt | |
parent | 2c8f1a67ec9295450a72fc27cbb3ed1177945734 (diff) | |
download | abc-c46c957a0721004eb21c5f3d3f316ba1c8ab8df1.tar.gz abc-c46c957a0721004eb21c5f3d3f316ba1c8ab8df1.tar.bz2 abc-c46c957a0721004eb21c5f3d3f316ba1c8ab8df1.zip |
Renamed Aig_ObjIsPi/Po to be ...Ci/Co and Aig_Man(Pi/Po)Num to be ...(Ci/Co)...
Diffstat (limited to 'src/opt/cgt')
-rw-r--r-- | src/opt/cgt/cgtAig.c | 22 | ||||
-rw-r--r-- | src/opt/cgt/cgtCore.c | 10 | ||||
-rw-r--r-- | src/opt/cgt/cgtDecide.c | 2 | ||||
-rw-r--r-- | src/opt/cgt/cgtMan.c | 4 |
4 files changed, 19 insertions, 19 deletions
diff --git a/src/opt/cgt/cgtAig.c b/src/opt/cgt/cgtAig.c index 96f6a289..8d403732 100644 --- a/src/opt/cgt/cgtAig.c +++ b/src/opt/cgt/cgtAig.c @@ -91,7 +91,7 @@ void Cgt_ManDetectFanout_rec( Aig_Man_t * pAig, Aig_Obj_t * pObj, int nOdcMax, V { Aig_Obj_t * pFanout; int f, iFanout = -1; - if ( Aig_ObjIsPo(pObj) || Aig_ObjLevel(pObj) > nOdcMax ) + if ( Aig_ObjIsCo(pObj) || Aig_ObjLevel(pObj) > nOdcMax ) return; if ( Aig_ObjIsTravIdCurrent(pAig, pObj) ) return; @@ -150,7 +150,7 @@ void Cgt_ManDetectFanout( Aig_Man_t * pAig, Aig_Obj_t * pObj, int nOdcMax, Vec_P ***********************************************************************/ void Cgt_ManCollectVisited_rec( Aig_Man_t * pAig, Aig_Obj_t * pObj, Vec_Ptr_t * vVisited ) { - if ( Aig_ObjIsPi(pObj) ) + if ( Aig_ObjIsCi(pObj) ) return; if ( Aig_ObjIsTravIdCurrent(pAig, pObj) ) return; @@ -213,7 +213,7 @@ Aig_Obj_t * Cgt_ManConstructCareCondition( Cgt_Man_t * p, Aig_Man_t * pNew, Aig_ { Aig_Obj_t * pMiter, * pObj, * pTemp; int i; - assert( Aig_ObjIsPi(pObjLo) ); + assert( Aig_ObjIsCi(pObjLo) ); // detect nodes and their cone Cgt_ManDetectFanout( p->pAig, pObjLo, p->pPars->nOdcMax, p->vFanout ); Cgt_ManCollectVisited( p->pAig, p->vFanout, p->vVisited ); @@ -341,7 +341,7 @@ Aig_Obj_t * Cgt_ManConstructCare_rec( Aig_Man_t * pCare, Aig_Obj_t * pObj, Aig_M if ( Aig_ObjIsTravIdCurrent( pCare, pObj ) ) return (Aig_Obj_t *)pObj->pData; Aig_ObjSetTravIdCurrent( pCare, pObj ); - if ( Aig_ObjIsPi(pObj) ) + if ( Aig_ObjIsCi(pObj) ) return (Aig_Obj_t *)(pObj->pData = NULL); pObj0 = Cgt_ManConstructCare_rec( pCare, Aig_ObjFanin0(pObj), pNew ); if ( pObj0 == NULL ) @@ -375,7 +375,7 @@ void Cgt_ManConstructCare( Aig_Man_t * pNew, Aig_Man_t * pCare, Vec_Vec_t * vSup Aig_ManIncrementTravId( pCare ); Vec_PtrForEachEntry( Aig_Obj_t *, vLeaves, pLeaf, i ) { - pPi = Aig_ManPi( pCare, Aig_ObjPioNum(pLeaf) ); + pPi = Aig_ManCi( pCare, Aig_ObjPioNum(pLeaf) ); Aig_ObjSetTravIdCurrent( pCare, pPi ); pPi->pData = pLeaf->pData; } @@ -385,7 +385,7 @@ void Cgt_ManConstructCare( Aig_Man_t * pNew, Aig_Man_t * pCare, Vec_Vec_t * vSup vOuts = Vec_VecEntryInt( vSuppsInv, Aig_ObjPioNum(pLeaf) ); Vec_IntForEachEntry( vOuts, iOut, k ) { - pPo = Aig_ManPo( pCare, iOut ); + pPo = Aig_ManCo( pCare, iOut ); if ( Aig_ObjIsTravIdCurrent( pCare, pPo ) ) continue; Aig_ObjSetTravIdCurrent( pCare, pPo ); @@ -416,7 +416,7 @@ Aig_Obj_t * Cgt_ManDupPartition_rec( Aig_Man_t * pNew, Aig_Man_t * pAig, Aig_Obj if ( Aig_ObjIsTravIdCurrent(pAig, pObj) ) return (Aig_Obj_t *)pObj->pData; Aig_ObjSetTravIdCurrent(pAig, pObj); - if ( Aig_ObjIsPi(pObj) ) + if ( Aig_ObjIsCi(pObj) ) { pObj->pData = Aig_ObjCreateCi( pNew ); Vec_PtrPush( vLeaves, pObj ); @@ -453,16 +453,16 @@ Aig_Man_t * Cgt_ManDupPartition( Aig_Man_t * pFrame, int nVarsMin, int nFlopsMin Aig_ManIncrementTravId( pFrame ); Aig_ManConst1(pFrame)->pData = Aig_ManConst1(pNew); Aig_ObjSetTravIdCurrent( pFrame, Aig_ManConst1(pFrame) ); - for ( i = iStart; i < iStart + nFlopsMin && i < Aig_ManPoNum(pFrame); i++ ) + for ( i = iStart; i < iStart + nFlopsMin && i < Aig_ManCoNum(pFrame); i++ ) { - pObj = Aig_ManPo( pFrame, i ); + pObj = Aig_ManCo( pFrame, i ); Cgt_ManDupPartition_rec( pNew, pFrame, Aig_ObjFanin0(pObj), vLeaves ); Vec_PtrPush( vRoots, Aig_ObjChild0Copy(pObj) ); Vec_PtrPush( vPos, pObj ); } - for ( ; Aig_ManObjNum(pNew) < nVarsMin && i < Aig_ManPoNum(pFrame); i++ ) + for ( ; Aig_ManObjNum(pNew) < nVarsMin && i < Aig_ManCoNum(pFrame); i++ ) { - pObj = Aig_ManPo( pFrame, i ); + pObj = Aig_ManCo( pFrame, i ); Cgt_ManDupPartition_rec( pNew, pFrame, Aig_ObjFanin0(pObj), vLeaves ); Vec_PtrPush( vRoots, Aig_ObjChild0Copy(pObj) ); Vec_PtrPush( vPos, pObj ); diff --git a/src/opt/cgt/cgtCore.c b/src/opt/cgt/cgtCore.c index 27810e1a..73195413 100644 --- a/src/opt/cgt/cgtCore.c +++ b/src/opt/cgt/cgtCore.c @@ -132,7 +132,7 @@ void Cgt_ClockGatingRangeCheck( Cgt_Man_t * p, int iStart, int nOutputs ) Vec_Ptr_t * vNodes = p->vFanout; Aig_Obj_t * pMiter, * pCand, * pMiterFrame, * pCandFrame, * pMiterPart, * pCandPart; int i, k, RetValue, nCalls; - assert( Vec_VecSize(p->vGatesAll) == Aig_ManPoNum(p->pFrame) ); + assert( Vec_VecSize(p->vGatesAll) == Aig_ManCoNum(p->pFrame) ); // go through all the registers inputs of this range for ( i = iStart; i < iStart + nOutputs; i++ ) { @@ -218,7 +218,7 @@ p->timePrepare += clock() - clk; if ( p->pPars->fVeryVerbose ) { printf( "%5d : D =%4d. C =%5d. Var =%6d. Pr =%5d. Cex =%5d. F =%4d. Saved =%6d. ", - iStart, iStop-iStart, Aig_ManPoNum(p->pPart)-nOutputs, p->pSat->size, + iStart, iStop-iStart, Aig_ManCoNum(p->pPart)-nOutputs, p->pSat->size, p->nCallsUnsat-nCallsUnsat, p->nCallsSat -nCallsSat, p->nCallsUndec-nCallsUndec, @@ -255,9 +255,9 @@ Vec_Vec_t * Cgt_ClockGatingCandidates( Aig_Man_t * pAig, Aig_Man_t * pCare, Cgt_ p = Cgt_ManCreate( pAig, pCare, pPars ); p->pFrame = Cgt_ManDeriveAigForGating( p ); p->timeAig += clock() - clk; - assert( Aig_ManPoNum(p->pFrame) == Saig_ManRegNum(p->pAig) ); - pProgress = Bar_ProgressStart( stdout, Aig_ManPoNum(p->pFrame) ); - for ( iStart = 0; iStart < Aig_ManPoNum(p->pFrame); ) + assert( Aig_ManCoNum(p->pFrame) == Saig_ManRegNum(p->pAig) ); + pProgress = Bar_ProgressStart( stdout, Aig_ManCoNum(p->pFrame) ); + for ( iStart = 0; iStart < Aig_ManCoNum(p->pFrame); ) { Bar_ProgressUpdate( pProgress, iStart, NULL ); iStart = Cgt_ClockGatingRange( p, iStart ); diff --git a/src/opt/cgt/cgtDecide.c b/src/opt/cgt/cgtDecide.c index 2ac206cb..3370498e 100644 --- a/src/opt/cgt/cgtDecide.c +++ b/src/opt/cgt/cgtDecide.c @@ -56,7 +56,7 @@ void Cgt_ManCollectFanoutPos_rec( Aig_Man_t * pAig, Aig_Obj_t * pObj, Vec_Ptr_t if ( Aig_ObjIsTravIdCurrent(pAig, pObj) ) return; Aig_ObjSetTravIdCurrent(pAig, pObj); - if ( Aig_ObjIsPo(pObj) ) + if ( Aig_ObjIsCo(pObj) ) { Vec_PtrPush( vFanout, pObj ); return; diff --git a/src/opt/cgt/cgtMan.c b/src/opt/cgt/cgtMan.c index 7744226d..2ba5baae 100644 --- a/src/opt/cgt/cgtMan.c +++ b/src/opt/cgt/cgtMan.c @@ -61,10 +61,10 @@ Cgt_Man_t * Cgt_ManCreate( Aig_Man_t * pAig, Aig_Man_t * pCare, Cgt_Par_t * pPar if ( pCare == NULL ) return p; // check out the constraints - if ( Aig_ManPiNum(pCare) != Aig_ManPiNum(pAig) ) + if ( Aig_ManCiNum(pCare) != Aig_ManCiNum(pAig) ) { printf( "The PI count of care (%d) and AIG (%d) differ. Careset is not used.\n", - Aig_ManPiNum(pCare), Aig_ManPiNum(pAig) ); + Aig_ManCiNum(pCare), Aig_ManCiNum(pAig) ); return p; } p->pCare = pCare; |