diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-03-09 19:59:35 -0800 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-03-09 19:59:35 -0800 |
commit | fec988f6194fbab17cc18b72e6f907d5f990bbe8 (patch) | |
tree | 0adf99e304f984f32201e3853fa2109ed5405e86 /src/proof/ssw | |
parent | c46c957a0721004eb21c5f3d3f316ba1c8ab8df1 (diff) | |
download | abc-fec988f6194fbab17cc18b72e6f907d5f990bbe8.tar.gz abc-fec988f6194fbab17cc18b72e6f907d5f990bbe8.tar.bz2 abc-fec988f6194fbab17cc18b72e6f907d5f990bbe8.zip |
Renamed Aig_ObjPioNum to be Aig_ObjCioId.
Diffstat (limited to 'src/proof/ssw')
-rw-r--r-- | src/proof/ssw/sswBmc.c | 2 | ||||
-rw-r--r-- | src/proof/ssw/sswDyn.c | 10 | ||||
-rw-r--r-- | src/proof/ssw/sswLcorr.c | 6 | ||||
-rw-r--r-- | src/proof/ssw/sswMan.c | 2 | ||||
-rw-r--r-- | src/proof/ssw/sswSweep.c | 2 | ||||
-rw-r--r-- | src/proof/ssw/sswUnique.c | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/src/proof/ssw/sswBmc.c b/src/proof/ssw/sswBmc.c index b2920177..ff428fa1 100644 --- a/src/proof/ssw/sswBmc.c +++ b/src/proof/ssw/sswBmc.c @@ -132,7 +132,7 @@ int Ssw_BmcDynamic( Aig_Man_t * pAig, int nFramesMax, int nConfLimit, int fVerbo // start managers assert( Saig_ManRegNum(pAig) > 0 ); - Aig_ManSetPioNumbers( pAig ); + Aig_ManSetCioIds( pAig ); pSat = Ssw_SatStart( 0 ); pFrm = Ssw_FrmStart( pAig ); pFrm->pFrames = Aig_ManStart( Aig_ManObjNumMax(pAig) * 3 ); diff --git a/src/proof/ssw/sswDyn.c b/src/proof/ssw/sswDyn.c index f20a7b78..617bb40f 100644 --- a/src/proof/ssw/sswDyn.c +++ b/src/proof/ssw/sswDyn.c @@ -113,10 +113,10 @@ void Ssw_ManCollectPos_rec( Ssw_Man_t * p, Aig_Obj_t * pObj, Vec_Int_t * vNewPos if ( Aig_ObjIsCo(pObj) ) { // skip if it is a register input PO - if ( Aig_ObjPioNum(pObj) >= Aig_ManCoNum(p->pFrames)-Aig_ManRegNum(p->pAig) ) + if ( Aig_ObjCioId(pObj) >= Aig_ManCoNum(p->pFrames)-Aig_ManRegNum(p->pAig) ) return; // add the number of this constraint - Vec_IntPush( vNewPos, Aig_ObjPioNum(pObj)/2 ); + Vec_IntPush( vNewPos, Aig_ObjCioId(pObj)/2 ); return; } // visit the fanouts @@ -225,7 +225,7 @@ void Ssw_ManSweepTransferDyn( Ssw_Man_t * p ) } assert( !Aig_IsComplement(pObjFraig) ); assert( Aig_ObjIsCi(pObjFraig) ); - pInfo = (unsigned *)Vec_PtrEntry( p->vSimInfo, Aig_ObjPioNum(pObjFraig) ); + pInfo = (unsigned *)Vec_PtrEntry( p->vSimInfo, Aig_ObjCioId(pObjFraig) ); Ssw_SmlObjSetWord( p->pSml, pObj, pInfo[0], 0, 0 ); } // set random simulation info for the second frame @@ -236,7 +236,7 @@ void Ssw_ManSweepTransferDyn( Ssw_Man_t * p ) pObjFraig = Ssw_ObjFrame( p, pObj, f ); assert( !Aig_IsComplement(pObjFraig) ); assert( Aig_ObjIsCi(pObjFraig) ); - pInfo = (unsigned *)Vec_PtrEntry( p->vSimInfo, Aig_ObjPioNum(pObjFraig) ); + pInfo = (unsigned *)Vec_PtrEntry( p->vSimInfo, Aig_ObjCioId(pObjFraig) ); Ssw_SmlObjSetWord( p->pSml, pObj, pInfo[0], 0, f ); } } @@ -386,7 +386,7 @@ clk = clock(); Ssw_ObjSetFrame( p, Aig_ManConst1(p->pAig), f, Aig_ManConst1(p->pFrames) ); Saig_ManForEachPi( p->pAig, pObj, i ) Ssw_ObjSetFrame( p, pObj, f, Aig_ObjCreateCi(p->pFrames) ); - Aig_ManSetPioNumbers( p->pFrames ); + Aig_ManSetCioIds( p->pFrames ); // label nodes corresponding to primary inputs Ssw_ManLabelPiNodes( p ); p->timeReduce += clock() - clk; diff --git a/src/proof/ssw/sswLcorr.c b/src/proof/ssw/sswLcorr.c index ec6087f0..71f148e3 100644 --- a/src/proof/ssw/sswLcorr.c +++ b/src/proof/ssw/sswLcorr.c @@ -59,7 +59,7 @@ void Ssw_ManSweepTransfer( Ssw_Man_t * p ) } assert( !Aig_IsComplement(pObjFraig) ); assert( Aig_ObjIsCi(pObjFraig) ); - pInfo = (unsigned *)Vec_PtrEntry( p->vSimInfo, Aig_ObjPioNum(pObjFraig) ); + pInfo = (unsigned *)Vec_PtrEntry( p->vSimInfo, Aig_ObjCioId(pObjFraig) ); Ssw_SmlObjSetWord( p->pSml, pObj, pInfo[0], 0, 0 ); } } @@ -116,7 +116,7 @@ void Ssw_SmlAddPattern( Ssw_Man_t * p, Aig_Obj_t * pRepr, Aig_Obj_t * pCand ) Value = sat_solver_var_value( p->pMSat->pSat, nVarNum ); if ( Value == 0 ) continue; - pInfo = (unsigned *)Vec_PtrEntry( p->vSimInfo, Aig_ObjPioNum(pObj) ); + pInfo = (unsigned *)Vec_PtrEntry( p->vSimInfo, Aig_ObjCioId(pObj) ); Abc_InfoSetBit( pInfo, p->nPatterns ); } } @@ -260,7 +260,7 @@ int Ssw_ManSweepLatch( Ssw_Man_t * p ) pTemp = Aig_NotCond( Ssw_ObjFrame(p, pRepr, 0), pRepr->fPhase ^ pObj->fPhase ); Ssw_ObjSetFrame( p, pObj, 0, pTemp ); } - Aig_ManSetPioNumbers( p->pFrames ); + Aig_ManSetCioIds( p->pFrames ); // prepare simulation info assert( p->vSimInfo == NULL ); diff --git a/src/proof/ssw/sswMan.c b/src/proof/ssw/sswMan.c index c635569d..e09e0904 100644 --- a/src/proof/ssw/sswMan.c +++ b/src/proof/ssw/sswMan.c @@ -48,7 +48,7 @@ Ssw_Man_t * Ssw_ManCreate( Aig_Man_t * pAig, Ssw_Pars_t * pPars ) // prepare the sequential AIG assert( Saig_ManRegNum(pAig) > 0 ); Aig_ManFanoutStart( pAig ); - Aig_ManSetPioNumbers( pAig ); + Aig_ManSetCioIds( pAig ); // create interpolation manager p = ABC_ALLOC( Ssw_Man_t, 1 ); memset( p, 0, sizeof(Ssw_Man_t) ); diff --git a/src/proof/ssw/sswSweep.c b/src/proof/ssw/sswSweep.c index 550cb4ce..5dd7a1f2 100644 --- a/src/proof/ssw/sswSweep.c +++ b/src/proof/ssw/sswSweep.c @@ -167,7 +167,7 @@ void Ssw_SmlAddPatternDyn( Ssw_Man_t * p ) assert( nVarNum > 0 ); if ( sat_solver_var_value( p->pMSat->pSat, nVarNum ) ) { - pInfo = (unsigned *)Vec_PtrEntry( p->vSimInfo, Aig_ObjPioNum(pObj) ); + pInfo = (unsigned *)Vec_PtrEntry( p->vSimInfo, Aig_ObjCioId(pObj) ); Abc_InfoSetBit( pInfo, p->nPatterns ); } } diff --git a/src/proof/ssw/sswUnique.c b/src/proof/ssw/sswUnique.c index 8e989531..1bd44a03 100644 --- a/src/proof/ssw/sswUnique.c +++ b/src/proof/ssw/sswUnique.c @@ -108,9 +108,9 @@ int Ssw_ManUniqueOne( Ssw_Man_t * p, Aig_Obj_t * pRepr, Aig_Obj_t * pObj, int fV assert( Aig_ObjIsCi(pTemp) ); if ( !Saig_ObjIsLo(p->pAig, pTemp) ) continue; - assert( Aig_ObjPioNum(pTemp) > 0 ); + assert( Aig_ObjCioId(pTemp) > 0 ); Vec_PtrWriteEntry( p->vCommon, k++, pTemp ); - if ( Vec_IntEntry(p->vDiffPairs, Aig_ObjPioNum(pTemp) - Saig_ManPiNum(p->pAig)) ) + if ( Vec_IntEntry(p->vDiffPairs, Aig_ObjCioId(pTemp) - Saig_ManPiNum(p->pAig)) ) fFeasible = 1; } Vec_PtrShrink( p->vCommon, k ); |